fix：loading

pages/meetingDetail/meetingDetail.axml

@@ -198,39 +198,35 @@
     </view>
     <view class="affair-list {{isExpand? '' : 'affair-list-margin-top'}} {{!isExpand&&$data.participatorList.length>1 ? 'addPadding' : ''}}" onTap="hideFileOperate">
       <view a:if="{{!isExpand}}" class="affair-list-title">会议动态</view>
-      <block a:if="{{!affairLoading}}">
-        <block a:if="{{affairList && affairList.length > 0}}" a:for="{{affairList}}" key="{{item.commentId}}">
-          <view class='compose-column'>
-            <template is="avater" data="{{item: item.creator }}"/>
-            <view class="title">
+      <block a:if="{{affairList && affairList.length > 0}}" a:for="{{affairList}}" key="{{item.commentId}}">
+        <view class='compose-column'>
+          <template is="avater" data="{{item: item.creator }}"/>
+          <view class="title">
               {{item.creator.name}}
-              <text>{{item.updateTime}}</text>
-            </view>
-            <view a:if="{{item.remark}}" class="desc">
-              {{item.remark}}
-            </view>
-            <task-list a:if="{{item.meetingTaskSimpleViewModel}}" onChangeTaskStatusOnList="changeTaskStatus" taskView="{{item.meetingTaskSimpleViewModel}}" commentId="{{item.commentId}}" isCanEdit="{{false}}"/>
-            <file-list a:if="{{item.fileDetailList}}" fileInfos="{{item.fileDetailList}}"/>
-            <notes a:if="{{item.notes}}" meetingNotes="{{item.notes}}"/>
-            <view class="meeting-title" a:if="{{item.commentType === 'meeting'}}">创建了会议</view>
-          </view>
-          <view class="compose-column-operation">
-            <text a:if="{{item.fileDetailList}}" onTap="openRemarkModal" data-commentId="{{item.commentId}}" data-remark="{{item.remark}}">描述</text>
-            <text a:if="{{item.notes}}" onTap="editNotes" data-meetingNotes="{{item.notes}}" data-commentId="{{item.commentId}}">编辑</text>
-            <text data-commentId="{{item.commentId}}" onTap="openComentModal">评论</text>
-            <text onTap="handleDeleteMoment" data-commentId="{{item.commentId}}">删除</text>
+            <text>{{item.updateTime}}</text>
           </view>
-          <view class="compose-column">
-            <comment a:if="{{item.replyCommentList}}" replyCommentList="{{item.replyCommentList}}" onDeleteComment="deleteComment" parentCommentId="{{item.commentId}}"/>
+          <view a:if="{{item.remark}}" class="desc">
+              {{item.remark}}
           </view>
-        </block>
-        <view class="affair-placeholder" a:if="{{!affairList || affairList.length == 0}}">
-          <template is="affair-placeholder" data="{{title: '添加文件', tip: '我们不开无准备的会，快来上传会议文件吧。'}}"/>
+          <task-list a:if="{{item.meetingTaskSimpleViewModel}}" onChangeTaskStatusOnList="changeTaskStatus" taskView="{{item.meetingTaskSimpleViewModel}}" commentId="{{item.commentId}}" isCanEdit="{{false}}"/>
+          <file-list a:if="{{item.fileDetailList}}" fileInfos="{{item.fileDetailList}}"/>
+          <notes a:if="{{item.notes}}" meetingNotes="{{item.notes}}"/>
+          <view class="meeting-title" a:if="{{item.commentType === 'meeting'}}">创建了会议</view>
+        </view>
+        <view class="compose-column-operation">
+          <text a:if="{{item.fileDetailList}}" onTap="openRemarkModal" data-commentId="{{item.commentId}}" data-remark="{{item.remark}}">描述</text>
+          <text a:if="{{item.notes}}" onTap="editNotes" data-meetingNotes="{{item.notes}}" data-commentId="{{item.commentId}}">编辑</text>
+          <text data-commentId="{{item.commentId}}" onTap="openComentModal">评论</text>
+          <text onTap="handleDeleteMoment" data-commentId="{{item.commentId}}">删除</text>
+        </view>
+        <view class="compose-column">
+          <comment a:if="{{item.replyCommentList}}" replyCommentList="{{item.replyCommentList}}" onDeleteComment="deleteComment" parentCommentId="{{item.commentId}}"/>
         </view>
-        <view class="loading-more" onTap="loadAffairMore" a:if="{{current < pages}}">点击加载更多动态...</view>
       </block>
-      <template is="loading" a:else>
-      </template>
+      <view class="affair-placeholder" a:if="{{!affairList || affairList.length == 0}}">
+        <template is="affair-placeholder" data="{{title: '添加文件', tip: '我们不开无准备的会，快来上传会议文件吧。'}}"/>
+      </view>
+      <view class="loading-more" onTap="loadAffairMore" a:if="{{current < pages}}">点击加载更多动态...</view>
       <popup title="{{popup.title}}" show="{{popup.show}}" mask="true" onClose="closePopup">
         <remark a:if="{{popup.type == 'remarkModal'}}" onGetRemark="getRemark"/>
         <comment a:if="{{popup.type == 'commentModal'}}" isEdit="{{true}}" onGetComment="getComment"/>
@@ -250,6 +246,6 @@
     </view>
   </view>
 </block>
-<view class="loading" a:if="{{!loading.details}}">
-  <view class="image"></view>
-</view>
\ No newline at end of file
+<!--<view class="loading" a:if="{{loading.details && loading.dynamic}}"><view class="image"></view></view> -->
+<template is="loading" a:if="{{loading.details && loading.dynamic}}">
+</template>
\ No newline at end of file

pages/meetingDetail/meetingDetail.js

@@ -22,7 +22,7 @@ create.Page({
     affairList: null, //store,页面用到的变量需要在这里声明
 
     loading: {
-      details: false,
+      details: true,
       dynamic: true
     },
     conToastData: {
@@ -171,7 +171,7 @@ create.Page({
           iconType: 'icon',
           aheadTimesListId: !!res.data.data.aheadTimes ? res.data.data.aheadTimes : [-1],
         },
-        "loading.details": true
+        "loading.details": false
       })
 
       this.$store.data.originalData = res.data.data;
@@ -947,7 +947,7 @@ create.Page({
       this.store.data.affairList = newAffairList;
       this.update();
       this.setData({
-        affairLoading: false
+        "loading.dynamic": false
       });
     })
   },