diff --git a/api/business/member.js b/api/business/member.js
index 3501a95..1f137e9 100644
--- a/api/business/member.js
+++ b/api/business/member.js
@@ -4,98 +4,105 @@ import request from '@/utils/request'
//------------------博主、通告主-----------------------
//查询博主详情
export function bloggerDetail(userId) {
- return request({
- url: '/member/member/bloggerDetail/' + userId,
- method: 'get'
- })
+ return request({
+ url: '/member/member/bloggerDetail/' + userId,
+ method: 'get'
+ })
}
//------------------开通会员-----------------------
export function saveOrder(data) {
- return request({
- url: '/member/order/uniSaveOrder',
- method: 'post',
- data: data
- })
+ return request({
+ url: '/member/order/uniSaveOrder',
+ method: 'post',
+ data: data
+ })
}
//------------------名片-----------------------
// 查询当前登录用户的名片
export function getUserBusiCard() {
- return request({
- url: '/member/busiCard/listByUser',
- method: 'get',
- })
+ return request({
+ url: '/member/busiCard/listByUser',
+ method: 'get',
+ })
}
// 获取博主名片详情
export function getBusiCardById(params) {
- return request({
- url: '/member/busiCard/getBusiCardById',
- method: 'get',
- params:params
- })
+ return request({
+ url: '/member/busiCard/getBusiCardById',
+ method: 'get',
+ params: params
+ })
}
//提交博主名片审核申请
export function applyBusiCard(data) {
- return request({
- url: '/member/busiCard/toApply',
- method: 'post',
- data: data
- })
+ return request({
+ url: '/member/busiCard/toApply',
+ method: 'post',
+ data: data
+ })
}
//删除名片信息
export function removeBusiCard(params) {
- return request({
- url: '/member/busiCard/remove',
- method: 'delete',
- params:params
- })
+ return request({
+ url: '/member/busiCard/remove',
+ method: 'delete',
+ params: params
+ })
}
//------------------地址-----------------------
// 查询当前登录用户的收货地址
export function getUserAddress() {
- return request({
- url: '/member/address/listByUser',
- method: 'get',
- })
+ return request({
+ url: '/member/address/listByUser',
+ method: 'get',
+ })
}
// 博主地址选择器
export function uniSelectList() {
- return request({
- url: '/member/address/uniSelectList',
- method: 'get',
- })
+ return request({
+ url: '/member/address/uniSelectList',
+ method: 'get',
+ })
}
//保存地址信息
export function saveAddress(data) {
- return request({
- url: '/member/address/save',
- method: 'post',
- data: data
- })
+ return request({
+ url: '/member/address/save',
+ method: 'post',
+ data: data
+ })
}
// 设置默认收货地址
export function setDefault(params) {
- return request({
- url: '/member/address/setDefault',
- method: 'get',
- params: params
- })
+ return request({
+ url: '/member/address/setDefault',
+ method: 'get',
+ params: params
+ })
}
// 删除地址
export function removeAddress(params) {
- return request({
- url: '/member/address/remove',
- method: 'delete',
- params:params
- })
+ return request({
+ url: '/member/address/remove',
+ method: 'delete',
+ params: params
+ })
}
// 获取地址详细信息
export function getById(params) {
- return request({
- url: '/member/address/getById',
- method: 'get',
- params:params
- })
+ return request({
+ url: '/member/address/getById',
+ method: 'get',
+ params: params
+ })
+}
+//获取会员权益
+export function selectMemberRights() {
+ return request({
+ url: '/member/card/selectMemberRights',
+ method: 'get'
+ })
}
\ No newline at end of file
diff --git a/api/business/signCard.js b/api/business/signCard.js
index da0ea27..25947b9 100644
--- a/api/business/signCard.js
+++ b/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
+ })
+}
\ No newline at end of file
diff --git a/pages/mine/card/my-card.vue b/pages/mine/card/my-card.vue
index d2d1c1d..0bf148a 100644
--- a/pages/mine/card/my-card.vue
+++ b/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 @@
}
}
}
-
+
\ No newline at end of file
diff --git a/pages/notice/detail.vue b/pages/notice/detail.vue
index ca2dd59..8c860b9 100644
--- a/pages/notice/detail.vue
+++ b/pages/notice/detail.vue
@@ -35,14 +35,14 @@
无稿费
- ¥{{noticeDetail.feeDown||''}}-{{noticeDetail.feeUp||''}}
+ ¥{{noticeDetail.feeDown||'0'}}-{{noticeDetail.feeUp||''}}
招募名额：
- {{noticeDetail.needNum||''}}人
+ {{noticeDetail.needNum||'0'}}人
@@ -55,7 +55,7 @@
粉丝要求：
- {{formatNumberWithUnits(noticeDetail.fansDown)||''}}-{{formatNumberWithUnits(noticeDetail.fansUp)||''}}
+ {{formatNumberWithUnits(noticeDetail.fansDown)||'0'}}-{{formatNumberWithUnits(noticeDetail.fansUp)||''}}
@@ -856,4 +856,4 @@
}
}
}
-
+
\ No newline at end of file
diff --git a/pages/notice/report.vue b/pages/notice/report.vue
index b065e2a..3128231 100644
--- a/pages/notice/report.vue
+++ b/pages/notice/report.vue
@@ -74,16 +74,7 @@
-
-
-
-
-
-
-
-
-
-
+
收件地址
@@ -98,11 +89,11 @@
-
+
超级报名
-
+
报名
@@ -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() {
- this.$refs.signForm.validate().then(res => {
- console.log('success', res);
+ submit(isSuper) {
+ if (isSuper == '1') {
+ 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 @@
}
}
}
-
+
\ No newline at end of file
diff --git a/utils/common.js b/utils/common.js
index 1174875..3831e93 100644
--- a/utils/common.js
+++ b/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) {
- //取用户当前身份
- let userType = getStrData(constant.userTypeKey)
- let userRights = {}
- if (constant.bz == userType) {
- //博主
- userRights = getJSONData(constant.userRightsKey)['bz']
- } else {
- //通告主
- userRights = getJSONData(constant.userRightsKey)['tgz']
- }
- //默认无权限
- let rtnData = false
- if (userRights.hasOwnProperty(code)) {
- rtnData = userRights[code]
- }
- return rtnData
+ return new Promise((resolve, reject) => {
+ //会员权益刷新
+ selectMemberRights().then(res => {
+ setJSONData(constant.userRightsKey, res.data)
+ //取用户当前身份
+ let userType = getStrData(constant.userTypeKey)
+ let userRights = {}
+ if (constant.bz == userType) {
+ //博主
+ userRights = getJSONData(constant.userRightsKey)['bz']
+ } else {
+ //通告主
+ userRights = getJSONData(constant.userRightsKey)['tgz']
+ }
+ //默认无权限
+ let rtnData = false
+ if (userRights.hasOwnProperty(code)) {
+ rtnData = userRights[code]
+ }
+ resolve(rtnData)
+
+ })
+ })
+
}
/**
* 切换用户当前身份