From ae90ce6d296fc3fdd83534c2794ca7a5e735085c Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Mon, 20 Dec 2021 19:22:33 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=9A=E8=AE=AE=E8=AF=A6=E6=83=85=E7=9A=84?=
 =?UTF-8?q?=E6=8A=A5=E5=90=8D=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meetingDetailSigned.js                    | 25 +++++++++++--------
 .../meetingDetailSigned.wxml                  |  3 ++-
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/pages/meetingDetailSigned/meetingDetailSigned.js b/pages/meetingDetailSigned/meetingDetailSigned.js
index 541ea7f..245ad27 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.js
+++ b/pages/meetingDetailSigned/meetingDetailSigned.js
@@ -329,17 +329,20 @@ Page({
     this.setData({
       paymentQrCodeSrc:baseUrl + URL_CONFIG + 'sys/common/download/' + meetingInfo.paymentQrCode
     })
-    MeetingApi.meetingDetail({id:meetingInfo.id}).then(res => {
-      if(res.success){
-        this.setData({
-          meetingInfo:res.result
-        })
-      }else{
-        this.setData({
-          meetingInfo:meetingInfo
-        })
-      }
-    })
+    if(meetingInfo){
+      this.setData({
+        meetingInfo:meetingInfo
+      })
+    }else{
+      MeetingApi.meetingDetail({id:meetingInfo.id}).then(res => {
+        if(res.success){
+          this.setData({
+            meetingInfo:res.result
+          })
+        }
+      })
+    }
+
     // 如果会议的报名状态是待签到则显示去签到按钮   待签到的报名状态时 6
     if(this.data.meetingInfo.signUpStatus == 6){
       this.setData({
diff --git a/pages/meetingDetailSigned/meetingDetailSigned.wxml b/pages/meetingDetailSigned/meetingDetailSigned.wxml
index 3d35455..547e8cf 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.wxml
+++ b/pages/meetingDetailSigned/meetingDetailSigned.wxml
@@ -469,7 +469,8 @@
 
 
 	</view>
-	<view class="join-meeting" wx:if="{{meetingInfo.meetingSignUpType === 1}}">
+	<!-- 会议状态未可报名 并且会议类型是未开始 或者进行中  -->
+	<view class="join-meeting" wx:if="{{meetingInfo.meetingSignUpType === 1 && (meetingInfo.meetingStatus === 2 || eetingInfo.meetingStatus === 3)}}">
 	<text bindtap='joinMeeting'>报名</text>
 	</view>