From ab43aa2347459722276203ab7b8cea390ef68c0f Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Mon, 10 Jan 2022 17:01:27 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=20?= =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E7=B1=BB=E5=9E=8B=E7=9A=84=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meetingDetailSigned.js | 38 +++++++++++- .../meetingDetailSigned.wxml | 2 +- pages/scanSign/scanSign.js | 61 ++++++++++++++++--- pages/scanSign/scanSign.wxml | 6 +- pages/signUpEntrance/signUpEntrance.js | 2 + 5 files changed, 95 insertions(+), 14 deletions(-) diff --git a/pages/meetingDetailSigned/meetingDetailSigned.js b/pages/meetingDetailSigned/meetingDetailSigned.js index 0d67109..fabb38c 100644 --- a/pages/meetingDetailSigned/meetingDetailSigned.js +++ b/pages/meetingDetailSigned/meetingDetailSigned.js @@ -49,6 +49,38 @@ Page({ form: {}, showSignInBtn:false, // 是否显示签到按钮 isMoreTime:false, // 是否超过 会议截止报名时间 + meetingTypeText:"" // 会议类型 + }, + /* + * 会议类型 + * */ + initMeetingType(val) { + if (val) { + switch (val +'') { + case '1': + return '工作组会议' + case '2': + switch (this.data.meetingInfo.tbMeetingType + '') { + case '1': + return '标协会议-标准宣贯' + case '2': + return '标协会议-培训会' + case '3': + return '标协会议-信息交流会' + } + break + case '3': + return '国际研讨会' + case '4': + return '其他会议' + case '5': + return '分标委会议' + case '6': + return '理事会会议' + } + } else { + return '' + } }, compareCurrentTime(time) { let date = new Date() @@ -345,7 +377,8 @@ Page({ }) let flag = this.compareCurrentTime(meetingInfo.registerDeadline) this.setData({ - isMoreTime:flag + isMoreTime:flag, + meetingTypeText:this.initMeetingType(meetingInfo.meetingType) }) }else{ MeetingApi.meetingDetail({id:meetingInfo.id}).then(res => { @@ -355,7 +388,8 @@ Page({ }) let flag = this.compareCurrentTime(res.result.registerDeadline) this.setData({ - isMoreTime:flag + isMoreTime:flag, + meetingTypeText:this.initMeetingType(meetingInfo.meetingType) }) } }) diff --git a/pages/meetingDetailSigned/meetingDetailSigned.wxml b/pages/meetingDetailSigned/meetingDetailSigned.wxml index 7e2617d..433b764 100644 --- a/pages/meetingDetailSigned/meetingDetailSigned.wxml +++ b/pages/meetingDetailSigned/meetingDetailSigned.wxml @@ -6,7 +6,7 @@ 会议类型 - {{meetingInfo.meetingType_dictText}} + {{meetingTypeText}} 负责人 diff --git a/pages/scanSign/scanSign.js b/pages/scanSign/scanSign.js index 4ffa4ac..252edb1 100644 --- a/pages/scanSign/scanSign.js +++ b/pages/scanSign/scanSign.js @@ -13,7 +13,43 @@ Page({ form: {}, isSigned: 1, // 是否报名 fileId: '', // 图片id - src: null // 签名之后，保存签名的图片地址 + src: null ,// 签名之后，保存签名的图片地址 + meetingTypeText:"" + }, + + /* + * 会议类型 + * */ + initMeetingType(typeObj) { + + let val = typeObj.meetingType + console.log(val); + if (val) { + switch (val +'') { + case '1': + return '工作组会议' + case '2': + switch (typeObj.tbMeetingType + '') { + case '1': + return '标协会议-标准宣贯' + case '2': + return '标协会议-培训会' + case '3': + return '标协会议-信息交流会' + } + break + case '3': + return '国际研讨会' + case '4': + return '其他会议' + case '5': + return '分标委会议' + case '6': + return '理事会会议' + } + } else { + return '' + } }, // 去签到页 scanSign(){ @@ -80,7 +116,7 @@ Page({ // 这里是 微信扫码进入的逻辑 // 微信扫码 判断是否登录 - if(options.q) { + if(options.q || true) { let url = decodeURIComponent(options.q) let meetingId = url.split('=')[1] // 登录过的就直接签到 否则跳转登录页 @@ -91,7 +127,8 @@ Page({ }).then(res => { if (res.success) { that.setData({ - form:res.result + form:res.result, + meetingTypeText:this.initMeetingType(res.result) }) let src if(res.result.checkFile){ // 签到名回显 @@ -108,7 +145,8 @@ Page({ // }) } else { that.setData({ - form:res.result + form:res.result, + meetingTypeText:this.initMeetingType(res.result) }) // 未查到报名信息 that.setData({ @@ -131,7 +169,8 @@ Page({ // }) if (res.success) { that.setData({ - form:res.result + form:res.result, + meetingTypeText:this.initMeetingType(res.result) }) let src if(res.result.checkFile){ // 签到名回显 @@ -148,7 +187,8 @@ Page({ // }) } else { that.setData({ - form:res.result + form:res.result, + meetingTypeText:this.initMeetingType(res.result) }) // wx.showToast({ // title: '未查到报名信息...', @@ -177,7 +217,8 @@ Page({ }) let form = JSON.parse(options.meeting) this.setData({ - form + form, + meetingTypeText:that.initMeetingType(form) }) } // 这里是微信扫描失败 重新登录后 跳转签到页面执行的逻辑 isLoginSignIn是会议id @@ -192,7 +233,8 @@ Page({ }).then(res => { if (res.success) { that.setData({ - form:res.result + form:res.result, + meetingTypeText:this.initMeetingType(res.result) }) let src if(res.result.checkFile){ // 签到名回显 @@ -209,7 +251,8 @@ Page({ // }) } else { that.setData({ - form:res.result + form:res.result, + meetingTypeText:this.initMeetingType(res.result) }) // 未查到报名信息 that.setData({ diff --git a/pages/scanSign/scanSign.wxml b/pages/scanSign/scanSign.wxml index 7e89f33..da2f2d6 100644 --- a/pages/scanSign/scanSign.wxml +++ b/pages/scanSign/scanSign.wxml @@ -6,12 +6,14 @@ 会议类型 - 工作组会议 + + {{meetingTypeText}} + 召开时间 diff --git a/pages/signUpEntrance/signUpEntrance.js b/pages/signUpEntrance/signUpEntrance.js index 0cd5f85..addc9c4 100644 --- a/pages/signUpEntrance/signUpEntrance.js +++ b/pages/signUpEntrance/signUpEntrance.js @@ -132,6 +132,8 @@ Page({ return "其他会议" case "5": return "分标委会议" + case "6": + return "理事会会议" } }, // 标协会议类型