【优化】收费二维码显示 签到按钮的修改

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({

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>
+</view>

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;

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 -->