From 1f4b8d0e5c9ad291ef78645168418a371151338e Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 15 Sep 2020 18:54:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=88=97=E8=A1=A8=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=E6=BB=9A=E5=8A=A8=E5=8A=A0=E8=BD=BD=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/device/device-staff-device.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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()//本次加载完成 } },