【修改】 修改会议详情的报名按钮显示条件

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

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>