diff --git a/pages/meeting/meeting.js b/pages/meeting/meeting.js index fee4b02..6fb4a60 100644 --- a/pages/meeting/meeting.js +++ b/pages/meeting/meeting.js @@ -97,6 +97,10 @@ Page({ wx.navigateTo({ url: `../meetingDetailSigned/meetingDetailSigned?meetingInfo=${meetingInfo}`, // (已报名) }) + }else{ + wx.navigateTo({ + url: `../meetingDetailSigned/meetingDetailSigned?meetingInfo=${meetingInfo}`, // (已报名) + }) } }, diff --git a/pages/signUpEntrance/signUpEntrance.js b/pages/signUpEntrance/signUpEntrance.js new file mode 100644 index 0000000..1f950e9 --- /dev/null +++ b/pages/signUpEntrance/signUpEntrance.js @@ -0,0 +1,151 @@ +// pages/signUpEntrance/signUpEntrance.js +import MeetingApi from '../../assets/js/http/meetingApi' +import { + initFileList, + previewFile, + getFileInfo +} from '../../assets/js/preview' +import { + baseUrl, + URL_CONFIG +} from '../../assets/js/http/api' + +Page({ + + /** + * 页面的初始数据 + */ + data: { + // 会议详情信息 + meetingDetailIngfo: {}, + // 会议类型 + meetingType: '', + // 标协会议类型 1标准宣贯 2学习培训 + tbMeetingType:'', + // 会议通知文件资料数组 + meetingFilesList: [], + // 缴费二维码的图片路径 + payOrCode: '', + }, + // 获取会议详情 + queryMeetingDetail(id) { + const that = this + MeetingApi.meetingDetail({ + id + }).then(res => { + if (res.success) { + that.setData({ + meetingDetailIngfo: res.result, + meetingType: that.generateMeetingType(res.result.meetingType), + payOrCode: baseUrl + URL_CONFIG + 'sys/common/download/' + res.result.paymentQrCode, + tbMeetingType:that.generateTbMeetingType(res.result.tbMeetingType) + }) + initFileList(res.result.meetingFiles).then(res => { + that.setData({ + meetingFilesList: res, + }) + }) + } + }) + }, + // 报名 + signUp() { + // 不同的会议通跳转不同的会议页面 + let meetingType = this.data.meetingDetailIngfo.meetingType + + if (meetingType !== '3') { + wx.navigateTo({ + url: '../signUpPage/signUpPage', + }) + } else { + wx.navigateTo({ + url: '../signUpPageGuoji/signUpPageGuoji', + }) + } + }, + // 会议类型 + generateMeetingType(meetingType) { + switch (meetingType) { + case "1": + return "工作组会议" + case "2": + return "标协会议" + case "3": + return "国际研讨会议" + case "4": + return "其他会议" + case "5": + return "分标委会议" + } + }, + // 标协会议类型 + generateTbMeetingType(type) { + switch (type) { + case "1": + return "标准宣贯" + case "2": + return "学习培训" + } + }, + // 预览文件 + preview(e) { + console.log(e); + const fileObj = e.currentTarget.dataset.file; + previewFile(fileObj.id, fileObj.name) + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.queryMeetingDetail('1448568227696041986') + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/signUpEntrance/signUpEntrance.json b/pages/signUpEntrance/signUpEntrance.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/signUpEntrance/signUpEntrance.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/signUpEntrance/signUpEntrance.wxml b/pages/signUpEntrance/signUpEntrance.wxml new file mode 100644 index 0000000..f56899d --- /dev/null +++ b/pages/signUpEntrance/signUpEntrance.wxml @@ -0,0 +1,108 @@ + + + + + 会议名称 + {{meetingDetailIngfo.meetingName}} + + + 会议类型 + {{meetingType}} + + + + 标协会议类型 + {{tbMeetingType}} + + + + 负责人 + {{meetingDetailIngfo.directorName}} + + + 所属工作组 + {{meetingDetailIngfo.workingGroupName}} + + + + 所属分标委 + {{meetingDetailIngfo.caseCommitteeName}} + + + + 召开时间 + {{meetingDetailIngfo.startTime + '~' + meetingDetailIngfo.endTime }} + + + 召开地点 + {{meetingDetailIngfo.venue + '/' + meetingDetailIngfo.address}} + + + 年份 + {{meetingDetailIngfo.particularYear}} + + + 报名截止时间 + {{meetingDetailIngfo.registerDeadline}} + + + 会议费用 + {{meetingDetailIngfo.meetingCosts}} + + + + 会议费用(VIP) + {{meetingDetailIngfo.meetingCostsVip}} + + + + + + + 会议通知 + + + + {{item.name}} + + 查看 + + + + + 会议通知 + + + + {{item.name}} + + 暂无 + + + + + 缴费二维码 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pages/signUpEntrance/signUpEntrance.wxss b/pages/signUpEntrance/signUpEntrance.wxss new file mode 100644 index 0000000..a912798 --- /dev/null +++ b/pages/signUpEntrance/signUpEntrance.wxss @@ -0,0 +1,180 @@ +/* pages/signUpEntrance/signUpEntrance.wxss */ +page{ + box-sizing: border-box; + background-color: #F5F5F5; +} +.basic-info .title{ + height: 40px; +} +.basic-info .title text{ + display: block; + border-left: 3px solid #069F99; + height: 14px; + padding-left: 10px; + border-radius: 2px; + display: flex; + justify-content: center; + align-items: center; + color: #333; + font-size: 15px; + font-weight: 500; +} +.basic-info view{ + background-color: #FFF; + padding: 15px; + height: 40px; + display: flex; + justify-content: space-between; + align-items: center; + color: #333; + font-size: 14px; + border-bottom: 0.5px solid #f5f5f5; + position: relative; +} +.basic-info view:last-child{ + border-bottom: 0; +} +.meeting-name{ + margin-bottom: 10px; +} +.meeting-files{ + margin-top: 10px; + flex-direction: column; + align-items: flex-start !important; + height: auto !important; +} +.basic-info .meeting-files .file-name{ + display: flex; + justify-content: space-between; + align-items: center; + width: 100%; + box-sizing: border-box; + padding: 0; + height: 40px; + margin-top: 10px; +} +.file-name view{ + padding: 0; + height: 30px; + line-height: 30px; + border-bottom: 0; +} +.file-name view image{ + width: 30px; + height: 30px; + margin-right: 10px; +} +.basic-info .meeting-files .file-name .look-file{ + color: #069F99; +} +.warning-text{ + position: absolute !important; + top: 5px; + left: 75px; + color: #FF5E60 !important; + font-size: 10px !important; + padding: 0 !important; +} +.warning-text image{ + width: 10px; + height: 10px; +} +.pay-prove-box{ + display: flex !important; + flex-direction: column !important; + justify-content: flex-start !important; + align-items: flex-start !important; + padding: 0; + height: 120px !important; +} +.pay-prove-box .pay-prove-content{ + margin-top: 20px; + display: flex; + justify-content: flex-start; + align-items: center; + padding: 0; + height: 80px; +} +.pay-prove-box .pay-prove-content .pay-prove{ + width: 80px; + height: 80px; + margin-right: 10px; + position: relative !important; + background-color: #D1D1D1; + padding: 0; + border-radius: 5px; + display: flex; + justify-content: center; + align-items: center; +} +.pay-prove-box .pay-prove-content .pay-prove image{ + width: 80px; + height: 80px; +} +.pay-prove-box .pay-prove-content .pay-prove .delete-image{ + width: 12px; + height: 12px; + color: #fff; + background-color: #FF5E60; + border-radius: 50%; + display: flex; + justify-content: center; + align-items: center; + font-size: 7px; + position: absolute; + top: -3px; + right: -3px; +} +.sign-up-empty{ + height: 60px; + width: 100%; + display: block; + margin-top: 10px; +} +.sign-up{ + width: 100%; + padding: 10px 15px; + box-sizing: border-box; + background-color: #fff; + position: fixed; + bottom: 0; +} +.sign-up text{ + background-color: #069F99; + height: 40px; + border-radius: 10px; + color: #fff; + font-size: 16px; + font-weight: 600; + display: block; + text-align: center; + line-height: 40px; +} +.form-payQrCode { + height: 140px!important; + padding: 5rpx!important; +} +.payQrCode { + width: 120px; + height: 120px; + padding: 2px; + box-sizing: border-box; + border-radius: 4px; +} + +.sign-up-btn { + background-color: #069F99; + font-weight: 500; + color:#fff +} + +.basic-info view.sign-in { + display: flex!important; + flex-direction: column!important; + align-items: start; + justify-content: start; + height: auto!important; +} +.sign-in-text { +margin-top: 15px; +} \ No newline at end of file