From c46d43e384f6967959a17fbd78bd3f78dfe480b3 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Thu, 23 Dec 2021 20:39:48 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=E4=B8=8D=E5=9C=A8?=
 =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=8F=AC=E5=BC=80=E6=9C=9F=E9=97=B4=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=20=E7=BC=B4=E8=B4=B9=E5=87=AD=E8=AF=81?=
 =?UTF-8?q?=E5=92=8C=E5=90=8E=E5=9B=9B=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/meetingDetailSigned/meetingDetailSigned.wxml | 11 ++++++-----
 pages/meetingDetailSigned/meetingDetailSigned.wxss |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pages/meetingDetailSigned/meetingDetailSigned.wxml b/pages/meetingDetailSigned/meetingDetailSigned.wxml
index d7f0acf..1de7ea8 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.wxml
+++ b/pages/meetingDetailSigned/meetingDetailSigned.wxml
@@ -477,11 +477,11 @@
 
 
 	<!-- 缴费凭证 begin -->
-	<view class="payment-record" wx:if="{{singInPersonInfo.payMode === 2 ||  singInPersonInfo.payMode === 1}}">
-		<view class="p-20">
+	<view class="payment-record" wx:if="{{singInPersonInfo.payMode === 2 ||  singInPersonInfo.payMode === 1 && meetingInfo.meetingStatus +'' !== '4' }}">
+		<view class="p-20" wx:if="{{meetingInfo.meetingStatus +'' !== '4'}}">
 			<text class="validate">缴费凭证</text>
 			<!-- 未审核的显示 -->
-			<view class="payment-text" wx:if="{{singInPersonInfo.checkResult !== 1 && meetingInfo.meetingStatus !== 4 }}">
+			<view class="payment-text" wx:if="{{singInPersonInfo.checkResult !== 1  && meetingInfo.meetingStatus +'' !== '4' }}">
 				<image-upload bindgetIds='getImagesId' maxLength='1' initImgsList="{{singInPersonInfo.paymentRecord}}" id="img">
 				</image-upload>
 			</view>
@@ -494,7 +494,7 @@
 		<view class="line"></view>
 
 		<!-- 缴费方式为线上的显示 -->
-		<view class="p-20" wx:if="{{singInPersonInfo.payMode === 2 && singInPersonInfo.checkResult !== 1 && meetingInfo.meetingStatus !== 4  }}">
+		<view class="p-20" wx:if="{{singInPersonInfo.payMode === 2 && singInPersonInfo.checkResult !== 1  && meetingInfo.meetingStatus +'' !== '4'  }}">
 			<text class="validate">缴费订单号后四位数</text>
 			<input class="input" maxlength="4" placeholder="请输入缴费订单号后四位数" value="{{ordeCode}}" bindblur="setOrdeCode" />
 		</view>
@@ -606,8 +606,9 @@
 	<!-- 只有审核通过的状态不显示 -->
 	<!-- 线上缴费的只有在会议期间可以上传 -->
 	<!-- 打包的不显示 确定按钮  -->
+	<!-- 会议状态不能是已结束 -->
 	<view class="sign-up"
-		wx:if="{{singInPersonInfo.checkResult !== 1  && singInPersonInfo.payMode && singInPersonInfo.payMode !== 3  }}">
+		wx:if="{{singInPersonInfo.checkResult !== 1  && singInPersonInfo.payMode && singInPersonInfo.payMode !== 3 && meetingInfo.meetingStatus +'' !== '4'  }}">
 		<text bindtap="editPayRecord">确定 </text>
 	</view>
 </view>
diff --git a/pages/meetingDetailSigned/meetingDetailSigned.wxss b/pages/meetingDetailSigned/meetingDetailSigned.wxss
index 6872acf..f6aa2ed 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.wxss
+++ b/pages/meetingDetailSigned/meetingDetailSigned.wxss
@@ -132,7 +132,7 @@ page{
   right: -3px;
 }
 .sign-up-empty{
-  height: 60px;
+  height: 40px;
   width: 100%;
   display: block;
   margin-top: 10px;