报名功能

api/business/member.js

@@ -4,98 +4,105 @@ import request from '@/utils/request'
 //------------------博主、通告主-----------------------
 //查询博主详情
 export function bloggerDetail(userId) {
-    return request({
+	return request({
-        url: '/member/member/bloggerDetail/' + userId,
+		url: '/member/member/bloggerDetail/' + userId,
-        method: 'get'
+		method: 'get'
-    })
+	})
 }
 
 
 //------------------开通会员-----------------------
 export function saveOrder(data) {
-    return request({
+	return request({
-        url: '/member/order/uniSaveOrder',
+		url: '/member/order/uniSaveOrder',
-        method: 'post',
+		method: 'post',
-        data: data
+		data: data
-    })
+	})
 }
 //------------------名片-----------------------
 // 查询当前登录用户的名片
 export function getUserBusiCard() {
-    return request({
+	return request({
-        url: '/member/busiCard/listByUser',
+		url: '/member/busiCard/listByUser',
-        method: 'get',
+		method: 'get',
-    })
+	})
 }
 // 获取博主名片详情
 export function getBusiCardById(params) {
-    return request({
+	return request({
-        url: '/member/busiCard/getBusiCardById',
+		url: '/member/busiCard/getBusiCardById',
-        method: 'get',
+		method: 'get',
-        params:params
+		params: params
-    })
+	})
 }
 //提交博主名片审核申请
 export function applyBusiCard(data) {
-    return request({
+	return request({
-        url: '/member/busiCard/toApply',
+		url: '/member/busiCard/toApply',
-        method: 'post',
+		method: 'post',
-        data: data
+		data: data
-    })
+	})
 }
 //删除名片信息
 export function removeBusiCard(params) {
-    return request({
+	return request({
-        url: '/member/busiCard/remove',
+		url: '/member/busiCard/remove',
-        method: 'delete',
+		method: 'delete',
-        params:params
+		params: params
-    })
+	})
 }
 
 //------------------地址-----------------------
 // 查询当前登录用户的收货地址
 export function getUserAddress() {
-    return request({
+	return request({
-        url: '/member/address/listByUser',
+		url: '/member/address/listByUser',
-        method: 'get',
+		method: 'get',
-    })
+	})
 }
 // 博主地址选择器
 export function uniSelectList() {
-    return request({
+	return request({
-        url: '/member/address/uniSelectList',
+		url: '/member/address/uniSelectList',
-        method: 'get',
+		method: 'get',
-    })
+	})
 }
 //保存地址信息
 export function saveAddress(data) {
-    return request({
+	return request({
-        url: '/member/address/save',
+		url: '/member/address/save',
-        method: 'post',
+		method: 'post',
-        data: data
+		data: data
-    })
+	})
 }
 // 设置默认收货地址
 export function setDefault(params) {
-    return request({
+	return request({
-        url: '/member/address/setDefault',
+		url: '/member/address/setDefault',
-        method: 'get',
+		method: 'get',
-        params: params
+		params: params
-    })
+	})
 }
 // 删除地址
 export function removeAddress(params) {
-    return request({
+	return request({
-        url: '/member/address/remove',
+		url: '/member/address/remove',
-        method: 'delete',
+		method: 'delete',
-        params:params
+		params: params
-    })
+	})
 }
 // 获取地址详细信息
 export function getById(params) {
-    return request({
+	return request({
-        url: '/member/address/getById',
+		url: '/member/address/getById',
-        method: 'get',
+		method: 'get',
-        params:params
+		params: params
-    })
+	})
+}
+//获取会员权益
+export function selectMemberRights() {
+	return request({
+		url: '/member/card/selectMemberRights',
+		method: 'get'
+	})
 }

api/business/signCard.js

@@ -1,10 +1,18 @@
 import request from '@/utils/request'
 
-// 关注取消关注
+
 export function getSignCard(params) {
 	return request({
 		url: '/member/busiCard/getSignCard',
-		method: '',
+		method: 'get',
 		params: params
 	})
 }
+
+export function userSign(data) {
+	return request({
+		url: '/busi/sign/userSign',
+		method: 'post',
+		data: data
+	})
+}

pages/mine/card/my-card.vue

