Merge remote-tracking branch 'origin/user_action' into send_coupon

zxl

2025-09-12 2eb21bfe2f40630a46e675211f23b5f240e395a4

 pages/passport/wechatMPLogin.vue

@@ -214,7 +214,7 @@
        }
         },
         //获取手机号授权
         getPhoneNumber(e) {
          getPhoneNumber(e) {
            
           let iv = e.detail.iv;
           let encryptedData = e.detail.encryptedData;
@@ -245,7 +245,6 @@
             image,
             nickName,
           }).then((res) => {
              console.log(res)
            //登录成功修改用户的昵称
             storage.setAccessToken(res.data.result.accessToken);
             storage.setRefreshToken(res.data.result.refreshToken);
@@ -255,17 +254,22 @@
               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);	
					 
             
               uni.navigateBack({
                 delta: 1,