diff --git a/api/business/signCard.js b/api/business/signCard.js index 25947b9..7949b84 100644 --- a/api/business/signCard.js +++ b/api/business/signCard.js @@ -15,4 +15,13 @@ export function userSign(data) { method: 'post', data: data }) +} + + +export function saveSignInfo(data) { + return request({ + url: '/wxMsgApi/saveSignInfo', + method: 'get', + params: data + }) } \ No newline at end of file diff --git a/components/navigation/navigationBar.vue b/components/navigation/navigationBar.vue index fe9a4d0..ba0f707 100644 --- a/components/navigation/navigationBar.vue +++ b/components/navigation/navigationBar.vue @@ -50,7 +50,7 @@ methods: { back() { console.log('返回'); - if (this.navigatePath != '000') { + if (this.navigatePath && this.navigatePath != '000') { this.$tab.navigateTo(this.navigatePath) } else { uni.navigateBack() diff --git a/config.js b/config.js index e49fb22..cc7d138 100644 --- a/config.js +++ b/config.js @@ -1,8 +1,8 @@ // 应用全局配置 module.exports = { //baseUrl: 'https://3w823u8516.vicp.fun/noticeApi', - baseUrl: 'https://www.ddtg.site/noticeApi', - //baseUrl: 'http://192.168.1.6:8088', + //baseUrl: 'https://www.ddtg.site/noticeApi', + baseUrl: 'http://192.168.1.31:8088', // 应用信息 appInfo: { // 应用名称 diff --git a/pages/mine/card/card-detail.vue b/pages/mine/card/card-detail.vue index d4d1188..2896aa5 100644 --- a/pages/mine/card/card-detail.vue +++ b/pages/mine/card/card-detail.vue @@ -76,7 +76,7 @@ 商单自报价(选填) - + @@ -89,7 +89,7 @@ - 证明材料 + 首页截图 - 可用积分 + 全部积分 {{pointsBalance}} + + + + 可提现积分 + + {{canUseBalance||0}} + + 提现 @@ -137,6 +145,7 @@ isTriggered: false, userId: null, pointsBalance: 0, + canUseBalance: 0, money: "", interval: null } @@ -169,6 +178,7 @@ } queryDetail(param).then(res => { this.pointsBalance = res.data.pointsBalance.toString() + this.canUseBalance = res.data.canUseBalance.toString() this.$forceUpdate() }) }, diff --git a/pages/notice/detail.vue b/pages/notice/detail.vue index 43adcf7..32f7489 100644 --- a/pages/notice/detail.vue +++ b/pages/notice/detail.vue @@ -216,6 +216,7 @@ --> + + @@ -237,10 +239,12 @@ 此通告需要收集博主信息 - 请复制通告到微信对话框填写信息报名 - 点击复制 + + @@ -277,7 +281,8 @@ import config from '@/config' import { getSignCard, - userSign + userSign, + saveSignInfo } from '@/api/business/signCard.js' import { getUrlLink @@ -292,7 +297,7 @@ signFormData: { customForm: [] }, - navigatePath: '000', + navigatePath: null, //是否是看自己的通告-通告主 viewMy: false, //通告ID @@ -392,11 +397,21 @@ this.userInfo = getJSONData(constant.userInfo) this.getRole() } - this.getDetail() this.viewNotice() }, methods: { + openCus() { + // 直接调用微信的客服消息接口(如果适用) + const button = this.$refs.contactButton; + button.click(); + if (button && typeof button.click === 'function') { + button.click(); + } + + + + }, getRole() { getInfo().then(res => { if (res.roles.indexOf('xsry') > -1) { @@ -505,11 +520,13 @@ this.$tab.navigateTo(`/pages/index`) }, goReportForm() { - this.$tab.navigateTo('/pages/mine/set/report-form?userId=' + this.userDetail.userId + '¬iceId=' + this + this.$tab.navigateTo('/pages/mine/set/report-form?userId=' + this.userDetail.userId + + '¬iceId=' + this .noticeId) }, goMemberIndex() { - this.$tab.navigateTo('/pages/mine/member/member-index?userId=' + this.userDetail.userId + '¬iceId=' + + this.$tab.navigateTo('/pages/mine/member/member-index?userId=' + this.userDetail.userId + + '¬iceId=' + this .noticeId) }, @@ -649,11 +666,17 @@ this.signFormData.cardList = [res.data.list[0]] this.signFormData.isSuper = 0 userSign(this.signFormData).then(res => { - this.$refs.popupNew.open('center') + //发送客服消息 + saveSignInfo({ + signId: this.noticeDetail.id + }).then(res => { + this.$refs.popupNew.open('center') + }) that.getDetail() }) } else { - this.$tab.navigateTo('/pages/notice/report?noticeId=' + this.noticeId) + this.$tab.navigateTo('/pages/notice/report?noticeId=' + this + .noticeId) } } else { diff --git a/pages/notice/public-notice.vue b/pages/notice/public-notice.vue index feb3209..9698b88 100644 --- a/pages/notice/public-notice.vue +++ b/pages/notice/public-notice.vue @@ -210,15 +210,15 @@ placeholder="请输入通告明细" /> --> - - + + 三方报名链接 @@ -589,7 +589,7 @@ // icon: 'none', // duration: 1000 // }) - // return + // return true; // } }, //预览功能