From 73ac6d02a2223f19201426f3c366661d4a8e41bf Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期二, 25 二月 2025 17:14:37 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/LifePaymentFront
---
apps/taro/src/stores/modules/user.ts | 41 +++++++++++++++++++++++++++++++++--------
1 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/apps/taro/src/stores/modules/user.ts b/apps/taro/src/stores/modules/user.ts
index 29663e5..f6d8ac5 100644
--- a/apps/taro/src/stores/modules/user.ts
+++ b/apps/taro/src/stores/modules/user.ts
@@ -11,6 +11,7 @@
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';
@@ -34,6 +35,10 @@
firstSetLocation?: boolean;
virtualUserId?: string;
+ virtualPhoneNumber?: string;
+
+ wxCode?: string;
+ wxOpenId?: string;
}
const goAuthorization = debounce(
@@ -57,6 +62,7 @@
state: (): UserState => {
const userInfo = getCacheUserInfo();
const userDetail = getUserDetail();
+ const storageVirtualUser = getStorageVirtualUserId();
return {
// user info
@@ -68,7 +74,11 @@
userDetail: userDetail,
firstGetUserDetail: true,
- virtualUserId: getStorageVirtualUserId() ?? '',
+ virtualUserId: storageVirtualUser?.virtualUserId ?? '',
+ virtualPhoneNumber: storageVirtualUser?.virtualPhoneNumber ?? '',
+
+ wxCode: '',
+ wxOpenId: '',
};
},
getters: {
@@ -129,7 +139,10 @@
);
if (res) {
- this.loginVirtualSuccess(res);
+ this.loginVirtualSuccess({
+ virtualUserId: res,
+ virtualPhoneNumber: data.phoneNumber,
+ });
}
return res;
},
@@ -158,15 +171,16 @@
} catch (error) {}
},
- async loginVirtualSuccess(virtualUserId: string) {
+ async loginVirtualSuccess(virtualUserRes: LoginVirtualRes) {
try {
- this.setVirtualUserId(virtualUserId);
+ this.setVirtualUserId(virtualUserRes);
} catch (error) {}
},
- setVirtualUserId(virtualUserId: string) {
- this.virtualUserId = virtualUserId;
- setStorageVirtualUserId(virtualUserId);
+ setVirtualUserId(virtualUserRes: LoginVirtualRes) {
+ this.virtualUserId = virtualUserRes.virtualUserId;
+ this.virtualPhoneNumber = virtualUserRes.virtualPhoneNumber;
+ setStorageVirtualUserId(virtualUserRes);
},
async wxMiniAppUserLoginFromScan(wxIndentityRes: API.WxMiniAppIndentityInfo, uuid: string) {
@@ -227,11 +241,22 @@
setUserDetail(detail);
},
+ setWxCode(code: string) {
+ this.wxCode = code;
+ },
+ setWxOpenId(openId: string) {
+ this.wxOpenId = openId;
+ },
+
resetState() {
this.userInfo = null;
this.token = '';
this.refreshToken = '';
this.userDetail = null;
+ this.virtualUserId = '';
+ this.virtualPhoneNumber = '';
+ this.wxCode = '';
+ this.wxOpenId = '';
removeUserInfo();
removeUserDetail();
removeStorageVirtualUserId();
@@ -243,7 +268,7 @@
logout() {
this.resetState();
myClient.removeQueries();
- goAuthorization();
+ // goAuthorization();
},
logoutAndToHome() {
--
Gitblit v1.9.1