diff --git a/pages/mine/set/my-info.vue b/pages/mine/set/my-info.vue index 6363afc..5c18cc5 100644 --- a/pages/mine/set/my-info.vue +++ b/pages/mine/set/my-info.vue @@ -13,7 +13,7 @@ - + diff --git a/pages/notice/detail.vue b/pages/notice/detail.vue index 6488871..63af7fb 100644 --- a/pages/notice/detail.vue +++ b/pages/notice/detail.vue @@ -108,19 +108,19 @@ {{!noticeDetail.isUrgent?'否':noticeDetail.isUrgent==1?'是':'否'}} - - - - 三方链接: + + + 三方报名链接(点击复制): - + + + {{noticeDetail.thirdUrl}} - - + - 三方链接: + 三方报名链接: 报名通过后可查看 @@ -229,7 +229,18 @@ - + + + + + 此通告需要收集博主信息 + 请复制通告到微信对话框填写信息报名 + + + 点击复制 + + + @@ -259,7 +270,8 @@ } from '@/api/business/base.js' import config from '@/config' import { - getSignCard + getSignCard, + userSign } from '@/api/business/signCard.js' import { getUrlLink @@ -271,6 +283,9 @@ }, data() { return { + signFormData: { + customForm: [] + }, navigatePath: '000', //是否是看自己的通告-通告主 viewMy: false, @@ -371,6 +386,25 @@ this.viewNotice() }, methods: { + copyUrl(url) { + uni.setClipboardData({ + data: url, + success: function() { + uni.showToast({ + title: '复制成功', + icon: 'none', + duration: 2000 + }); + }, + fail: function() { + uni.showToast({ + title: '复制失败', + icon: 'none', + duration: 2000 + }); + } + }); + }, goLogin() { uni.navigateTo({ url: '/pages/login?canBack=true' @@ -559,7 +593,7 @@ data: res.data, success: function() { uni.showToast({ - title: '名单复制成功,请到浏览器下载', + title: '复制成功', icon: 'none', duration: 2000 }); @@ -584,12 +618,26 @@ * 报名 */ goReport() { + let that = this getSignCard({ noticeId: this.noticeId }).then(res => { if (res.code == 200) { if (res.data.canUserNum > 0) { - this.$tab.navigateTo('/pages/notice/report?noticeId=' + this.noticeId) + if (this.noticeDetail.thirdUrl) { + //有第三方链接的不需要在本平台填写信息 + //处理卡片 + this.signFormData.noticeId = this.noticeDetail.id + this.signFormData.cardList = [res.data.list[0]] + this.signFormData.isSuper = 0 + userSign(this.signFormData).then(res => { + this.$refs.popupNew.open('center') + that.getDetail() + }) + } else { + this.$tab.navigateTo('/pages/notice/report?noticeId=' + this.noticeId) + } + } else { this.$refs.alertDialog.open() } @@ -602,7 +650,6 @@ title: e }); }) - }, /** * 分享 @@ -1040,4 +1087,24 @@ } } } + + .popup-content { + display: flex; + align-items: center; + justify-content: center; + flex-direction: column; + padding: 30rpx; + border-radius: 10px; + background-color: white; + + .dl-copy-button { + text-align: center; + margin: auto; + border-radius: 40rpx; + width: 75%; + background-color: #FC1F3E; + color: white; + padding: 15rpx 0; + } + } \ No newline at end of file