diff --git a/pages/meetingDetailSigned/meetingDetailSigned.js b/pages/meetingDetailSigned/meetingDetailSigned.js index a00762b..eaec02c 100644 --- a/pages/meetingDetailSigned/meetingDetailSigned.js +++ b/pages/meetingDetailSigned/meetingDetailSigned.js @@ -45,6 +45,7 @@ Page({ signImgSrc: '', userId: '', form: {}, + showSignInBtn:false, // 是否显示签到按钮 }, // 获取图片的id @@ -276,6 +277,13 @@ Page({ previewFile(fileObj.id, fileObj.name) } }, + // 去签到 + toSignUp(){ + let meetingId = this.data.meetingInfo.id + wx.navigateTo({ + url: `../scanSign/scanSign?type=meetingDetail&meetingId=${meetingId}`, + }) + }, /** * 生命周期函数--监听页面加载 @@ -290,6 +298,16 @@ Page({ meetingInfo: meetingInfo, paymentQrCodeSrc:baseUrl + URL_CONFIG + 'sys/common/download/' + meetingInfo.paymentQrCode }) + // 如果会议的报名状态是待签到则显示去签到按钮 这里暂时写个5 不知道待签到的报名状态是几 + if(this.data.meetingInfo.signUpStatus === 4){ + this.setData({ + showSignInBtn:true + }) + }else{ + this.setData({ + showSignInBtn:false + }) + } wx.getStorage({ key: 'userInfo', diff --git a/pages/meetingDetailSigned/meetingDetailSigned.wxml b/pages/meetingDetailSigned/meetingDetailSigned.wxml index f581dee..994f99a 100644 --- a/pages/meetingDetailSigned/meetingDetailSigned.wxml +++ b/pages/meetingDetailSigned/meetingDetailSigned.wxml @@ -84,8 +84,10 @@ - + 参会单位 diff --git a/pages/scanSign/scanSign.js b/pages/scanSign/scanSign.js index 9b64a38..1f0adc3 100644 --- a/pages/scanSign/scanSign.js +++ b/pages/scanSign/scanSign.js @@ -88,10 +88,6 @@ Page({ UserApi.scanCode({ meetingId }).then(res => { - wx.showToast({ - title: '获取签到信息...', - icon: 'loading' - }) if (res.success) { that.setData({ form:res.result @@ -113,10 +109,6 @@ Page({ that.setData({ form:res.result }) - wx.showToast({ - title: '未查到报名信息...', - icon: 'loading' - }) // 未查到报名信息 that.setData({ isSigned: 0, @@ -125,6 +117,48 @@ Page({ }).catch(err => {}) }) } + // 这里是会议详情的跳转签到 + if(options.type === 'meetingDetail'){ + let meetingId = options.meetingId + UserApi.scanCode({ + meetingId + }).then(res => { + wx.showToast({ + title: '获取签到信息...', + icon: 'loading' + }) + if (res.success) { + that.setData({ + form:res.result + }) + let src + if(res.result.checkFile){ // 签到名回显 + src = baseUrl + URL_CONFIG + 'sys/common/download/' + res.result.checkFile + }else{ + src = '' + } + this.setData({ + isSigned: 1, + src + }) + // wx.navigateTo({ // 已报名 + // url: `../scanSign/scanSign?signed=1&meeting=${result}`, + // }) + } else { + that.setData({ + form:res.result + }) + wx.showToast({ + title: '未查到报名信息...', + icon: 'loading' + }) + // 未查到报名信息 + that.setData({ + isSigned: 0, + }) + } + }).catch(err => {}) + } // 这里是小程序内部的扫码签到 if(options.meeting){