From f2dd92deb176ad39b18805d5d2721fad0974a278 Mon Sep 17 00:00:00 2001
From: wk
Date: 星期五, 22 十一月 2024 11:32:35 +0800
Subject: [PATCH] feat:我的

---
 pages/login/userPassword.vue |   30 ++++++++++++++++++++++++++----
 1 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/pages/login/userPassword.vue b/pages/login/userPassword.vue
index 10e4ed9..f145714 100644
--- a/pages/login/userPassword.vue
+++ b/pages/login/userPassword.vue
@@ -106,7 +106,9 @@
 				remember: true,
 				inpType:true,
 				baseUrl: '',
-				submitLoading: false
+				submitLoading: false,
+				weXinisLoginFlag:[1,2,3], //寰俊
+				H5IsLoginFlag:[5,6], //h5
 			};
 		},
 		methods: {
@@ -151,6 +153,8 @@
 						if (this.btnText == 0) {
 							this.submitLoading = false
 							if (res.code != 1) {
+							
+
 								// 鐧婚檰鎴愬姛锛屽瓨鍌ㄧ浉鍏充俊鎭�
 								setToken(res.access_token);
 								setRefreshToken(res.refresh_token);
@@ -159,6 +163,22 @@
 								this.$reqGet('getUserEntity')
 									.then(res => {
                     console.log(res,'鐧诲綍淇℃伅----------')
+					                  	//#ifdef MP-WEIXIN
+								if(this.H5IsLoginFlag.includes(res.data.type)) {
+									this.$u.toast('褰撳墠瑙掕壊璇峰墠寰�h5椤甸潰鐧诲綍')
+									return ;
+
+								}
+								//#endif
+								// #ifdef H5
+								if(this.weXinisLoginFlag.includes(res.data.type)) {
+									console.log('瑙﹀彂鐧诲綍瑙掕壊')
+									this.$u.toast('褰撳墠瑙掕壊璇峰墠寰�灏忕▼搴忕櫥褰�')
+									return ;
+
+								}
+								//#endif
+
 										this.$u.toast('鐧诲綍鎴愬姛');
 										if(this.isJizhu.length){ //璁颁綇瀵嗙爜
 											uni.setStorageSync('remberPassWord',{
@@ -172,6 +192,7 @@
 											});
 										}
 										this.setUserTabbar(res.data.type);
+										uni.setStorageSync('productIds',res.data.productIds)
 										uni.setStorageSync('roleType', res.data.type);
 										uni.setStorageSync("userId", res.data.userId)
 										uni.setStorageSync("carNo", res.data.carNo)
@@ -213,9 +234,7 @@
 									if (res.code) {
 										uni.setStorageSync('bindcode', res.code);
 									}
-								}
-							});
-							if (uni.getStorageSync('bindcode')) {
+									if (uni.getStorageSync('bindcode')) {
 								this.$reqPost('wxBind', { state: 'MINI', code: uni.getStorageSync('bindcode') },
 									'params').then(res => {
 									uni.hideLoading();
@@ -229,6 +248,9 @@
 									}
 								});
 							}
+								}
+							});
+						
 						}
 					}).catch(e => {
 						this.submitLoading = false

--
Gitblit v1.9.1