Merge branch 'main_dev' into 'main'

Main dev

See merge request yunteng/thingskit-app!143

@@ -262,7 +262,7 @@
 							this.showBind = false;
 							this.showBind = false;
 							this.isJudgeBindBtn = false;
 							this.isJudgeBindBtn = false;
 							uni.reLaunch({
 							uni.reLaunch({
-								url: '/publicLoginSubPage/public/login'
+								url: '/login-subpackage/public/login'
 							});
 							});
 							this.emptyUserInfo();
 							this.emptyUserInfo();
 						} else {
 						} else {

@@ -151,6 +151,12 @@ import {mapActions } from 'vuex'
 			},
 			},
 			//下拉刷新
 			//下拉刷新
 			downCallback() {
 			downCallback() {
+				if (getApp().getBindNot()) {
+					setTimeout(()=>{
+						this.mescroll.endByPage(0,0)
+					},200)
+					return 
+				}
 				this.list.length = 0;
 				this.list.length = 0;
 				this.page.num = 1;
 				this.page.num = 1;
 				this.resetQuery();
 				this.resetQuery();
@@ -158,6 +164,13 @@ import {mapActions } from 'vuex'
 			},
 			},
 			//上拉加载
 			//上拉加载
 			upCallback() {
 			upCallback() {
+				
+				if (getApp().getBindNot()) {
+					setTimeout(()=>{
+						this.mescroll.endByPage(0,0)
+					},200)
+					return 
+				}
 				const condition = Object.values(this.conditions)
 				const condition = Object.values(this.conditions)
 				if (condition.length === 0) {
 				if (condition.length === 0) {
 					this.page.num += 1;
 					this.page.num += 1;

@@ -117,12 +117,24 @@
 				this.close()
 				this.close()
 			},
 			},
 			downCallback() {
 			downCallback() {
+				if (getApp().getBindNot()) {
+					setTimeout(()=>{
+						this.mescroll.endByPage(0,0)
+					},200)
+					return 
+				}
 				this.list = [];
 				this.list = [];
 				this.page.num = 1;
 				this.page.num = 1;
 				this.loadData(this.page.num);
 				this.loadData(this.page.num);
 				this.resetQuery();
 				this.resetQuery();
 			},
 			},
 			upCallback() {
 			upCallback() {
+				if (getApp().getBindNot()) {
+					setTimeout(()=>{
+						this.mescroll.endByPage(0,0)
+					},200)
+					return 
+				}
 				const condition = Object.values(this.conditions)
 				const condition = Object.values(this.conditions)
 				if (condition.length === 0) {
 				if (condition.length === 0) {
 					this.page.num += 1;
 					this.page.num += 1;

@@ -83,6 +83,18 @@
 			// 隐藏原生的tabbar
 			// 隐藏原生的tabbar
 			uni.hideTabBar();
 			uni.hideTabBar();
 			if (getApp().getBindNot()) {
 			if (getApp().getBindNot()) {
+				this.basicStatistics.map(item=>{
+						const { key, value } = item
+						if(key === 'device'){
+							value.leftValue = 0
+							value.centerValue =0
+							value.rightValue = 0
+						}else{
+							value.leftValue = 0
+							value.centerValue =0
+							value.rightValue = 0
+						}
+					})
 				return
 				return
 			}
 			}
 			this.getDeviceTotalData();
 			this.getDeviceTotalData();
@@ -92,6 +104,9 @@
 			uni.removeStorageSync('getConfiguration');
 			uni.removeStorageSync('getConfiguration');
 		},
 		},
 		onPullDownRefresh() {
 		onPullDownRefresh() {
+			if (getApp().getBindNot()) {
+				return
+			}
 			this.getDeviceTotalData();
 			this.getDeviceTotalData();
 			setTimeout(function() {
 			setTimeout(function() {
 				uni.stopPullDownRefresh();
 				uni.stopPullDownRefresh();