Merge branch 'dev' of http://gitlab.roboming.com/fengzhaoyu/schedule into dev

pages/meetingDetail/meetingDetail.axml

@@ -201,6 +201,7 @@
     <import src="../../template/affairBlank/index.axml"/>
     <view class="affair-list {{isExpand? '' : 'affair-list-margin-top'}}" onTap="hideFileOperate">
       <view a:if="{{!isExpand}}" class="affair-list-title">会议动态</view>
+      <block a:if="{{!affairLoading}}">
         <block a:for="{{affairList}}">
           <view a:if="{{item.category == '3' && item.taskViewList && item.taskViewList.length > 0}}" class='compose-column'>
             <view class="avater task-avater">
@@ -222,9 +223,11 @@
           </view>
           <view a:if="{{item.content}}" class='simple-column'>{{item.content}} {{item.createTime}}</view>
         </block>
-      <view class="affair-placeholder" a:if="{{affairList.length <= 1}}">
+        <view class="affair-placeholder" a:if="{{affairList.length == 1 && affairList[0].logType == 'create_schedule'}}">
           <template is="affair-placeholder" data="{{title: '添加文件', tip: '我们不开无准备的会，快来上传会议文件吧。'}}"/>
         </view>
+      </block>
+      <view a:else>正在加载</view>
       <popup title="{{popupTitle}}" show="{{popupShow}}" mask="true" onClose="closePopup">
         <meeting-time-picker a:if="{{'time' === comType}}" onComplete="onComplete" startTime="{{$data.startTime}}" endTime="{{$data.endTime}}"></meeting-time-picker>
         <hlist a:if="{{'participator' === comType}}" dataComList="{{comHListData.contactData}}" onSelectComHList="selectComHList"></hlist>

pages/meetingDetail/meetingDetail.js

@@ -11,6 +11,7 @@ create.Page({
   useAll: true,
   data: {
     $data: null,
+    affairLoading: true,
     affairList: null, //store,页面用到的变量需要在这里声明
     show: false, //pop
     oldTask: null,
@@ -1234,8 +1235,12 @@ create.Page({
         return it
       })
       this.store.data.affairList = newAffairList;
+      this.setData({
+        affairLoading: false
+      });
       //重置
       this.store.data.isNeedReloadList = false;
+
       this.update();
     })
   },