Merge branch 'fix/third-login-error' into 'main_dev'

fix: 修改第三方登录和绑定账号的问题

See merge request yunteng/thingskit-app!137

@@ -87,6 +87,9 @@ import {mapActions } from 'vuex'
 			this.ordId = ''
 			this.ordId = ''
 		},
 		},
 		onLoad(e) {
 		onLoad(e) {
+			if (getApp().getBindNot()) {
+				return
+			}
 			if (!e.type) {
 			if (!e.type) {
 				this.loadData(1);
 				this.loadData(1);
 			} else {
 			} else {
@@ -171,12 +174,14 @@ import {mapActions } from 'vuex'
 					pageSize: 10,
 					pageSize: 10,
 					...param
 					...param
 				};
 				};
+
 				const res = await api.alarmApi.getAlarmApi({
 				const res = await api.alarmApi.getAlarmApi({
 					params,
 					params,
 					custom: {
 					custom: {
 						load: false
 						load: false
 					}
 					}
 				})
 				})
+
 				if(res){
 				if(res){
 					const resAlarm = await uni.$u.http.get('/yt/homepage/app?login=true');
 					const resAlarm = await uni.$u.http.get('/yt/homepage/app?login=true');
 					if (resAlarm) {
 					if (resAlarm) {

@@ -53,6 +53,7 @@
 		useShowToast
 		useShowToast
 	} from '@/plugins/utils.js'
 	} from '@/plugins/utils.js'
 	import api from '@/api/index.js'
 	import api from '@/api/index.js'
+	import {mapMutations} from "vuex";
 
 
 	export default {
 	export default {
 		components: {
 		components: {
@@ -86,17 +87,19 @@
 			this.getOpenId = getApp().globalData.openId;
 			this.getOpenId = getApp().globalData.openId;
 		},
 		},
 		methods: {
 		methods: {
+			...mapMutations(["setUserInfo", "setPlateInfo"]),
 			resetFunc() {
 			resetFunc() {
 				this.bindPhone = false;
 				this.bindPhone = false;
 				for (let i in this.bindAccountForm) Reflect.set(this.bindAccountForm, i, "")
 				for (let i in this.bindAccountForm) Reflect.set(this.bindAccountForm, i, "")
 				for (let i in this.bindPhoneForm) Reflect.set(this.bindPhoneForm, i, "")
 				for (let i in this.bindPhoneForm) Reflect.set(this.bindPhoneForm, i, "")
 			},
 			},
 			async handleBindForm(loginMethod, bindAccountForm, toastText) {
 			async handleBindForm(loginMethod, bindAccountForm, toastText) {
+				
 				const data = {
 				const data = {
 					loginMethod,
 					loginMethod,
 					...bindAccountForm,
 					...bindAccountForm,
 					platformName: 'WECHAT',
 					platformName: 'WECHAT',
-					thirdUserId: this.getOpenId
+					thirdUserId: getApp().globalData.openId
 				};
 				};
 				const res = await api.loginApi.postThirdLoginApi(data)
 				const res = await api.loginApi.postThirdLoginApi(data)
 				if (!res) return
 				if (!res) return
@@ -184,4 +187,4 @@
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
 	@import '../static/personal.scss';
 	@import '../static/personal.scss';
-</style>
+</style>