From 28f6f4161a1bfb90d732d40d064aee3088a2b4e8 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Mon, 20 Dec 2021 14:26:29 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=20?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=87=AD=E8=AF=81bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pages/meeting/meeting.wxml b/pages/meeting/meeting.wxml
index ad87a38..11a07d1 100644
--- a/pages/meeting/meeting.wxml
+++ b/pages/meeting/meeting.wxml
@@ -46,7 +46,7 @@
 		</view>
 		<view class="content-text">
 			<image mode="aspectFill" src="../../assets/images/location.png"></image>
-			<text>报名状态：{{ item.signUpStatus_dictText}}</text>
+			<text>报名状态：{{ item.signUpStatus_dictText || '无'}}</text>
 		</view>
 	</view>
 	<view wx:if="{{meetingList.length === 0}}" class="no-data">
diff --git a/pages/meetingDetailSigned/meetingDetailSigned.js b/pages/meetingDetailSigned/meetingDetailSigned.js
index b1ad8da..49cf16c 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.js
+++ b/pages/meetingDetailSigned/meetingDetailSigned.js
@@ -87,10 +87,11 @@ Page({
       return
     }
     const param = {
-      id: this.data.meetingInfo.situationId,
+      id: this.data.singInPersonInfo.id,
       orderCode: this.data.ordeCode,
       paymentRecord: this.data.imageIds
     }
+ 
     if (Array.isArray(this.data.imageIds)) {
       param.paymentRecord = this.data.imageIds.join(',')
     }
diff --git a/pages/meetingDetailSigned/meetingDetailSigned.wxml b/pages/meetingDetailSigned/meetingDetailSigned.wxml
index 90af543..af25817 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.wxml
+++ b/pages/meetingDetailSigned/meetingDetailSigned.wxml
@@ -101,11 +101,11 @@
 			</view>
 			<view>
 				<text style="min-width:160rpx">酒店名称</text>
-				<text>{{meetingInfo.hotelName}}</text>
+				<text>{{meetingInfo.hotelName || ''}}</text>
 			</view>
 			<view>
 				<text style="min-width:160rpx">酒店地址</text>
-				<text>{{meetingInfo.hotelAddress}}</text>
+				<text>{{meetingInfo.hotelAddress || ''}}</text>
 			</view>
 			<view wx:for="{{meetingInfo.hotelContactsList}}" wx:key='item'>
 				<text>酒店联系人</text>
@@ -475,7 +475,7 @@
 		<view class="p-20">
 			<text class="validate">缴费凭证</text>
 			<!-- 未审核的显示 -->
-			<view class="payment-text" wx:if="{{singInPersonInfo.checkResult !== 1}}">
+			<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>
@@ -488,7 +488,7 @@
 		<view class="line"></view>
 
 		<!-- 缴费方式为线上的显示 -->
-		<view class="p-20" wx:if="{{singInPersonInfo.payMode === 2 && singInPersonInfo.checkResult !== 1 }}">
+		<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>
@@ -601,7 +601,7 @@
 	<!-- 线上缴费的只有在会议期间可以上传 -->
 	<!-- 打包的不显示 确定按钮  -->
 	<view class="sign-up"
-		wx:if="{{singInPersonInfo.checkResult !== 1 && meetingInfo.meetingStatus == 3 && singInPersonInfo.payMode && singInPersonInfo.payMode !== 3  }}">
+		wx:if="{{singInPersonInfo.checkResult !== 1  && singInPersonInfo.payMode && singInPersonInfo.payMode !== 3  }}">
 		<text bindtap="editPayRecord">确定 </text>
 	</view>
 </view>
\ No newline at end of file