From 0bc770ee7e6dd163a18d555a4f74af1e6c184d67 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Wed, 3 Nov 2021 15:03:17 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E6=9C=9F=E9=97=B4=E6=89=8D=E5=8F=AF=E4=BB=A5=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E7=BC=B4=E8=B4=B9=E5=87=AD=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/meetingDetailSigned/meetingDetailSigned.js   | 9 +++++----
 pages/meetingDetailSigned/meetingDetailSigned.wxml | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/pages/meetingDetailSigned/meetingDetailSigned.js b/pages/meetingDetailSigned/meetingDetailSigned.js
index a412f72..746b4a1 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.js
+++ b/pages/meetingDetailSigned/meetingDetailSigned.js
@@ -56,13 +56,14 @@ Page({
       })
       return
     }
-    if(this.data.ordeCode === '' || this.data.ordeCode === undefined || this.data.ordeCode === null ){
+    if(this.data.singInPersonInfo.payMode === 2 && this.data.ordeCode === '' || this.data.ordeCode === undefined || this.data.ordeCode === null ){
       wx.showToast({
         title: '请输入缴费订单号后四位数',
         icon:'none'
       })
       return
-    }else if(this.data.ordeCode && this.data.ordeCode.length < 4){
+    }else if(this.data.singInPersonInfo.payMode === 2 &&this.data.ordeCode && this.data.ordeCode.length < 4){
+      // 线上缴费才去校验
       wx.showToast({
         title: '请输入四位缴费订单号后四位数',
         icon:'none'
@@ -117,14 +118,14 @@ Page({
           })
         }
         // 已经审核的获取审核凭证的src
-        if (res.result.checkResult !== 0) {
+        if (res.result.checkResult !== 0 && res.result.paymentRecord) {
           this.setData({
             payRecordImgSrc: baseUrl + URL_CONFIG + 'sys/common/download/' + res.result.paymentRecord,
           })
         }
         console.log(this.data.payRecordImgSrc);
         // 已经签到的获取签到的图片的src
-        if (res.result.checkIn === 1) {
+        if (res.result.checkIn === 1 && res.result.checkFile) {
           this.setData({
             signImgSrc: baseUrl + URL_CONFIG + 'sys/common/download/' + res.result.checkFile
           })
diff --git a/pages/meetingDetailSigned/meetingDetailSigned.wxml b/pages/meetingDetailSigned/meetingDetailSigned.wxml
index 66b3a2f..bfb6f0b 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.wxml
+++ b/pages/meetingDetailSigned/meetingDetailSigned.wxml
@@ -146,9 +146,9 @@
 	</view>
 	<!-- 参会人的付款凭证审核状态 0 未审核 1已通过 2拒绝 -->
 	<!-- 未审核不显示 -->
-	<view class="p-20 base">
+	<view class="p-20 base" wx:if="{{singInPersonInfo.paymentRecord}}">
 		<text>缴费凭证状态：</text>
-		<text wx:if="{{singInPersonInfo.checkResult === 0}}">{{singInPersonInfo.checkResult_dictText}}</text>
+		<text wx:if="{{singInPersonInfo.checkResult === 0 && singInPersonInfo.paymentRecord}}">{{singInPersonInfo.checkResult_dictText}}</text>
 		<text wx:if="{{singInPersonInfo.checkResult === 1}}">{{singInPersonInfo.checkResult_dictText}}</text>
 		<text
 			wx:if="{{singInPersonInfo.checkResult === 2}}">{{singInPersonInfo.checkResult_dictText}}({{singInPersonInfo.checkRemark}})</text>
@@ -185,7 +185,8 @@
 	<view class="sign-up-empty"></view>
 	<!-- 签到 -->
 	<!-- 只有审核通过的状态不显示 -->
-	<view class="sign-up" wx:if="{{singInPersonInfo.checkResult !== 1 }}">
-		<text bindtap="editPayRecord">确定</text>
+	<!-- 线上缴费的只有在会议期间可以上传 -->
+	<view class="sign-up" wx:if="{{singInPersonInfo.checkResult !== 1 && meetingInfo.meetingStatus == 3 && singInPersonInfo.payMode  }}">
+		<text bindtap="editPayRecord">确定  </text>
 	</view>
 </view>