Merge branch 'fix/request-error' into 'main_dev'

fix：修改第三方登录时请求页面请求数据报账号密码错误

See merge request yunteng/thingskit-app!110

@@ -30,7 +30,19 @@
 			// })
 			// })
 			// #endif
 			// #endif
 		},
 		},
-		onHide() {}
+		onHide() {},
+		methods:{
+			// 判断是否是第三方登录没有绑定账号不请求数据
+			getBindNot(){
+				// #ifndef H5
+				const userInfo = uni.getStorageSync('userInfo');
+				// #endif
+				// #ifdef H5
+				const userInfo = JSON.parse(sessionStorage.getItem('userInfo') || localStorage.getItem('userInfo'));
+				// #endif
+				return userInfo.isThirdLogin
+			}
+		}
 	};
 	};
 </script>
 </script>
 
 

@@ -125,7 +125,9 @@ uni.$u.http.interceptors.response.use(
 			errorData = message || "";
 			errorData = message || "";
 		}
 		}
 		// console.log('errorData', errorData);
 		// console.log('errorData', errorData);
-		uni.$u.toast(message);
+		if(message != "request:ok"){
+			uni.$u.toast(message);
+		}
 		// if (show) uni.$u.toast(errorData);
 		// if (show) uni.$u.toast(errorData);
 		return Promise.reject(response);
 		return Promise.reject(response);
 	}
 	}

@@ -241,6 +241,9 @@
 		},
 		},
 		onShow() {
 		onShow() {
 			this.page.num = 1;
 			this.page.num = 1;
+			if(getApp().getBindNot()){
+				return
+			}
 			if (this.detailStatus) {
 			if (this.detailStatus) {
 				this.loadData(1, null, null, null, null, null, null);
 				this.loadData(1, null, null, null, null, null, null);
 			}
 			}
@@ -256,6 +259,9 @@
 		onLoad(e) {
 		onLoad(e) {
 			// 隐藏原生的tabbar
 			// 隐藏原生的tabbar
 			uni.hideTabBar();
 			uni.hideTabBar();
+			if(getApp().getBindNot()){
+				return
+			}
 			if (e.type == undefined) {
 			if (e.type == undefined) {
 				this.loadData(1, null, null, null, null, null, null);
 				this.loadData(1, null, null, null, null, null, null);
 			} else {
 			} else {

@@ -211,6 +211,9 @@
 		async onLoad(options) {
 		async onLoad(options) {
 			// 隐藏原生的tabbar
 			// 隐藏原生的tabbar
 			uni.hideTabBar();
 			uni.hideTabBar();
+			if(getApp().getBindNot()){
+				return
+			}
 			this.page.num = 1;
 			this.page.num = 1;
 			const {
 			const {
 				deviceState
 				deviceState
@@ -231,6 +234,9 @@
 			}
 			}
 		},
 		},
 		onShow() {
 		onShow() {
+			if(getApp().getBindNot()){
+				return
+			}
 			if (this.orgId) {
 			if (this.orgId) {
 				this.loadData(1, {
 				this.loadData(1, {
 					organizationId: this.orgId
 					organizationId: this.orgId

@@ -128,6 +128,9 @@
 		onLoad() {
 		onLoad() {
 			// 隐藏原生的tabbar
 			// 隐藏原生的tabbar
 			uni.hideTabBar();
 			uni.hideTabBar();
+			if(getApp().getBindNot()){
+				return
+			}
 			this.getDeviceTotalData();
 			this.getDeviceTotalData();
 			uni.setStorageSync('getConfiguration', {
 			uni.setStorageSync('getConfiguration', {
 				isConfiguration: false
 				isConfiguration: false