Merge branch 'dev' into release_beta/1.0.0

pages/index/index.axml

@@ -50,12 +50,7 @@
     <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}}">

pages/meetingDetail/meetingDetail.js

@@ -245,6 +245,7 @@ create.Page({
           }
         }
         this.setData({
+          currentPeople: getApp().globalData.userid,
           aheadTimes: !!res.data.data.aheadTimes ? res.data.data.aheadTimes : [],
           'comListData.aheadTimesListId': !!res.data.data.aheadTimes ? res.data.data.aheadTimes : [-1],
           mrReserveStatus: res.data.data.mrReserveStatus,

pages/meetingDetail/uploadFile.js

@@ -25,7 +25,7 @@ async function uploadImg(imgInfo) {
     const random = getRndInteger(1000, 10000)
     const fileName = timestamp.toString() + random.toString() + '.' + imgInfo.files[0].fileType;
     const key = permisson.data.data.dir + fileName;
-    return new Promise(resolve => {
+    return new Promise((resolve, rejects) => {
         dd.uploadFile({
             url: permisson.data.data.host,
             fileType: 'image',