Commit 1cb7a0a1 by xiexiaoqin

fix:loading

parent 59528f06
...@@ -198,7 +198,6 @@ ...@@ -198,7 +198,6 @@
</view> </view>
<view class="affair-list {{isExpand? '' : 'affair-list-margin-top'}} {{!isExpand&&$data.participatorList.length>1 ? 'addPadding' : ''}}" onTap="hideFileOperate"> <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> <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}}"> <block a:if="{{affairList && affairList.length > 0}}" a:for="{{affairList}}" key="{{item.commentId}}">
<view class='compose-column'> <view class='compose-column'>
<template is="avater" data="{{item: item.creator }}"/> <template is="avater" data="{{item: item.creator }}"/>
...@@ -228,9 +227,6 @@ ...@@ -228,9 +227,6 @@
<template is="affair-placeholder" data="{{title: '添加文件', tip: '我们不开无准备的会,快来上传会议文件吧。'}}"/> <template is="affair-placeholder" data="{{title: '添加文件', tip: '我们不开无准备的会,快来上传会议文件吧。'}}"/>
</view> </view>
<view class="loading-more" onTap="loadAffairMore" a:if="{{current < pages}}">点击加载更多动态...</view> <view class="loading-more" onTap="loadAffairMore" a:if="{{current < pages}}">点击加载更多动态...</view>
</block>
<template is="loading" a:else>
</template>
<popup title="{{popup.title}}" show="{{popup.show}}" mask="true" onClose="closePopup"> <popup title="{{popup.title}}" show="{{popup.show}}" mask="true" onClose="closePopup">
<remark a:if="{{popup.type == 'remarkModal'}}" onGetRemark="getRemark"/> <remark a:if="{{popup.type == 'remarkModal'}}" onGetRemark="getRemark"/>
<comment a:if="{{popup.type == 'commentModal'}}" isEdit="{{true}}" onGetComment="getComment"/> <comment a:if="{{popup.type == 'commentModal'}}" isEdit="{{true}}" onGetComment="getComment"/>
...@@ -250,6 +246,6 @@ ...@@ -250,6 +246,6 @@
</view> </view>
</view> </view>
</block> </block>
<view class="loading" a:if="{{!loading.details}}"> <!--<view class="loading" a:if="{{loading.details && loading.dynamic}}"><view class="image"></view></view> -->
<view class="image"></view> <template is="loading" a:if="{{loading.details && loading.dynamic}}">
</view> </template>
\ No newline at end of file \ No newline at end of file
...@@ -22,7 +22,7 @@ create.Page({ ...@@ -22,7 +22,7 @@ create.Page({
affairList: null, //store,页面用到的变量需要在这里声明 affairList: null, //store,页面用到的变量需要在这里声明
loading: { loading: {
details: false, details: true,
dynamic: true dynamic: true
}, },
conToastData: { conToastData: {
...@@ -171,7 +171,7 @@ create.Page({ ...@@ -171,7 +171,7 @@ create.Page({
iconType: 'icon', iconType: 'icon',
aheadTimesListId: !!res.data.data.aheadTimes ? res.data.data.aheadTimes : [-1], aheadTimesListId: !!res.data.data.aheadTimes ? res.data.data.aheadTimes : [-1],
}, },
"loading.details": true "loading.details": false
}) })
this.$store.data.originalData = res.data.data; this.$store.data.originalData = res.data.data;
...@@ -947,7 +947,7 @@ create.Page({ ...@@ -947,7 +947,7 @@ create.Page({
this.store.data.affairList = newAffairList; this.store.data.affairList = newAffairList;
this.update(); this.update();
this.setData({ this.setData({
affairLoading: false "loading.dynamic": false
}); });
}) })
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment