Merge branch 'fix/DEFECT-1958' into 'main_dev'

fix: 修复当设备下拉刷新，下拉到底，点击设备，然后返回后设备显示不全

See merge request yunteng/thingskit-app!155

@@ -69,15 +69,17 @@
 				this.conditions = {
 					deviceState: params
 				}
-				this.loadData(1, {
-					deviceState: params
-				});
+				// this.loadData(1, {
+				// 	deviceState: params
+				// });
 			}
 		},
 		onShow() {
+			console.log(2)
 			if (getApp().getBindNot()) {
 				return
 			}
+			this.page.num=1
 			if (this.ordId) {
 				this.loadData(1, {
 					organizationId: this.ordId
@@ -87,7 +89,7 @@
 				}
 				return
 			}
-			this.loadData(1);
+			this.loadData(this.page.num,this.conditions);
 		},
 		methods: {
 			inputChanged(e) {