From f3461751917a77f6f1f2afc567a9e9d02141caf9 Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Mon, 18 Oct 2021 16:13:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E6=8A=A5=E5=90=8D=E4=BC=9A=E8=AE=AE?= =?UTF-8?q?=E7=9A=84=E4=B8=8A=E4=BC=A0=E5=87=AD=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/js/http/signUp.js | 2 + .../meetingDetailSigned.js | 115 +++++++++++------- .../meetingDetailSigned.json | 4 +- .../meetingDetailSigned.wxml | 85 +++++++------ .../meetingDetailSigned.wxss | 46 ++++++- 5 files changed, 167 insertions(+), 85 deletions(-) diff --git a/assets/js/http/signUp.js b/assets/js/http/signUp.js index f5801c5..c126bb2 100644 --- a/assets/js/http/signUp.js +++ b/assets/js/http/signUp.js @@ -19,6 +19,8 @@ const signUpApi = { addPersonNoLimit: (params) => http.post(`${URL_CONFIG}company/payContactsManagement/addMeeting`, params), // 会议报名接口 signUpMeeting:(params) => http.post(`${URL_CONFIG}meeting/payMeetingSituation/signUp`, params), + // 上传汇款凭证 + uploadPayRecord:(params) =>http.post(`${URL_CONFIG}meeting/payMeetingSituation/editTerminal`, params), } export default signUpApi \ No newline at end of file diff --git a/pages/meetingDetailSigned/meetingDetailSigned.js b/pages/meetingDetailSigned/meetingDetailSigned.js index 6cd2d05..f64ded7 100644 --- a/pages/meetingDetailSigned/meetingDetailSigned.js +++ b/pages/meetingDetailSigned/meetingDetailSigned.js @@ -1,7 +1,10 @@ // pages/meeting/meeting.js -import {previewFile} from '../../assets/js/preview' +import { + previewFile +} from '../../assets/js/preview' import MeetingApi from '../../assets/js/http/meetingApi' +import signUpApi from '../../assets/js/http/signUp' Page({ /** @@ -10,44 +13,64 @@ Page({ data: { payProveImage: '', // 会议详情 - meetingInfo:{}, + meetingInfo: {}, // 参会人信息 - singInPersonInfo:{}, + singInPersonInfo: {}, // 会议通知文件资料数组 - meetingFilesList:[], + meetingFilesList: [], // 会议资料文件数组 - meetingDataList:[] - + meetingDataList: [], + // 缴费凭证id + imageIds:[], + // 订单后四位 + ordeCode:'' }, - // 上传缴费凭证 - uploadImage(){ - const that = this - wx.chooseImage({ - count: 1, - sizeType: ['original', 'compressed'], - sourceType: ['album', 'camera'], - success (res) { - // tempFilePath可以作为img标签的src属性显示图片 - that.setData({ - payProveImage: res.tempFilePaths - }) - console.log(that.data.payProveImage) + // 获取图片的id + getImagesId(e) { + this.setData({ + imageIds: e.detail.join(',') + }) + }, + // 订单后四位 + setOrdeCode(e){ + this.setData({ + ordeCode:e.detail.value + }) + }, + // 上传汇款凭证 + editPayRecord(){ + + const param = { + id:this.data.meetingInfo.situationId, + orderCode:this.data.ordeCode, + paymentRecord:this.data.imageIds + } + signUpApi.uploadPayRecord(param).then(res => { + console.log(res); + if(res.success){ + wx.showToast({ + title:res.message, + icon: "success", + duration: 800, + }); + }else{ + wx.showToast({ + title:res.message, + icon: "error", + duration: 800, + }); } }) }, - // 删除缴费凭证 - delete(){ - this.setData({ - payProveImage: '' - }) - }, //参会人信息 - queryPeronInfo(id){ - MeetingApi.queryPersongInfoById({id:id}).then(res => { - if(res.success){ + queryPeronInfo(id) { + MeetingApi.queryPersongInfoById({ + id: id + }).then(res => { + if (res.success) { this.setData({ - singInPersonInfo:res.result + singInPersonInfo: res.result }) } }) @@ -56,7 +79,9 @@ Page({ getFileInfo(id) { return new Promise(resolve => { let result = {} - MeetingApi.queryFileInfoById({ id: id }).then(res => { + MeetingApi.queryFileInfoById({ + id: id + }).then(res => { if (res.success) { result = res.result } @@ -66,14 +91,17 @@ Page({ }) }, // 获取文件信息 - async initFileList(fileIds) { + async initFileList(fileIds) { if (fileIds) { const fileList = [] let arr = fileIds.split(',') for (let i = 0; i < arr.length; i++) { let fileObj = {} fileObj = await this.getFileInfo(arr[i]) - fileList.push({ id: fileObj.id, name: fileObj.fileName }) + fileList.push({ + id: fileObj.id, + name: fileObj.fileName + }) } return fileList } @@ -81,7 +109,7 @@ Page({ // 预览 previewFile(e) { const fileObj = e.currentTarget.dataset.file - previewFile(fileObj.id,fileObj.name) + previewFile(fileObj.id, fileObj.name) }, /** * 生命周期函数--监听页面加载 @@ -92,26 +120,29 @@ Page({ console.log(meetingInfo); const that = this this.setData({ - meetingInfo:meetingInfo + meetingInfo: meetingInfo }) // - let {meetingFiles,meetingData} = meetingInfo + let { + meetingFiles, + meetingData + } = meetingInfo // 获取参会人信息 - this.queryPeronInfo(meetingInfo.id) + this.queryPeronInfo(meetingInfo.situationId) // this.queryFileInfo(meetingFiles) // 获取会议资料文件 this.initFileList(meetingData).then(res => { - that.setData({ - meetingDataList:res - }) + that.setData({ + meetingDataList: res + }) }) // 会议通知文件 this.initFileList(meetingFiles).then(res => { that.setData({ - meetingFilesList:res + meetingFilesList: res }) - }) + }) }, @@ -163,4 +194,4 @@ Page({ onShareAppMessage: function () { } -}) +}) \ No newline at end of file diff --git a/pages/meetingDetailSigned/meetingDetailSigned.json b/pages/meetingDetailSigned/meetingDetailSigned.json index 28c7f23..345645b 100644 --- a/pages/meetingDetailSigned/meetingDetailSigned.json +++ b/pages/meetingDetailSigned/meetingDetailSigned.json @@ -1,4 +1,6 @@ { "navigationBarTitleText": "会议详情", - "usingComponents": {} + "usingComponents": { + "image-upload":"../../components/imageUpload/imageUpload" + } } \ No newline at end of file diff --git a/pages/meetingDetailSigned/meetingDetailSigned.wxml b/pages/meetingDetailSigned/meetingDetailSigned.wxml index fd92bc3..1f03272 100644 --- a/pages/meetingDetailSigned/meetingDetailSigned.wxml +++ b/pages/meetingDetailSigned/meetingDetailSigned.wxml @@ -12,13 +12,13 @@ 负责人 {{meetingInfo.directorName}} - + 召开时间 - {{meetingInfo.startTime + '至' + meetingInfo.endTime}} + - + 报名截止时间 @@ -33,13 +33,13 @@ {{meetingInfo.particularYear}} - + 会议费用（VIP） {{meetingInfo.meetingCostsVip}} - + 会议通知 @@ -48,7 +48,7 @@ {{item.name}} - 查看 + 查看 @@ -58,14 +58,14 @@ 单个账号会议文件只可发送五次 - + {{item.name}} - 查看 + 查看 - 暂无 + 暂无 @@ -87,45 +87,50 @@ 抵达时间 - {{singInPersonInfo.arrivalTime}} + {{singInPersonInfo.arrivalTime === null ? '' : singInPersonInfo.arrivalTime}} 离开时间 - {{singInPersonInfo.departureTime}} + {{singInPersonInfo.departureTime === null ? '' : singInPersonInfo.departureTime}} 邮寄联系人 - {{singInPersonInfo.postContactName}} + {{singInPersonInfo.postContactName === null ? '' :singInPersonInfo.postContactName}} 缴费方式 - {{singInPersonInfo.payMode_dictText}} + {{singInPersonInfo.payMode_dictText === null ? '':singInPersonInfo.payMode_dictText }} 是否需要发票 - {{singInPersonInfo.needInvoice_dictText}} + {{singInPersonInfo.needInvoice_dictText === null ? '': singInPersonInfo.needInvoice_dictText}} - + 邮寄地址 - {{singInPersonInfo.postContactAddress}} + 邮编 - {{singInPersonInfo.postCode}} - - - 缴费凭证 - - - - × - - - - - + {{singInPersonInfo.postCode === null ? '' :singInPersonInfo.postCode}} + + + + 缴费凭证 + + + + + + + + 缴费订单号后四位数 + + + 请在会议期间内上传缴费凭证和缴费订单号后四位 + + @@ -138,16 +143,18 @@ + - - - - - - + + + + + + + - 确定 + 确定 - + \ No newline at end of file diff --git a/pages/meetingDetailSigned/meetingDetailSigned.wxss b/pages/meetingDetailSigned/meetingDetailSigned.wxss index 1b59a72..5bd420e 100644 --- a/pages/meetingDetailSigned/meetingDetailSigned.wxss +++ b/pages/meetingDetailSigned/meetingDetailSigned.wxss @@ -92,7 +92,7 @@ page{ justify-content: flex-start; align-items: center; padding: 0; - height: 80px; + height: 200px; } .pay-prove-box .pay-prove-content .pay-prove{ width: 80px; @@ -106,10 +106,10 @@ page{ justify-content: center; align-items: center; } -.pay-prove-box .pay-prove-content .pay-prove image{ +/* .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; @@ -159,3 +159,43 @@ page{ bottom: 0; margin: auto; } + +.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; +} + +.payment-record { + background: #fff; + margin-top: 20rpx; +} +.p-20 { + padding: 10px 20px; + box-sizing: border-box; +} + +.payment-text { + margin-top: 10px; +} +.input { + margin: 10px 0; + border: 1px solid #eee; + padding-left: 10rpx; + height: 30px; + line-height: 30px; +} +.line { + border-top: 1px solid #eee; +} +.tip { + padding-left: 20px; + padding-bottom: 10px; + color: #333; + font-size: 14px; +} \ No newline at end of file