diff --git a/src/views/modules/device/device-staff-device.vue b/src/views/modules/device/device-staff-device.vue index e7b7b06..66e44a3 100644 --- a/src/views/modules/device/device-staff-device.vue +++ b/src/views/modules/device/device-staff-device.vue @@ -106,10 +106,16 @@ export default { this.findEqInfo.totalPage = data.data.totalPage console.log("currPage", this.findEqInfo.currPage) console.log("totalPage", this.findEqInfo.totalPage) + if(this.findEqInfo.currPage == this.findEqInfo.totalPage){ + this.$refs.infiniteLoading.$emit('$InfiniteLoading:complete') + }else{ + this.$refs.infiniteLoading.$emit('$InfiniteLoading:loaded') + } } else { this.findEqInfo.list = [] this.findEqInfo.currPage = 1 this.findEqInfo.totalPage = 1 + this.$refs.infiniteLoading.$emit('$InfiniteLoading:complete') } this.dataListLoading = false; //this.$refs.InfiniteLoading.$emit("$infiniteLoading:loaded"); @@ -141,10 +147,7 @@ export default { this.findEqInfo.totalPage = 1 $state.complete()// 全部加载完成 } - //$state.complete() // 全部加载完成 }) - }else{ - //$state.loaded()//本次加载完成 } },