From 796977e24baa7c1d3a333e2c1c8e06ca73fd9a56 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 19 十一月 2025 18:08:35 +0800
Subject: [PATCH] 优惠劵

---
 pages/passport/wechatMPLogin.vue |   32 +++++++++++++++++++-------------
 1 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/pages/passport/wechatMPLogin.vue b/pages/passport/wechatMPLogin.vue
index a703f3e..08daf5b 100644
--- a/pages/passport/wechatMPLogin.vue
+++ b/pages/passport/wechatMPLogin.vue
@@ -95,7 +95,9 @@
 			uni.showShareMenu({
 				withShareTicket: true
 			});
-
+      //璁剧疆鐧诲綍寮圭獥涓哄紑鍚�
+      storage.setPopupShow(true);
+      console.log(storage.getPopupShow())
 
       //鑾峰彇code
       uni.login({
@@ -134,8 +136,8 @@
 				whetherNavigate("wx");
 			},
 			backToHome() {
-				uni.switchTab({
-					url: `/pages/tabbar/home/index`,
+				uni.redirectTo({
+					url: `/pages/tabbar/index/home`,
 				});
 			},
 			
@@ -197,7 +199,7 @@
                 getUserInfo().then((user) => {
                   storage.setUserInfo(user.data.result);
                   storage.setHasLogin(true);
-
+console.log('鎵ц2')
                   uni.navigateBack({
                     delta: 1,
                   });
@@ -214,7 +216,7 @@
         }
 			},
 			//鑾峰彇鎵嬫満鍙锋巿鏉�
-			getPhoneNumber(e) {
+			 getPhoneNumber(e) {
 				
 			  let iv = e.detail.iv;
 			  let encryptedData = e.detail.encryptedData;
@@ -245,7 +247,6 @@
 			    image,
 			    nickName,
 			  }).then((res) => {
-				  console.log(res)
 				//鐧诲綍鎴愬姛淇敼鐢ㄦ埛鐨勬樀绉�
 			    storage.setAccessToken(res.data.result.accessToken);
 			    storage.setRefreshToken(res.data.result.refreshToken);
@@ -255,20 +256,25 @@
 			      icon: "none",
 			    });
 			    //鑾峰彇鐢ㄦ埛淇℃伅
-			    getUserInfo().then((user) => {
+			      getUserInfo().then(async (user) => {
 					console.log(user)
 					const form ={
 						memberId:user.data.result.id,
 						nickName:this.nickName
 					}
-					updateMemberNickName(form).then(res =>{
+					let name = '';
+					await updateMemberNickName(form).then(res =>{
+						if(res.statusCode === 200){
+							name = res.data.data;
+						}
 					})
-					 user.data.result.nickName = this.nickName
-					 storage.setUserInfo(user.data.result);
-					 storage.setHasLogin(true);
-				 
+					user.data.result.nickName = name
+					storage.setUserInfo(user.data.result);
+					storage.setHasLogin(true);	
+					const sizes = getCurrentPages().length;
+					console.log('-----------鑾峰彇椤甸潰淇℃伅----------->',getCurrentPages())
 			      uni.navigateBack({
-			        delta: 1,
+			        delta: sizes,
 			      });
 			    });
 				

--
Gitblit v1.8.0