Merge branch 'dev' into release/1.0.0

pages/meetingDetail/meetingDetail.axml

@@ -139,7 +139,7 @@
         <view class="permission" a:if="{{currentPeople != organizer}}">
         </view>
       </view>
-      <view class="meetingWayShow" a:if="{{comListData.meetingWayModelId == 1}}">
+      <view class="meetingWayShow" a:if="{{comListData.meetingWayModelId == 1 && meetingWayModelData.data}}">
         <view class="meetingWayShowTop">
           <view class=" icon iconfont iconicon_camera1"></view>
           <view class="meetingWayText">

pages/meetingDetail/meetingDetail.js

@@ -285,6 +285,15 @@ create.Page({
         this.update();
         this.loadAffairList();
         this.resetRepeatList()
+        if (res.data.data.meetingWayModel.model === 'zoom' && res.data.data.meetingWayModel.data === null) {
+          setTimeout(() => {
+            getScheduleDetail(data).then(success => {
+              this.setData({
+                meetingWayModelData: res.data.data.meetingWayModel
+              })
+            })
+          }, 30000)
+        }
       }
     })
   },