@@ -126,7 +126,8 @@
 		methods: {
 			chooseOk() {
 				let info = hasRights(rightsCode.manyCardReport)
-				if (!info && this.busiCardList.length > 1) {
+				let tempList = this.busiCardList.filter((item) => item.choosed.length > 0)
+				if (!info && tempList.length > 1) {
 					//未开通不可选多个
 					uni.showToast({
 						title: '未开通会员不可添加多个',
@@ -134,7 +135,7 @@
 					})
 					return
 				}
-				uni.$emit('updateCard', this.busiCardList)
+				uni.$emit('updateCard', tempList)
 				uni.navigateBack()
 			},
 			/**
@@ -474,4 +475,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/notice/detail.vue

@@ -35,14 +35,14 @@
 						</view>
 						<view class="dl-value">
 							<text v-if="null==noticeDetail.feeUp">无稿费</text>
-							<text v-else>¥{{noticeDetail.feeDown||''}}-{{noticeDetail.feeUp||''}}</text>
+							<text v-else>¥{{noticeDetail.feeDown||'0'}}-{{noticeDetail.feeUp||''}}</text>
 						</view>
 					</view>
 					<view class="dl-item">
 						<view class="dl-label">
 							招募名额：
 						</view>
-						<view class="dl-value">{{noticeDetail.needNum||''}}人 </view>
+						<view class="dl-value">{{noticeDetail.needNum||'0'}}人 </view>
 					</view>
 					<view class="dl-item">
 						<view class="dl-label">
@@ -55,7 +55,7 @@
 							粉丝要求：
 						</view>
 						<view class="dl-value">
-							{{formatNumberWithUnits(noticeDetail.fansDown)||''}}-{{formatNumberWithUnits(noticeDetail.fansUp)||''}}
+							{{formatNumberWithUnits(noticeDetail.fansDown)||'0'}}-{{formatNumberWithUnits(noticeDetail.fansUp)||''}}
 						</view>
 					</view>
 					<view class="dl-item">
@@ -856,4 +856,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/notice/report.vue

@@ -74,16 +74,7 @@
 						</uni-forms>
 					</view>
 				</view>
-				<!-- 联系方式 -->
+
-				<view class="custom-form-box" style="padding: 0 25rpx;">
-					<view class="field-form-box">
-						<uni-forms ref="signForm" :modelValue="signFormData" :rules="signRules">
-							<uni-forms-item label="联系方式" required labelWidth="100" name="tel">
-								<uni-easyinput type="number" v-model="signFormData.tel" placeholder="请输入微信/手机号" />
-							</uni-forms-item>
-						</uni-forms>
-					</view>
-				</view>
 				<!-- 收件地址 -->
 				<view class="custom-addr-box" v-if="userAddr">
 					<view class="left-text">收件地址</view>
@@ -98,11 +89,11 @@
 			</view>
 			<!-- 去报名，始终浮动下方 -->
 			<view class="dl-bottom-box" v-show="showBottom">
-				<view class="supper-report">
+				<view class="supper-report" @click="submit('1')">
 					超级报名
 					<image class="dl-vip" src="@/static/index/vip.png" mode="aspectFit"></image>
 				</view>
-				<view class="report-dom" @click="submit()">
+				<view class="report-dom" @click="submit('0')">
 					报名
 				</view>
 			</view>
@@ -116,7 +107,8 @@
 	} from '@/utils/common.js'
 	import navigationBarVue from '@/components/navigation/navigationBar.vue';
 	import {
-		getSignCard
+		getSignCard,
+		userSign
 	} from '@/api/business/signCard.js'
 	import {
 		getNoticeDetail
@@ -153,7 +145,6 @@
 				// 基础表单数据
 				// 联系方式表单
 				signFormData: {
-					tel: null,
 					customForm: []
 				},
 				//通告详情
@@ -274,7 +265,6 @@
 							})
 						}
 					}
-					console.log(this.signFormData, 269);
 				}).catch((e) => {
 					this.isTriggered = false
 					uni.showToast({
@@ -303,14 +293,36 @@
 					});
 				})
 			},
-			submit() {
+			submit(isSuper) {
-				this.$refs.signForm.validate().then(res => {
+				if (isSuper == '1') {
-					console.log('success', res);
+					let flag = hasRights(rightsCode.superReport)
+					if (!flag) {
+						uni.showToast({
+							title: '无超级报名权益',
+							icon: 'none',
+							duration: 1000
+						})
+						return
+					}
+				}
+				//处理卡片
+				this.signFormData.noticeId = this.noticeId
+				this.signFormData.cardList = this.cardList
+				if (this.userAddr) {
+					this.signFormData.addressId = this.userAddr.id
+				}
+				this.signFormData.isSuper = isSuper
+				userSign(this.signFormData).then(res => {
 					uni.showToast({
-						title: `校验通过`
+						title: '报名成功',
+						duration: 1000
 					})
-				}).catch(err => {
+
-					console.log('err', err);
+
+					setTimeout(() => {
+						uni.navigateBack()
+					}, 1000);
+
 				})
 			}
 		}
@@ -755,4 +767,4 @@
 			}
 		}
 	}
-</style>
+</style>

utils/common.js

@@ -6,6 +6,9 @@ import {
 	getStrData
 } from '@/utils/auth'
 import constant from '@/utils/constant'
+import {
+	selectMemberRights
+} from '@/api/business/member.js'
 
 export function getWXStatusHeight() {
 	// #ifdef MP-WEIXIN
@@ -35,22 +38,30 @@ export function getWXStatusHeight() {
  * @param {Object} code 权益code
  */
 export function hasRights(code) {
-	//取用户当前身份
+	return new Promise((resolve, reject) => {
-	let userType = getStrData(constant.userTypeKey)
+		//会员权益刷新
-	let userRights = {}
+		selectMemberRights().then(res => {
-	if (constant.bz == userType) {
+			setJSONData(constant.userRightsKey, res.data)
-		//博主
+			//取用户当前身份
-		userRights = getJSONData(constant.userRightsKey)['bz']
+			let userType = getStrData(constant.userTypeKey)
-	} else {
+			let userRights = {}
-		//通告主
+			if (constant.bz == userType) {
-		userRights = getJSONData(constant.userRightsKey)['tgz']
+				//博主
-	}
+				userRights = getJSONData(constant.userRightsKey)['bz']
-	//默认无权限
+			} else {
-	let rtnData = false
+				//通告主
-	if (userRights.hasOwnProperty(code)) {
+				userRights = getJSONData(constant.userRightsKey)['tgz']
-		rtnData = userRights[code]
+			}
-	}
+			//默认无权限
-	return rtnData
+			let rtnData = false
+			if (userRights.hasOwnProperty(code)) {
+				rtnData = userRights[code]
+			}
+			resolve(rtnData)
+
+		})
+	})
+
 }
 /**
  * 切换用户当前身份