Merge branch 'master' of http://122.51.230.86:3000/dianliang/dl_uniapp

api/business/member.js

@@ -3,10 +3,19 @@ import request from '@/utils/request'
 
 //------------------博主、通告主-----------------------
 //查询博主详情
-export function bloggerDetail(userId) {
+export function queryDetail(params) {
     return request({
-        url: '/member/member/bloggerDetail/' + userId,
+        url: '/member/member/queryDetail',
-        method: 'get'
+        method: 'get',
+        params:params
+    })
+}
+//保存博主
+export function uniSaveMember(data) {
+    return request({
+        url: '/member/member/uniSaveMember',
+        method: 'post',
+        data:data
     })
 }
 

pages/mine/card/my-card.vue

@@ -2,7 +2,7 @@
 	<view :class="['my-card-box',ifChoose?'has-footer':'']">
 		<navigation-bar-vue title="我的名片" style="width: 100%;" background-color="#ffffff"
 			title-color="#000000"></navigation-bar-vue>
-		<view class="opt-box" v-if="!ifChoose">
+		<view class="opt-box">
 			<view v-if="!ifEdit" class="item-dom" @click="manager(true)"><uni-icons type="bars" color="#FC1F3E"
 					size="16"></uni-icons><text>管理</text></view>
 			<view v-if="!ifEdit" class="item-dom" @click="addCard()">
@@ -19,7 +19,7 @@
 			<view class="card-dom " v-for="item in busiCardList">
 				<!-- 多选框--管理状态或者选择名片时使用 -->
 				<view class="choose-dom" v-if="ifChoose">
-					<uni-data-checkbox v-model="item.choosed" :disabled="1!=item.approvalStatus" multiple
+					<uni-data-checkbox v-model="item.choosed" :disabled="item.canUse=='0'" multiple
 						:localdata="checkboxArray" />
 				</view>
 				<view :class="['right-content',item.choosed.length>0?'click':'']">
@@ -62,7 +62,7 @@
 			</view>
 			<view class="right-button">
 				<text>已选择{{getChooseNum}}张</text>
-				<view class="button-dom">保存</view>
+				<view class="button-dom" @click="chooseOk">保存</view>
 			</view>
 		</view>
 	</view>
@@ -77,12 +77,20 @@
 		getUserBusiCard,
 		removeBusiCard
 	} from '@/api/business/member.js'
