diff --git a/pages/meeting/meeting.js b/pages/meeting/meeting.js index 16bd4fd..b911a04 100644 --- a/pages/meeting/meeting.js +++ b/pages/meeting/meeting.js @@ -18,7 +18,7 @@ Page({ meetingStartTime: '', // 开始时间 meetingEndTime: '', // 结束时间 // 创建时间倒叙排序 - column: 'pm.createTime', + column: 'createTime', order: 'desc' }, // 会议筛选参数 diff --git a/pages/meetingDetailSigned/meetingDetailSigned.js b/pages/meetingDetailSigned/meetingDetailSigned.js index eaec02c..bbbe19a 100644 --- a/pages/meetingDetailSigned/meetingDetailSigned.js +++ b/pages/meetingDetailSigned/meetingDetailSigned.js @@ -29,6 +29,8 @@ Page({ meetingFilesList: [], // 会议资料文件数组 meetingDataList: [], + // 会议纪要文件数组 + meetingJiyaoList:[], // 演讲ppt speechPptList: [], // 照片 @@ -206,7 +208,7 @@ Page({ // 只有审核通过的才可以去下载 if (this.data.singInPersonInfo.checkResult !== 1) { wx.showToast({ - title: '您的信息尚未审核通过,请等待审核通过', + title: '会议报名并审核通过后才可查看文件', icon: 'none', duration: 3000 }) @@ -295,9 +297,19 @@ Page({ console.log(meetingInfo); const that = this this.setData({ - meetingInfo: meetingInfo, paymentQrCodeSrc:baseUrl + URL_CONFIG + 'sys/common/download/' + meetingInfo.paymentQrCode }) + MeetingApi.meetingDetail({id:meetingInfo.id}).then(res => { + if(res.success){ + this.setData({ + meetingInfo:res.result + }) + }else{ + this.setData({ + meetingInfo:meetingInfo + }) + } + }) // 如果会议的报名状态是待签到则显示去签到按钮 这里暂时写个5 不知道待签到的报名状态是几 if(this.data.meetingInfo.signUpStatus === 4){ this.setData({ @@ -333,7 +345,8 @@ Page({ // let { meetingFiles, - meetingData + meetingData, + meetingMinute } = meetingInfo // 获取参会人信息 this.queryPeronInfo(meetingInfo.situationId) @@ -345,12 +358,18 @@ Page({ }) }) - // 会议通知文件 + // 会议通知文件meetingFiles this.initFileList(meetingFiles).then(res => { that.setData({ meetingFilesList: res }) }) + // 会议纪要文件 + this.initFileList(meetingMinute).then(res => { + that.setData({ + meetingJiyaoList: res + }) + }) }, diff --git a/pages/meetingDetailSigned/meetingDetailSigned.wxml b/pages/meetingDetailSigned/meetingDetailSigned.wxml index 994f99a..90af543 100644 --- a/pages/meetingDetailSigned/meetingDetailSigned.wxml +++ b/pages/meetingDetailSigned/meetingDetailSigned.wxml @@ -33,17 +33,17 @@ {{meetingInfo.particularYear}} - + 会议费用(VIP) {{meetingInfo.meetingCostsVip}} - + 所属分标委 {{meetingInfo.caseCommitteeName}} - + 所属工作组 {{meetingInfo.workingGroupName}} @@ -81,9 +81,41 @@ 暂无 + + + 会议纪要 + + + + {{item.name}} + + 查看 + + 暂无 + + + + + 酒店信息 + + + 酒店名称 + {{meetingInfo.hotelName}} + + + 酒店地址 + {{meetingInfo.hotelAddress}} + + + 酒店联系人 + {{item.hotelContacts + ':' + item.hotelContactsPhone + ' '}} + + + - + - + 报名信息 @@ -277,7 +310,7 @@ - - + 到账信息 - {{item.paymentDate}}到账{{item.amountReceived}}元 + {{item.paymentDate}}到账{{item.amountReceived}}元 暂无到账记录! @@ -520,7 +554,8 @@ 项目名称: - {{item.projectName}} + {{item.projectName}} + @@ -569,4 +604,4 @@ wx:if="{{singInPersonInfo.checkResult !== 1 && meetingInfo.meetingStatus == 3 && singInPersonInfo.payMode && singInPersonInfo.payMode !== 3 }}"> 确定 - + \ No newline at end of file diff --git a/pages/meetingDetailSigned/meetingDetailSigned.wxss b/pages/meetingDetailSigned/meetingDetailSigned.wxss index ff77b36..e4703f5 100644 --- a/pages/meetingDetailSigned/meetingDetailSigned.wxss +++ b/pages/meetingDetailSigned/meetingDetailSigned.wxss @@ -316,3 +316,7 @@ margin-top: 15px; text-align: center; line-height: 26px; } + +.hotel-info { + margin-top: 10px; +}