Merge branch 'dev' into release_beta/1.0.0

api/login.js

@@ -2,6 +2,7 @@ let lock = false;
 export default async function login() {
   if (lock == true) {
     await waitLockRelease(50);
+
     return;
   }
   lock = true;
@@ -50,6 +51,13 @@ export default async function login() {
     })
   })
 }
+// let time =setInterval(function() {
+//    if (lock == false) {
+//      clearInterval(time)
+//       return;
+//     }
+
+// }, 100)
 
 async function waitLockRelease(retry) {
   for (let i = 0; i < retry; i++) {

components/relatedApp/relatedApp.axml

@@ -30,23 +30,9 @@
     <view class="associated">
         可关联应用
     </view>
-    <view class="applicationList" a:if="{{relatedAppPlatformList.indexOf('outlook') === -1}}">
-      <view class="applicationLogo outlook">
-      </view>
-      <view class="applicationMsg" data-name="" data-platform="outlook" catchTap="toAppDetails">
-        <view>
-          <view>
-              Outlook日历
-          </view>
-          <view>
-              支持会议日程双向同步，实时同步日程信息等
-          </view>
-        </view>
-        <view class="operateIcon">
-          <text class="iconfont iconright"></text>
-        </view>
-      </view>
-    </view>
+    <!--<view class="applicationList" a:if="{{relatedAppPlatformList.indexOf('outlook') === -1}}"><view class="applicationLogo outlook"></view><view class="applicationMsg" data-name="" data-platform="outlook" catchTap="toAppDetails"><view><view>
+              Outlook日历</view><view>
+              支持会议日程双向同步，实时同步日程信息等</view></view><view class="operateIcon"><text class="iconfont iconright"></text></view></view></view> -->
     <view class="applicationList" a:if="{{relatedAppPlatformList.indexOf('zoom') === -1}}">
       <view class="applicationLogo zoom">
       </view>

pages/index/index.axml

@@ -50,7 +50,9 @@
     <view a:if="{{!loading}}">
       <view class="scheduleHeader">
         <view>{{currentData.split('/')[0]}}年{{currentData.split('/')[1] || '1'}}月</view>
-        <!--<view onTap="changesidebar" class="headerIcon"><text class="iconfont iconicon_app1"></text><view></view></view> -->
+        <view onTap="changesidebar" class="headerIcon">
+          <text class="iconfont iconicon_app1"></text>
+          <view></view></view>
       </view>
       <scroll-view class="indexScrollView" scroll-y="{{true}}" onScroll="scroll" lower-threshold="{{400}}" onScrollToLower="lower" scroll-into-view="{{todayStr}}">
         <block a:for="{{scheduleList}}" key="{{item.dateStr}}">