From 0cf1b417c68013df89504088c471fd113676391a Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 14 八月 2025 17:11:03 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/cMiniApp/src/stores/modules/user.ts | 51 +++++++++++++++++++++++++--------------------------
1 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/apps/cMiniApp/src/stores/modules/user.ts b/apps/cMiniApp/src/stores/modules/user.ts
index 39b8df7..1606ae7 100644
--- a/apps/cMiniApp/src/stores/modules/user.ts
+++ b/apps/cMiniApp/src/stores/modules/user.ts
@@ -31,7 +31,7 @@
userInfo?: Nullable<API.LoginCommandCallback>;
token?: Nullable<string>;
refreshToken?: Nullable<string>;
- userDetail?: Nullable<API.UserInfoV2>;
+ userDetail?: Nullable<API.GetPersonalLoginInfoQueryResult>;
firstGetUserDetail?: boolean;
locationCity?: string;
@@ -86,26 +86,25 @@
},
userId: (state) => {
- return state.userInfo?.id ?? '';
+ return state.userDetail?.id ?? '';
},
},
actions: {
// 鎵嬫満鍙锋巿鏉僀ode鐧诲綍
async getTokenByPhone(
detail: ButtonProps.onGetPhoneNumberEventDetail,
- wxMiniAppUserLoginRes: any
+ wxMiniAppUserLoginRes: API.LoginCommandCallback
) {
try {
- let res: API.IdentityModelTokenCacheItem;
- if (!wxMiniAppUserLoginRes.accessToken) {
- let params: API.WxMiniAppPhoneLoginInput = {
- openId: wxMiniAppUserLoginRes.openId,
- sessionKey: wxMiniAppUserLoginRes.sessionKey,
+ let res: API.LoginCommandCallback = wxMiniAppUserLoginRes;
+ if (!wxMiniAppUserLoginRes?.isBindPhoneNumber) {
+ let bindRes = await authServices.bindWxmpUserInfo({
encryptedData: detail.encryptedData,
iv: detail.iv,
- wxMiniApp: WxMiniAppEnum.C绔皬绋嬪簭,
- };
- res = await accountServices.wxMiniAppPhoneAuthLogin(params);
+ sessionKey: wxMiniAppUserLoginRes.sessionKey,
+ accessToken: wxMiniAppUserLoginRes.accessToken,
+ });
+ res.accessToken = bindRes.accessToken;
this.loginSuccess(res);
}
return res;
@@ -189,19 +188,19 @@
},
async getCurrentUserInfo() {
- // try {
- // let res = await userServices.getUserInfo({ showLoading: false });
- // if (res) {
- // res.frontStatus = getUserCertificationFrontStatusAdapter(
- // res.userCertificationStatus,
- // res.userCertificationAuditStatus
- // );
- // res.originalAvatarUrl = res.avatarUrl;
- // res.avatarUrl = res.avatarUrl ? setOSSLink(res.avatarUrl) : DefaultAvatar;
- // this.setUserDetail(res);
- // this.firstGetUserDetail = false;
- // }
- // } catch (error) {}
+ try {
+ let res = await authServices.getPersonalLoginInfo({}, { showLoading: false });
+ if (res) {
+ // res.frontStatus = getUserCertificationFrontStatusAdapter(
+ // res.userCertificationStatus,
+ // res.userCertificationAuditStatus
+ // );
+ res.originalAvatar = res.avatar;
+ res.avatar = res.avatar ? setOSSLink(res.avatar) : DefaultAvatar;
+ this.setUserDetail(res);
+ this.firstGetUserDetail = false;
+ }
+ } catch (error) {}
},
setTokenAction(tokenInfo: API.LoginCommandCallback) {
@@ -217,7 +216,7 @@
setUserInfo(this.userInfo);
},
- setUserDetail(detail: API.UserInfoV2) {
+ setUserDetail(detail: API.GetPersonalLoginInfoQueryResult) {
this.userDetail = detail;
setUserDetail(detail);
},
@@ -236,7 +235,7 @@
*/
logout() {
this.resetState();
- myClient.removeQueries();
+ // myClient.removeQueries();
goAuthorization();
},
--
Gitblit v1.9.1