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 | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/apps/cMiniApp/src/stores/modules/user.ts b/apps/cMiniApp/src/stores/modules/user.ts index c678128..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,7 +86,7 @@ }, userId: (state) => { - return state.userInfo?.id ?? ''; + return state.userDetail?.id ?? ''; }, }, actions: { @@ -188,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) { @@ -216,7 +216,7 @@ setUserInfo(this.userInfo); }, - setUserDetail(detail: API.UserInfoV2) { + setUserDetail(detail: API.GetPersonalLoginInfoQueryResult) { this.userDetail = detail; setUserDetail(detail); }, @@ -235,7 +235,7 @@ */ logout() { this.resetState(); - myClient.removeQueries(); + // myClient.removeQueries(); goAuthorization(); }, -- Gitblit v1.9.1