From b399125d3a10c095f98d5e3ae8ebb634ef84a502 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Mon, 18 Oct 2021 18:29:19 +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=BC=B4=E8=B4=B9=E7=8A=B6=E6=80=81=E7=9A=84=E4=B8=8D=E5=90=8C?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/imageUpload/imageUpload.js | 20 ++++++++-
pages/meeting/meeting.js | 9 +---
.../meetingDetailSigned.js | 26 +++++++++--
.../meetingDetailSigned.wxml | 43 +++++++++++++++----
.../meetingDetailSigned.wxss | 10 ++++-
5 files changed, 87 insertions(+), 21 deletions(-)
diff --git a/components/imageUpload/imageUpload.js b/components/imageUpload/imageUpload.js
index e417f00..c3e8b15 100644
--- a/components/imageUpload/imageUpload.js
+++ b/components/imageUpload/imageUpload.js
@@ -18,6 +18,10 @@ Component({
maxSize: {
type: Number,
value: 1
+ },
+ // 图片的回显
+ initImgsList:{
+ type:String
}
},
@@ -28,6 +32,20 @@ Component({
// 图片路径数组
tempFilePaths: []
},
+ lifetimes: {
+ attached: function() {
+ console.log(' this.data.initImgsList', this.data.initImgsList);
+ let initImgArr = this.data.initImgsList.split(',')
+ const arr = []
+ for (let index = 0; index < initImgArr.length; index++) {
+ arr.push( baseUrl + URL_CONFIG + 'sys/common/download/' + initImgArr[index])
+ }
+ this.setData({
+ tempFilePaths:arr
+ })
+ console.log(this.data.tempFilePaths);
+ },
+ },
/**
* 组件的方法列表
@@ -171,4 +189,4 @@ Component({
})
}
}
-})
\ No newline at end of file
+})
diff --git a/pages/meeting/meeting.js b/pages/meeting/meeting.js
index 6fb4a60..b84d071 100644
--- a/pages/meeting/meeting.js
+++ b/pages/meeting/meeting.js
@@ -74,8 +74,7 @@ Page({
let meetingInfo =JSON.stringify(e.currentTarget.dataset.meetinginfo)
let meetingItem = e.currentTarget.dataset.meetinginfo
-
- // 如果是去报名页面需要在缓存中存储会议信息 当报名结束后 需要清除缓存中的当前会议信息
+ // 如果是去报名页面需要在缓存中存储会议信息 当报名结束后 需要清除缓存中的当前会议信息 meetingSignUpType 1 可报名 2报名
if(meetingItem.meetingSignUpType === 1){
wx.setStorage({
key:"currentMeetingInfo",
@@ -93,11 +92,7 @@ Page({
}
}
})
- }else if(meetingItem.meetingType === 4){
- wx.navigateTo({
- url: `../meetingDetailSigned/meetingDetailSigned?meetingInfo=${meetingInfo}`, // (已报名)
- })
- }else{
+ }else if(meetingItem.meetingSignUpType === 2){
wx.navigateTo({
url: `../meetingDetailSigned/meetingDetailSigned?meetingInfo=${meetingInfo}`, // (已报名)
})
diff --git a/pages/meetingDetailSigned/meetingDetailSigned.js b/pages/meetingDetailSigned/meetingDetailSigned.js
index f64ded7..31af90c 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.js
+++ b/pages/meetingDetailSigned/meetingDetailSigned.js
@@ -5,6 +5,7 @@ import {
import MeetingApi from '../../assets/js/http/meetingApi'
import signUpApi from '../../assets/js/http/signUp'
+import {baseUrl,URL_CONFIG} from '../../assets/js/http/api'
Page({
/**
@@ -23,7 +24,11 @@ Page({
// 缴费凭证id
imageIds:[],
// 订单后四位
- ordeCode:''
+ ordeCode:'',
+ // 缴费凭证的回显
+ payRecordImgSrc:'',
+ // 签到图片的回显
+ signImgSrc:''
},
// 获取图片的id
@@ -40,7 +45,6 @@ Page({
},
// 上传汇款凭证
editPayRecord(){
-
const param = {
id:this.data.meetingInfo.situationId,
orderCode:this.data.ordeCode,
@@ -54,6 +58,9 @@ Page({
icon: "success",
duration: 800,
});
+ wx.navigateBack({
+ delta: 1,
+ })
}else{
wx.showToast({
title:res.message,
@@ -72,6 +79,19 @@ Page({
this.setData({
singInPersonInfo: res.result
})
+ // 已经审核的获取审核凭证的src
+ if(res.result.checkResult !== 0){
+ this.setData({
+ payRecordImgSrc:baseUrl + URL_CONFIG + 'sys/common/download/' + res.result.paymentRecord
+ })
+ }
+ console.log(this.data.payRecordImgSrc);
+ // 已经签到的获取签到的图片的src
+ if(res.result.checkIn === 1){
+ this.setData({
+ signImgSrc:baseUrl + URL_CONFIG + 'sys/common/download/' + res.result.check_file
+ })
+ }
}
})
},
@@ -194,4 +214,4 @@ Page({
onShareAppMessage: function () {
}
-})
\ No newline at end of file
+})
diff --git a/pages/meetingDetailSigned/meetingDetailSigned.wxml b/pages/meetingDetailSigned/meetingDetailSigned.wxml
index 1f03272..1c1e099 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.wxml
+++ b/pages/meetingDetailSigned/meetingDetailSigned.wxml
@@ -107,7 +107,8 @@
邮寄地址
- {{singInPersonInfo.postContactAddress === null ? '' : singInPersonInfo.postContactAddress}}
+ {{singInPersonInfo.postContactAddress === null ? '' :
+ singInPersonInfo.postContactAddress}}
邮编
@@ -117,29 +118,52 @@
- 缴费凭证
-
-
+ 缴费凭证
+
+
+
+
+
+
+
+
+
+
+
- 缴费订单号后四位数
+ 缴费订单号后四位数
请在会议期间内上传缴费凭证和缴费订单号后四位
+
+
+
+ 缴费凭证状态：
+ {{singInPersonInfo.checkResult_dictText}}
+ {{singInPersonInfo.checkResult_dictText}}({{singInPersonInfo.checkRemark}})
+
+
-
+
+
签到信息
签到时间
- 签到时间的显示
+ {{singInPersonInfo.checkInTime}}
+
+
+ 签到信息
+
@@ -154,7 +178,8 @@
-
+
+
确定
-
\ No newline at end of file
+
diff --git a/pages/meetingDetailSigned/meetingDetailSigned.wxss b/pages/meetingDetailSigned/meetingDetailSigned.wxss
index 5bd420e..f7837cf 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.wxss
+++ b/pages/meetingDetailSigned/meetingDetailSigned.wxss
@@ -198,4 +198,12 @@ margin-top: 15px;
padding-bottom: 10px;
color: #333;
font-size: 14px;
-}
\ No newline at end of file
+}
+.back-img {
+ width: 100px;
+ height: 100px;
+}
+
+.base {
+ background-color: #fff;
+}