From b5f47b652ec9e4bb2c83141f9f3334b51c53cc53 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Fri, 26 Nov 2021 11:51:41 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E6=94=B6?=
 =?UTF-8?q?=E8=B4=B9=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=98=BE=E7=A4=BA=20?=
 =?UTF-8?q?=E7=AD=BE=E5=88=B0=E6=8C=89=E9=92=AE=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/meetingDetailSigned/meetingDetailSigned.js   | 5 ++++-
 pages/meetingDetailSigned/meetingDetailSigned.wxml | 8 ++++++--
 pages/meetingDetailSigned/meetingDetailSigned.wxss | 4 ++++
 pages/scanSign/scanSign.wxml                       | 4 ++--
 4 files changed, 16 insertions(+), 5 deletions(-)

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 @@
 			<text>所属工作组</text>
 			<text>{{meetingInfo.workingGroupName}}</text>
 		</view>
+		<view wx:if="{{meetingInfo.paymentQrCode}}" style="height:auto">
+			<text>收费二维码</text>
+			<image src="{{paymentQrCodeSrc}}" class="paymnet-qrcode-img"></image>
+		</view>
 		<view class="sign-in">
 			<text>会议内容</text>
 			<text class="sign-in-text">{{meetingInfo.meetingContent}}</text>
@@ -560,7 +564,7 @@
 	<!-- 线上缴费的只有在会议期间可以上传 -->
 	<!-- 打包的不显示 确定按钮  -->
 	<view class="sign-up"
-		wx:if="{{singInPersonInfo.checkResult !== 1 && meetingInfo.meetingStatus == 3 && singInPersonInfo.payMode &&singInPersonInfo.payMode !== 3  }}">
+		wx:if="{{singInPersonInfo.checkResult !== 1 && meetingInfo.meetingStatus == 3 && singInPersonInfo.payMode && singInPersonInfo.payMode !== 3  }}">
 		<text bindtap="editPayRecord">确定 </text>
 	</view>
-</view>
\ No newline at end of file
+</view>
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 @@
   <image src="{{src}}" ></image>
 </view>
 <view class="scanSign" wx:if="{{isSigned == '1' && !form.checkIn && form.canCheckIn == 1}}">
-  <text bindtap="sureSign">签到</text>
+  <text bindtap="sureSign">提交</text>
 </view>
 <view class="scanSign" wx:if="{{isSigned == '1' && !form.checkIn && form.canCheckIn == 0}}">
-  <text style="background-color: #bbb;">签到</text>
+  <text style="background-color: #bbb;">提交</text>
 </view>
 <!-- 已报名信息显示的内容end -->