Merge branch 'release/2.0.0' of…

Merge branch 'release/2.0.0' of ssh://gitlab.roboming.com:2018/fengzhaoyu/schedule into release/2.0.0

# Conflicts:
#	pages/meetingDetail/meetingDetail.js

pages/meetingDetail/const.js

-
-// export const comShareData = {
-//     shareTitle: '分享到',
-//     isShow: false,
-//     shareDataList: [
-//         { id: 0, text: '钉钉', imageUrl: '../../assests/dingContact.png' },
-//         { id: 1, text: '微信', imageUrl: '../../assests/weiXin.png' }
-//     ]
-// }

pages/meetingDetail/meetingDetail.axml

 <!--<block a:if="{{getData}}"> -->
 <import src="../../template/loading/loading.axml"/>
 <block>
-  <view class="  {{(popupShow || show ||  centerPopup.showCenterPopup || conToastData.showToast || conSelectPopupData.showSelectPopup || comShareData.isShow )? 'metingDetail' : ''}}">
+  <view class="  {{(popupShow || show ||  centerPopup.showCenterPopup || conToastData.showToast || conSelectPopupData.showSelectPopup )? 'metingDetail' : ''}}">
     <import src="../../template/deleteBtn/index.axml"/>
     <view class="hideDetail" a:if="{{isExpand}}">
       <view class="hideTitle">
@@ -235,4 +235,6 @@
     </view>
   </view>
 </block>
-<!--<view class="loading" a:if="{{loading || !getData}}"><view class="image"></view></view> -->
+<view class="loading" a:if="{{!loading.details}}">
\ No newline at end of file
+  <view class="image"></view>
+</view>
\ No newline at end of file

pages/meetingDetail/meetingDetail.js

@@ -20,7 +20,11 @@ create.Page({
     $data: null,
     affairLoading: true,
     affairList: null, //store,页面用到的变量需要在这里声明
-    loading: false,
+
+    loading: {
+      details: false,
+      dynamic: true
+    },
     conToastData: {
       showToast: false,
       title: '保存成功'
@@ -67,23 +71,18 @@ create.Page({
     placeholder: '',
     week: '',
     lock: false,
-    // aheadTimes: [15],
-    // editType: '',
     mrReserveStatus: '',
     id: ''
   },
   onShow() {
     this.update()
 
-    // if (this.store.data.isNeedReloadList) {
-    //   this.loadAffairList();
-    //   this.setData({
-    //     'conToastData.showToast': true,
-    //     'conToastData.title': '保存成功',
-    //   });
-    //   this.$store.data.isIndexAffairListNeedUpdate = true;
-    //   this.update();
-    // }
+    if (this.store.data.isNeedReloadList) {
+      this.store.data.isNeedReloadList = false
+      this.loadAffairList();
+      this.$store.data.isIndexAffairListNeedUpdate = true;
+      this.update();
+    }
 
     if (this.$store.data.updateInfo.isUpate) {
       if (this.$store.data.updateInfo.updateType === "modify_location") {
@@ -171,7 +170,8 @@ create.Page({
           aheadTimes: !!res.data.data.aheadTimes ? res.data.data.aheadTimes : [],
           iconType: 'icon',
           aheadTimesListId: !!res.data.data.aheadTimes ? res.data.data.aheadTimes : [-1],
-        }
+        },
+        "loading.details": true
       })
 
       this.$store.data.originalData = res.data.data;

pages/meetingDetail/meetingDetail.json

@@ -8,10 +8,7 @@
         "comment": "../../components/comment/comment",
         "remark": "../../components/remark/remark",
         "file-list": "../../components/fileList/fileList",
-        "task-panel": "../../components/taskPanel/taskPanel",
         "list": "../../components/list/list",
-        "hlist": "../../components/hList/hList",
-        "sharelist": "../../components/shareList/shareList",
         "toast": "../../components/toast/toast",
         "selectpopup": "../../components/selectPopup/selectPopup",
         "centerpopup": "../../components/centerPopup/centerPopup",