Merge branch 'dev' into release_beta/1.0.0

pages/index/index.js

@@ -34,7 +34,7 @@ create.Page({
     $data: null,
     iconDay: currentDate.getDate(),
     scheduleList: [],
-    todayStr: toLocaleDateString(currentDate),
+    todayStr: '',
     currentData: toLocaleDateString(currentDate),
     currentDataIndex: 0,
     offset: "stop",
@@ -170,7 +170,9 @@ create.Page({
           loading: false
         });
         this.isLoaded = true;
-        this.backToToday('first')
+        setTimeout(() => {
+          this.backToToday('first')
+        }, 300)
         return;
       }
 
@@ -181,7 +183,9 @@ create.Page({
           sign: res.data.data.sign
         })
         if (this.isFirstLoad) {
-          this.backToToday('first')
+          setTimeout(() => {
+            this.backToToday('first')
+          }, 300)
           this.isFirstLoad = false;
         }
         return

pages/meetingDetail/meetingDetail.axml

@@ -139,25 +139,8 @@
         <view class="permission" a:if="{{currentPeople != organizer}}">
         </view>
       </view>
-      <view class="meetingWayShow" a:if="{{comListData.meetingWayModelId == 0}}">
-        <view class="meetingWayShowTop">
-          <view class=" icon iconfont iconicon_camera1">
-          </view>
-          <view class="meetingWayText">
-            <view onTap="setCopy" data-item="https://zoom.com.cn/j/93255954558?pwd=YmNZQkY1SGxtUFNPYjZlcUpJT0xtQT09" data-type="url">
-                 Zoom
-            </view>
-            <view class="mettingWayText" onTap="setCopy" data-item="513410069">
-              <text>ID：513410069</text>
-              <text class="icon iconfont iconicon_icon"></text>
-            </view>
-            <view class="mettingWayText passWord" onTap="setCopy" data-item="4ez3am">
-              <text >密码:4ez3am</text>
-              <text class="icon iconfont iconicon_icon"></text>
-            </view>
-          </view>
-        </view>
-      </view>
+      <!--<view class="meetingWayShow" a:if="{{comListData.meetingWayModelId == 0}}"><view class="meetingWayShowTop"><view class=" icon iconfont iconicon_camera1"></view><view class="meetingWayText"><view onTap="setCopy" data-item="https://zoom.com.cn/j/93255954558?pwd=YmNZQkY1SGxtUFNPYjZlcUpJT0xtQT09" data-type="url">
+                 Zoom</view><view class="mettingWayText" onTap="setCopy" data-item="513410069"><text>ID：513410069</text><text class="icon iconfont iconicon_icon"></text></view><view class="mettingWayText passWord" onTap="setCopy" data-item="4ez3am"><text >密码:4ez3am</text><text class="icon iconfont iconicon_icon"></text></view></view></view></view> -->
       <!-- 删除该会议 -->
       <template is="deleteBtn" onhandleDelete="" data="{{title: '删除该会议' }}"/>
     </view>