+	import {
+		getSignCard
+	} from '@/api/business/signCard.js'
+	import {
+		hasRights
+	} from '@/utils/common.js'
+	import rightsCode from '@/utils/rightsCode.js'
 	export default {
 		components: {
 			navigationBarVue
 		},
 		data() {
 			return {
+				noticeId: null,
 				//是否是管理模式
 				ifEdit: false,
 				//是否是选择模式(默认值为false，管理页面)
@@ -106,7 +114,29 @@
 		onShow() {
 			this.initData();
 		},
+		onLoad(param) {
+			if (param.ifChoose) {
+				this.ifChoose = param.ifChoose
+
+			}
+			if (param.noticeId) {
+				this.noticeId = param.noticeId
+			}
+		},
 		methods: {
+			chooseOk() {
+				let info = hasRights(rightsCode.manyCardReport)
+				if (!info && this.busiCardList.length > 1) {
+					//未开通不可选多个
+					uni.showToast({
+						title: '未开通会员不可添加多个',
+						icon: 'none'
+					})
+					return
+				}
+				uni.$emit('updateCard', this.busiCardList)
+				uni.navigateBack()
+			},
 			/**
 			 * 数值单位转换
 			 * @param {Object} number
@@ -117,6 +147,7 @@
 			//查询名片列表
 			initData() {
 				this.busiCardList = []
+				if (!this.ifChoose) {
 					getUserBusiCard().then(res => {
 						if (res.data.length > 0) {
 							res.data.map((item) => {
@@ -131,6 +162,25 @@
 							title: e
 						});
 					})
+				} else {
+					getSignCard({
+						noticeId: this.noticeId
+					}).then(res => {
+						if (res.data.list.length > 0) {
+							res.data.list.map((item) => {
+								item.choosed = []
+								this.busiCardList.push(item)
+							})
+						}
+					}).catch((e) => {
+						uni.showToast({
+							icon: 'error',
+							duration: 2000,
+							title: e
+						});
+					})
+				}
+
 			},
 			/**删除名片*/
 			remove(id) {
@@ -159,13 +209,13 @@
 			chooseAllFun(e) {
 				if (e.detail.value.length > 0) {
 					this.busiCardList.map((item) => {
-						if ("1" == item.approvalStatus) {
+						if ("1" == item.canUse) {
 							item.choosed = [true]
 						}
 					})
 				} else {
 					this.busiCardList.map((item) => {
-						if ("1" == item.approvalStatus) {
+						if ("1" == item.canUse) {
 							item.choosed = []
 						}
 					})

pages/mine/mine-index.vue

@@ -182,7 +182,7 @@
 		getStrData
 	} from '@/utils/auth.js'
 	import {
-		bloggerDetail
+    queryDetail
 	} from '@/api/business/member.js'
 	export default {
 		props: {
@@ -215,7 +215,6 @@
 				popupImgUrl: "",
 			}
 		},
-		mounted() {},
 		onShow() {
 
 		},
@@ -225,7 +224,7 @@
 		mounted() {
 			if (null != getJSONData(constant.userInfo)) {
 				this.userInfo = getJSONData(constant.userInfo)
-				this.getBloggerDetail()
+				this.getDetail()
 			}
 		},
 		computed: {
@@ -240,11 +239,12 @@
 				// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
 				this.$refs.popup.open(type)
 			},
-			getBloggerDetail() {
+      getDetail() {
-				bloggerDetail(this.userInfo.userId).then(res => {
+        queryDetail({userId:this.userInfo.userId,userType:this.localUserType}).then(res => {
 					this.userInfo.tfansNum = res.data.tfansNum.toString()
 					this.userInfo.pointsBalance = res.data.pointsBalance.toString()
 					this.userInfo.report = res.data.report.toString()
+					this.userInfo.avatar = this.imageUrl+res.data.avatar
 				})
 			},
 			/**
@@ -254,6 +254,7 @@
 				changeUserType(type)
 				this.localUserType = type
 				this.$emit('update:nowUserType', this.localUserType)
+        this.getDetail()
 				this.$forceUpdate()
 			},
 			handleToInfo() {
@@ -290,7 +291,7 @@
 			 * 跳转编辑页
 			 */
 			goEdit() {
-				this.$tab.navigateTo('/pages/mine/set/my-info')
+				this.$tab.navigateTo('/pages/mine/set/my-info?userType='+this.localUserType+'&userId='+this.userInfo.userId)
 			},
 			viewNewPeople() {
 				this.$tab.navigateTo(

pages/mine/set/my-info.vue

@@ -5,7 +5,7 @@
 		<view class="form-data-box">
 			<!-- 基础表单校验 -->
 			<uni-forms ref="valiForm" :rules="rules" :modelValue="valiFormData">
-				<uni-forms-item labelWidth="280rpx" label="头像" required name="avatar">
+				<uni-forms-item labelWidth="280rpx" label="头像"  name="avatar">
 					<uni-file-picker small="true" :value="fileList" :sizeType="sizeType" @select="afterRead"
 						@delete="deleteFile" limit="1"></uni-file-picker>
 				</uni-forms-item>
@@ -18,15 +18,15 @@
 				<uni-forms-item labelWidth="280rpx" label="绑定手机号" required name="userName">
 					<uni-easyinput disabled v-model="valiFormData.userName" />
 				</uni-forms-item>
-				<uni-forms-item labelWidth="280rpx" label="收款码" required name="tRecipientImage">
+				<uni-forms-item labelWidth="280rpx" label="收款码"  name="trecipientImage">
 					<uni-file-picker small="true" :value="recipientImageList" :sizeType="sizeType"
 						@select="afterReadRecipient" @delete="deleteFileRecipient" limit="1"></uni-file-picker>
 				</uni-forms-item>
-				<uni-forms-item labelWidth="280rpx" label="收款码真实姓名" required name="tRecipientName">
+				<uni-forms-item labelWidth="280rpx" label="收款码真实姓名"  name="trecipientName">
-					<uni-easyinput v-model="valiFormData.tRecipientName" placeholder="请输入" />
+					<uni-easyinput v-model="valiFormData.trecipientName" placeholder="请输入" />
 				</uni-forms-item>
-				<uni-forms-item labelWidth="280rpx" label="通告报名免打扰" required name="tOpenDisturb">
+				<uni-forms-item labelWidth="280rpx" label="通告报名免打扰"  name="topenDisturb">
-					<uni-data-checkbox v-model="valiFormData.tOpenDisturb" :localdata="ranges" />
+					<uni-data-checkbox v-model="valiFormData.topenDisturb" :localdata="ranges" />
 				</uni-forms-item>
 			</uni-forms>
 			<button type="primary" style="background-color: #FC2B49;" @click="submit('valiForm')">提交</button>
@@ -38,17 +38,25 @@
 
 <script>
 	import navigationBarVue from '@/components/navigation/navigationBar.vue';
+  import config from '@/config'
+  import {
+    queryDetail,uniSaveMember
+  } from '@/api/business/member.js'
+  import upload from '@/utils/upload'
 	export default {
 		components: {
 			navigationBarVue
 		},
 		data() {
 			return {
+			  userType:'',
 				sizeType: ['compressed'],
 				//头像数组
 				fileList: [],
+        fileImageUrl:[],
 				//收款码数组
 				recipientImageList: [],
+				recipientImageUrl: [],
 				ranges: [{
 					text: '开启',
 					value: "1"
@@ -62,18 +70,18 @@
 					nickName: "",
 					phonenumber: "",
 					userName: "",
-					tRecipientImage: "",
+					trecipientImage: "",
-					tRecipientName: "",
+					trecipientName: "",
-					tOpenDisturb: "0"
+					topenDisturb: "0"
 				},
 				// 校验规则
 				rules: {
-					avatar: {
+					// avatar: {
-						rules: [{
+					// 	rules: [{
-							required: true,
+					// 		required: true,
-							errorMessage: '头像不能为空'
+					// 		errorMessage: '头像不能为空'
-						}]
+					// 	}]
-					},
+					// },
 					nickName: {
 						rules: [{
 							required: true,
@@ -86,35 +94,76 @@
 							errorMessage: '联系方式不能为空'
 						}]
 					},
-					tRecipientImage: {
+					// trecipientImage: {
-						rules: [{
+					// 	rules: [{
-							required: true,
+					// 		required: true,
-							errorMessage: '收款码不能为空'
+					// 		errorMessage: '收款码不能为空'
-						}]
+					// 	}]
-					},
+					// },
-					tRecipientName: {
+					// trecipientName: {
-						rules: [{
+					// 	rules: [{
-							required: true,
+					// 		required: true,
-							errorMessage: '收款码真实姓名不能为空'
+					// 		errorMessage: '收款码真实姓名不能为空'
-						}]
+					// 	}]
-					},
+					// },
 				},
 			}
 		},
+    onLoad(options){
+		  this.userType = options.userType
+      this.userId = options.userId
+      this.initData(options.userType,options.userId)
+    },
 		methods: {
 			goMyBlackList() {
 				this.$tab.navigateTo('/pages/mine/set/black-list')
 			},
 			submit(ref) {
+			  this.valiFormData.avatar = this.fileImageUrl.join(',');
+			  this.valiFormData.trecipientImage = this.recipientImageUrl.join(',');
+			  let that = this
 				this.$refs[ref].validate().then(res => {
-					console.log('success', res);
+          uniSaveMember(that.valiFormData).then(res => {
             uni.showToast({
-						title: `校验通过`
+              icon: 'success',
+              duration: 2000,
+              title: '保存成功'
+            });
+            uni.navigateBack()
           })
 				}).catch(err => {
 					console.log('err', err);
 				})
 			},
+
+      /**初始化数据*/
+      initData(userType,userId){
+        this.fileList = []
+        this.fileImageUrl = []
+        this.recipientImageList = []
+        this.recipientImageUrl = []
+        queryDetail({userType:userType,userId:userId}).then(res=>{
+          console.log(res,131)
+          this.valiFormData = res.data
+          if (this.valiFormData.avatar != null && this.valiFormData.avatar != ''){
+            this.fileImageUrl = this.valiFormData.avatar.split(',')
+            this.fileImageUrl.map((item)=>{
+              this.fileList.push({
+                url:config.baseUrl + item
+              })
+            })
+          }
+          if (this.valiFormData.trecipientImage != null && this.valiFormData.trecipientImage != ''){
+            this.recipientImageUrl = this.valiFormData.trecipientImage.split(',')
+            this.recipientImageUrl.map((item)=>{
+              this.recipientImageList.push({
+                url:config.baseUrl + item
+              })
+            })
+          }
+        })
+      },
+
 			afterRead(file) {
 				for (let i = 0; i < file.tempFilePaths.length; i++) {
 					upload({
@@ -123,8 +172,9 @@
 					}).then((res) => {
 						console.log(res, '215')
 						this.fileList.push({
-							url: config.baseUrl + res.data
+							url: res.url
 						})
+            this.fileImageUrl.push(res.fileName)
 						console.log(this.fileList, 'fileList')
 					})
 				}
@@ -132,6 +182,7 @@
 			deleteFile(file, index) {
 				console.log('删除文件');
 				this.fileList.splice(index, 1);
+        this.fileImageUrl.splice(index, 1);
 			},
 			afterReadRecipient(file) {
 				for (let i = 0; i < file.tempFilePaths.length; i++) {
@@ -141,14 +192,16 @@
 					}).then((res) => {
 						console.log(res, '215')
 						this.recipientImageList.push({
-							url: config.baseUrl + res.data
+							url: res.url
 						})
+            this.recipientImageUrl.push(res.fileName)
 					})
 				}
 			},
 			deleteFileRecipient(file, index) {
 				console.log('删除文件');
 				this.recipientImageList.splice(index, 1);
+        this.recipientImageUrl.splice(index, 1);
 			},
 		}
 	}

pages/notice/detail.vue

@@ -435,6 +435,7 @@
 			},
 			dialogConfirm() {
 				console.log('点击确认')
+				this.$tab.navigateTo('/pages/mine/card/my-card')
 			},
 			dialogClose() {
 				console.log('点击关闭')
@@ -454,7 +455,7 @@
 				}).then(res => {
 					if (res.code == 200) {
 						if (res.data.canUserNum > 0) {
-							this.$tab.navigateTo('/pages/notice/report')
+							this.$tab.navigateTo('/pages/notice/report?noticeId=' + this.noticeId)
 						} else {
 							this.$refs.alertDialog.open()
 						}

pages/notice/report.vue

@@ -4,16 +4,17 @@
 			title-color="#3D3D3D"></navigation-bar-vue>
 		<view class="notice-detail-last-box">
 			<view class="dl-notice-title">
-				<image class="dl-image" src="/static/platform/xiaohongshu.png" mode="aspectFit"></image>
+				<image class="dl-image" :src="'/static/platform/'+noticeDetail.platformCode+'.png'" mode="aspectFit">
-				<view class="dl-text">找小红书达人种草【蓝月亮】洗衣液</view>
+				</image>
+				<view class="dl-text">{{noticeDetail.title||''}}</view>
 			</view>
 			<view class="end-date-box">
-				<view class="end-date">截止日期：2024-03-04</view>
+				<view class="end-date">截止日期：{{noticeDetail.endDate||''}}</view>
 			</view>
 			<!-- 主体内容区域 -->
 			<view class="main-content">
 				<!-- 会员开通 -->
-				<view class="dl-member-box" @click="goMemberCard()">
+				<view class="dl-member-box" @click="goMemberCard()" v-if="!rightInfo.manyCardReport">
 					<view class="dl-left">
 						<image class="dl-icon" src="@/static/index/zuanshi.png" mode="aspectFit"></image>
 						<text>开通会员 添加更多名片</text>
@@ -23,7 +24,7 @@
 					</view>
 				</view>
 				<!-- 添加更多名片 -->
-				<view class="add-more-card" @click="goMemberCard()">
+				<view class="add-more-card" @click="goSignCard()" v-else>
 					<view class="dl-left">
 						<image class="dl-icon" src="@/static/detail/card.png" mode="aspectFit"></image>
 						<text>添加更多名片</text>
@@ -36,23 +37,23 @@
 				<view class="member-card-box" v-for="(item,index) in cardList">
 					<view class="card-title">
 						<!-- 需要根据平台code取对应的图片 TODO -->
-						<image src="@/static/platform/xiaohongshu.png" mode="aspectFit"></image>
+						<image :src="'/static/platform/'+item.platformCode+'.png'" mode="aspectFit"></image>
-						<text>小红书博主</text>
+						<text>{{item.platformName+'博主'}}</text>
 					</view>
 					<view class="card-content">
 						<view class="card-person-info">
 							<view class="card-name">
-								<view>小王同学</view>
+								<view>{{item.accountName}}</view>
 							</view>
 						</view>
 					</view>
 					<view class="card-bottom">
 						<view class="fans-dom">
-							粉丝 {{ formatNumberWithUnits(100000) }}
+							粉丝 {{ formatNumberWithUnits(item.fansNum) }}
 						</view>
 						<view class="change-dom-bg">
 						</view>
-						<view class="change-dom">
+						<view class="change-dom" @click="goMyCard()">
 							切换
 						</view>
 					</view>
@@ -65,12 +66,10 @@
 						<text>注意：为了您的信息安全，平台不建议填写您的银行卡号、身份证号、密码等隐私信息。</text>
 					</view>
 					<view class="field-form-box">
-						<uni-forms ref="baseForm" :modelValue="baseFormData">
+						<uni-forms>
-							<uni-forms-item label="姓名" required>
+							<uni-forms-item v-for="(it,idx) in signFormData.customForm" :label="it.label" required
-								<uni-easyinput type="text" v-model="baseFormData.name" placeholder="请输入姓名" />
+								labelWidth="100">
-							</uni-forms-item>
+								<uni-easyinput v-model="signFormData.customForm[idx].value" placeholder="请输入" />
-							<uni-forms-item label="年龄" required>
-								<uni-easyinput type="number" v-model="baseFormData.age" placeholder="请输入年龄" />
 							</uni-forms-item>
 						</uni-forms>
 					</view>
@@ -78,21 +77,21 @@
 				<!-- 联系方式 -->
 				<view class="custom-form-box" style="padding: 0 25rpx;">
 					<view class="field-form-box">
-						<uni-forms ref="telForm" :modelValue="telFormData">
+						<uni-forms ref="signForm" :modelValue="signFormData" :rules="signRules">
-							<uni-forms-item label="联系方式" required labelWidth="100">
+							<uni-forms-item label="联系方式" required labelWidth="100" name="tel">
-								<uni-easyinput type="number" v-model="baseFormData.name" placeholder="请输入姓名" />
+								<uni-easyinput type="number" v-model="signFormData.tel" placeholder="请输入微信/手机号" />
 							</uni-forms-item>
 						</uni-forms>
 					</view>
 				</view>
 				<!-- 收件地址 -->
-				<view class="custom-addr-box">
+				<view class="custom-addr-box" v-if="userAddr">
 					<view class="left-text">收件地址</view>
 					<view class="right-text">
-						<text>中国 山东省 济南市 历城区</text>
+						<text>{{userAddr.cityName}}</text>
-						<text>财富中心1007A</text>
+						<text>{{userAddr.detail}}</text>
-						<text>朱春运</text>
+						<text>{{userAddr.name}}</text>
-						<text>17862909999</text>
+						<text>{{userAddr.tel}}</text>
 					</view>
 					<view class="change-addr-dom">切换</view>
 				</view>
@@ -116,22 +115,69 @@
 		formatNumberWithUnits
 	} from '@/utils/common.js'
 	import navigationBarVue from '@/components/navigation/navigationBar.vue';
+	import {
+		getSignCard
+	} from '@/api/business/signCard.js'
+	import {
+		getNoticeDetail
+	} from '@/api/business/notice';
+	import {
+		hasRights
+	} from '@/utils/common.js'
+	import rightsCode from '@/utils/rightsCode.js'
+	import {
+		getUserAddress
+	} from '@/api/business/member.js'
 	export default {
 		components: {
 			navigationBarVue
 		},
 		data() {
 			return {
-				//使用的会员卡数组
+				signRules: {
-				cardList: ['', ''],
+					// 对联系方式字段进行必填验证
-				// 基础表单数据
+					tel: {
-				baseFormData: {
+						// tel 字段的校验规则
-					name: '',
+						rules: [
-					age: ''
+							// 校验 tel 不能为空
+							{
+								required: true,
+								errorMessage: '请填写联系方式',
+							}
+						]
+					}
 				},
+				noticeId: null,
+				//使用的会员卡数组
+				cardList: [],
+				// 基础表单数据
 				// 联系方式表单
-				telFormData: {
+				signFormData: {
-					tel: ""
+					tel: null,
+					customForm: []
+				},
+				//通告详情
+				noticeDetail: {
+					id: "",
+					title: "",
+					endDate: null,
+					feeDown: null,
+					feeUp: null,
+					needNum: null,
+					userId: null,
+					brand: null,
+					fansDown: null,
+					fansUp: null,
+					city: null,
+					bloggerTypes: null,
+					updateTime: null,
+					approvalStatus: '0',
+					viewNum: 0,
+					detail: null,
+					platformCode: "",
+					platformName: "",
+					//通告产品图
+					imageArray: []
 				},
 				// 校验规则
 				rules: {
@@ -151,9 +197,47 @@
 						}]
 					}
 				},
+				rightInfo: {
+					manyCardReport: false,
+					superReport: false
+				},
+				userAddr: null
 			}
 		},
+		onShow() {
+			this.getRightsCode()
+		},
+		onLoad(params) {
+			this.noticeId = params.noticeId
+			if (this.noticeId) {
+				this.getDetail()
+			}
+			this.getCard()
+			this.userAddress()
+			let that = this
+			uni.$on('updateCard', function(data) {
+				that.updateCard(data)
+			})
+
+		},
 		methods: {
+			userAddress() {
+				getUserAddress().then(res => {
+					if (res.data && res.data.length > 0) {
+						this.userAddr = res.data[0]
+					}
+				})
+			},
+			updateCard(data) {
+				console.log(data, 211);
+				this.cardList = data
+			},
+			/**
+			 * 跳转名片列表
+			 */
+			goMyCard() {
+				this.$tab.navigateTo('/pages/mine/card/my-card?ifChoose=true&noticeId=' + this.noticeId)
+			},
 			/**
 			 * 数值单位转换
 			 * @param {Object} number
@@ -161,8 +245,66 @@
 			formatNumberWithUnits(number) {
 				return formatNumberWithUnits(number)
 			},
+			getRightsCode() {
+				let info = hasRights(rightsCode.manyCardReport)
+				if (!info) {
+					this.rightInfo.manyCardReport = false
+				} else {
+					this.rightInfo.manyCardReport = true
+				}
+			},
+			goSignCard() {
+				this.$tab.navigateTo('/pages/mine/card/my-card')
+			},
+			goMemberCard() {
+				this.$tab.navigateTo('/pages/mine/member/member-card')
+			},
+			getDetail() {
+				getNoticeDetail({
+					noticeId: this.noticeId
+				}).then(res => {
+					if (res.code == 200) {
+						this.noticeDetail = res.data.noticeDetail
+						if (this.noticeDetail.customForm.length > 0) {
+							this.noticeDetail.customForm.forEach(it => {
+								this.signFormData.customForm.push({
+									label: it,
+									value: ''
+								})
+							})
+						}
+					}
+					console.log(this.signFormData, 269);
+				}).catch((e) => {
+					this.isTriggered = false
+					uni.showToast({
+						icon: 'error',
+						duration: 2000,
+						title: e
+					});
+				})
+			},
+			/**
+			 * 报名
+			 */
+			getCard() {
+				getSignCard({
+					noticeId: this.noticeId
+				}).then(res => {
+					if (this.cardList.length == 0) {
+						this.cardList.push(res.data.list[0])
+					}
+
+				}).catch((e) => {
+					uni.showToast({
+						icon: 'error',
+						duration: 2000,
+						title: e
+					});
+				})
+			},
 			submit() {
-				this.$refs.baseForm.validate().then(res => {
+				this.$refs.signForm.validate().then(res => {
 					console.log('success', res);
 					uni.showToast({
 						title: `校验通过`