From e527f2bc5708ed52fba8b8de4f2b995f96213d50 Mon Sep 17 00:00:00 2001
From: lihua <531456470@qq.com>
Date: Mon, 23 Dec 2019 15:58:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=88=B7=E6=96=B0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/device/device.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pages/device/device.vue b/pages/device/device.vue
index fdeea1e..88741ee 100644
--- a/pages/device/device.vue
+++ b/pages/device/device.vue
@@ -25,7 +25,7 @@
 					</view>
 				</view>
 			</view>
-			<view v-if="offset > total" style="text-align: center;">----------------底线----------------</view>
+			<view v-if="offset >= total" style="text-align: center;">----------------底线----------------</view>
 		</scroll-view>
 		<uni-fab :pattern="pattern" :content="content" horizontal="right" vertical="bottom" direction="vertical" @trigger="trigger"></uni-fab>
 	</view>
@@ -116,8 +116,6 @@ export default {
 		},
 		isRefresh(){
 			setTimeout(() => {
-				this.offset = 0
-				this.pageNum = 1
 				this.search(false)
 				uni.showToast({
 				icon: 'success',
@@ -128,11 +126,13 @@ export default {
 		},
 		setSearch(val) {
 			this.query = val
-			this.offset = 0
-			this.pageNum = 1
 			this.search(false)
 		},
 		search(isAppend){
+			if(!isAppend){
+				this.offset = 0
+				this.pageNum = 1
+			}
 			this.fetchDeviceList(this.query,this.limit,this.offset,isAppend)
 			this.pageNum ++
 			this.offset = (this.pageNum - 1) * this.limit