From 797fa07355a312a06541ca105a00928e95dbded6 Mon Sep 17 00:00:00 2001
From: zym2525 <540361168@qq.com>
Date: 星期日, 23 二月 2025 14:39:44 +0800
Subject: [PATCH] fix: some
---
apps/taro/src/stores/modules/user.ts | 43 +++++++++++++++++++++++++++++++++++--------
1 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/apps/taro/src/stores/modules/user.ts b/apps/taro/src/stores/modules/user.ts
index 24f87f0..8525d95 100644
--- a/apps/taro/src/stores/modules/user.ts
+++ b/apps/taro/src/stores/modules/user.ts
@@ -8,6 +8,10 @@
setUserDetail,
getUserDetail,
removeUserDetail,
+ setStorageVirtualUserId,
+ getStorageVirtualUserId,
+ removeStorageVirtualUserId,
+ LoginVirtualRes,
} from '@/utils/storage/auth';
import * as accountServices from '@life-payment/services/api/Account';
import * as userServices from '@life-payment/services/api/User';
@@ -29,6 +33,9 @@
locationCity?: string;
locationProvince?: string;
firstSetLocation?: boolean;
+
+ virtualUserId?: string;
+ virtualPhoneNumber?: string;
}
const goAuthorization = debounce(
@@ -52,6 +59,7 @@
state: (): UserState => {
const userInfo = getCacheUserInfo();
const userDetail = getUserDetail();
+ const storageVirtualUser = getStorageVirtualUserId();
return {
// user info
@@ -62,6 +70,9 @@
refreshToken: userInfo?.refreshToken ?? '',
userDetail: userDetail,
firstGetUserDetail: true,
+
+ virtualUserId: storageVirtualUser?.virtualUserId ?? '',
+ virtualPhoneNumber: storageVirtualUser?.virtualPhoneNumber ?? '',
};
},
getters: {
@@ -122,7 +133,10 @@
);
if (res) {
- this.loginSuccess(res);
+ this.loginVirtualSuccess({
+ virtualUserId: res,
+ virtualPhoneNumber: data.phoneNumber,
+ });
}
return res;
},
@@ -142,13 +156,25 @@
return res;
},
- async loginSuccess(res: API.IdentityModelTokenCacheItem | string) {
+ async loginSuccess(res: API.IdentityModelTokenCacheItem) {
console.log('res: ', res);
- // try {
- // this.setUserInfoAction(res);
- // this.setTokenAction(res);
- // await this.getCurrentUserInfo();
- // } catch (error) {}
+ try {
+ this.setUserInfoAction(res);
+ this.setTokenAction(res);
+ await this.getCurrentUserInfo();
+ } catch (error) {}
+ },
+
+ async loginVirtualSuccess(virtualUserRes: LoginVirtualRes) {
+ try {
+ this.setVirtualUserId(virtualUserRes);
+ } catch (error) {}
+ },
+
+ setVirtualUserId(virtualUserRes: LoginVirtualRes) {
+ this.virtualUserId = virtualUserRes.virtualUserId;
+ this.virtualPhoneNumber = virtualUserRes.virtualPhoneNumber;
+ setStorageVirtualUserId(virtualUserRes);
},
async wxMiniAppUserLoginFromScan(wxIndentityRes: API.WxMiniAppIndentityInfo, uuid: string) {
@@ -216,6 +242,7 @@
this.userDetail = null;
removeUserInfo();
removeUserDetail();
+ removeStorageVirtualUserId();
},
/**
@@ -224,7 +251,7 @@
logout() {
this.resetState();
myClient.removeQueries();
- goAuthorization();
+ // goAuthorization();
},
logoutAndToHome() {
--
Gitblit v1.9.1