diff --git a/pages/meetingDetailSigned/meetingDetailSigned.js b/pages/meetingDetailSigned/meetingDetailSigned.js
index ee96758..a00762b 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.js
+++ b/pages/meetingDetailSigned/meetingDetailSigned.js
@@ -39,6 +39,8 @@ Page({
ordeCode: '',
// 缴费凭证的回显
payRecordImgSrc: '',
+ // 收费二维码的回显
+ paymentQrCodeSrc:'',
// 签到图片的回显
signImgSrc: '',
userId: '',
@@ -285,7 +287,8 @@ Page({
console.log(meetingInfo);
const that = this
this.setData({
- meetingInfo: meetingInfo
+ meetingInfo: meetingInfo,
+ paymentQrCodeSrc:baseUrl + URL_CONFIG + 'sys/common/download/' + meetingInfo.paymentQrCode
})
wx.getStorage({
diff --git a/pages/meetingDetailSigned/meetingDetailSigned.wxml b/pages/meetingDetailSigned/meetingDetailSigned.wxml
index 29ab6f3..f581dee 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.wxml
+++ b/pages/meetingDetailSigned/meetingDetailSigned.wxml
@@ -47,6 +47,10 @@
所属工作组
{{meetingInfo.workingGroupName}}
+
+ 收费二维码
+
+
会议内容
{{meetingInfo.meetingContent}}
@@ -560,7 +564,7 @@
+ 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 ab894a3..ff77b36 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.wxss
+++ b/pages/meetingDetailSigned/meetingDetailSigned.wxss
@@ -166,6 +166,10 @@ page{
bottom: 0;
margin: auto;
}
+.paymnet-qrcode-img {
+ width: 200rpx;
+ height: 200rpx;
+}
.basic-info view.sign-in {
display: flex!important;
diff --git a/pages/scanSign/scanSign.wxml b/pages/scanSign/scanSign.wxml
index 83e8739..898395f 100644
--- a/pages/scanSign/scanSign.wxml
+++ b/pages/scanSign/scanSign.wxml
@@ -39,10 +39,10 @@
- 签到
+ 提交
- 签到
+ 提交