|
|
@@ -121,6 +121,7 @@
|
|
|
? 'calc(100vh - 155px)'
|
|
|
: 'calc(100vh - 240px)'
|
|
|
}"
|
|
|
+ v-loading="loading"
|
|
|
v-infinite-scroll="loadMore"
|
|
|
:infinite-scroll-distance="50"
|
|
|
:infinite-scroll-disabled="loadingMore || deviceData.length >= total"
|
|
|
@@ -269,7 +270,8 @@
|
|
|
deviceData: [],
|
|
|
categoryLevelId: '',
|
|
|
rootCategoryLevelId: '',
|
|
|
- loadingMore: false
|
|
|
+ loadingMore: false,
|
|
|
+ loading: false
|
|
|
};
|
|
|
},
|
|
|
computed: {},
|
|
|
@@ -340,6 +342,7 @@
|
|
|
this.loadingMore = true;
|
|
|
if (!isLoadMore) {
|
|
|
this.pageNum = 1;
|
|
|
+ this.loading = true;
|
|
|
if (this.$refs.cardView) {
|
|
|
this.$refs.cardView.scrollTop = 0;
|
|
|
}
|
|
|
@@ -354,6 +357,7 @@
|
|
|
postId: this.postId
|
|
|
}).then((res) => {
|
|
|
this.loadingMore = false;
|
|
|
+ this.loading = false;
|
|
|
this.updateTime = dayjs().format('YYYY-M-D HH:mm:ss');
|
|
|
const list = res.list.map((item) => {
|
|
|
let iotList = [];
|
|
|
@@ -391,6 +395,7 @@
|
|
|
console.log(res);
|
|
|
}).catch(() => {
|
|
|
this.loadingMore = false;
|
|
|
+ this.loading = false;
|
|
|
});
|
|
|
},
|
|
|
// 加载更多
|
