From c2463c02a17f92df55ec77ed2da3fb724290c072 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 20 十月 2025 17:34:30 +0800
Subject: [PATCH] fix: bug
---
apps/cMiniApp/src/stores/modules/user.ts | 161 ++++++++++++++++++++++++-----------------------------
1 files changed, 72 insertions(+), 89 deletions(-)
diff --git a/apps/cMiniApp/src/stores/modules/user.ts b/apps/cMiniApp/src/stores/modules/user.ts
index 31de28b..cf8e0bf 100644
--- a/apps/cMiniApp/src/stores/modules/user.ts
+++ b/apps/cMiniApp/src/stores/modules/user.ts
@@ -8,12 +8,7 @@
setUserDetail,
getUserDetail,
removeUserDetail,
- removeMatchMakingIdentity,
- getMatchMakingIdentity,
- setMatchMakingIdentity,
} from '@/utils/storage/auth';
-import * as accountServices from '@12333/services/api/Account';
-import * as userServices from '@12333/services/api/User';
import Taro, { useRouter } from '@tarojs/taro';
import { ButtonProps } from '@tarojs/components';
import { debounce } from 'lodash';
@@ -24,18 +19,21 @@
setOSSLink,
getUserCertificationFrontStatusAdapter,
LocationUtils,
+ md5Encrypt,
} from '@12333/utils';
import DefaultAvatar from '@/assets/components/icon-default-avatar.png';
-import { WxMiniAppEnum } from '@12333/constants';
import { myClient } from '@/constants/query';
import { globalEventEmitter } from '@12333/hooks';
+import * as authServices from '@12333/services/apiV2/auth';
+import { AppLocalConfig } from '@/constants';
interface UserState {
- userInfo?: Nullable<API.IdentityModelTokenCacheItem>;
+ userInfo?: Nullable<API.LoginCommandCallback>;
token?: Nullable<string>;
refreshToken?: Nullable<string>;
- userDetail?: Nullable<API.UserInfoV2>;
+ userDetail?: Nullable<API.GetPersonalLoginInfoQueryResult>;
firstGetUserDetail?: boolean;
+ firstLaunch?: boolean;
locationCity?: string;
locationProvince?: string;
@@ -74,21 +72,13 @@
refreshToken: userInfo?.refreshToken ?? '',
userDetail: userDetail,
firstGetUserDetail: true,
+ firstLaunch: true,
locationCity: storageLocation?.city ?? '鍖椾含甯�',
locationProvince: storageLocation?.province ?? '鍖椾含',
firstSetLocation: true,
};
},
getters: {
- cacheToken: (state) => {
- if (!state.token) {
- const storageToken = getCacheToken() as API.IdentityModelTokenCacheItem;
-
- state.token = storageToken.accessToken;
- }
- return state.token || null;
- },
-
cacheRefreshToken: (state) => {
return state.refreshToken;
},
@@ -97,27 +87,26 @@
return getAccountInfoFromAccessToken(this.userInfo?.accessToken);
},
- // matchMakingIdentity(state): MatchMakingIdentityEnum {
-
- // },
+ userId: (state) => {
+ 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.浜哄崟鍚堜竴,
- };
- res = await accountServices.wxMiniAppPhoneAuthLogin(params);
+ sessionKey: wxMiniAppUserLoginRes.sessionKey,
+ accessToken: wxMiniAppUserLoginRes.accessToken,
+ });
+ res.accessToken = bindRes.accessToken;
this.loginSuccess(res);
}
return res;
@@ -127,11 +116,13 @@
},
// 鐢ㄦ埛鎵嬫満楠岃瘉鐮佺櫥鍏�
- async loginByUsername(data: API.PhoneMesssageCodeLoginInput) {
- let res = await accountServices.phoneMesssageCodeLogin(
+ async loginByUsername(data: API.SmsLoginCommand) {
+ let res = await authServices.smsLogin(
{
phoneNumber: data.phoneNumber,
- code: data.code,
+ verifyCode: data.verifyCode,
+ type: AppLocalConfig.userType,
+ clientType: AppLocalConfig.clientType,
},
{ showLoading: false }
);
@@ -143,11 +134,14 @@
},
// 鐢ㄦ埛璐﹀彿瀵嗙爜鐧诲叆
- async loginByPassword(data: API.AccessRequestDto) {
- let res = await accountServices.passwordLogin(
+ async loginByPassword(params: API.PasswordLoginCommand) {
+ let res = await authServices.passwordLogin(
{
- loginName: data.userName,
- password: data.userPassword,
+ userName: params.userName,
+ // password: md5Encrypt(params.password),
+ password: params.password,
+ type: AppLocalConfig.userType,
+ clientType: AppLocalConfig.clientType,
},
{ showLoading: false }
);
@@ -157,7 +151,7 @@
return res;
},
- async loginSuccess(res: API.IdentityModelTokenCacheItem) {
+ async loginSuccess(res: API.LoginCommandCallback) {
try {
this.setUserInfoAction(res);
this.setTokenAction(res);
@@ -166,15 +160,15 @@
},
async wxMiniAppUserLoginFromScan(wxIndentityRes: API.WxMiniAppIndentityInfo, uuid: string) {
- try {
- let res = await accountServices.wxMiniAppUserLoginFromScan({
- uId: uuid,
- userName: wxIndentityRes.userName,
- openId: wxIndentityRes.openId,
- });
- this.loginSuccess(res);
- return res;
- } catch (error) {}
+ // try {
+ // let res = await accountServices.wxMiniAppUserLoginFromScan({
+ // uId: uuid,
+ // userName: wxIndentityRes.userName,
+ // openId: wxIndentityRes.openId,
+ // });
+ // this.loginSuccess(res);
+ // return res;
+ // } catch (error) {}
},
async wxMiniAppPhoneAuthLoginFromScan(
@@ -182,47 +176,50 @@
wxIndentityRes: API.WxMiniAppIndentityInfo,
uuid: string
) {
- try {
- let res = await accountServices.wxMiniAppPhoneAuthLoginFromScan({
- uId: uuid,
- openId: wxIndentityRes.openId,
- sessionKey: wxIndentityRes.sessionKey,
- encryptedData: detail.encryptedData,
- iv: detail.iv,
- wxMiniApp: WxMiniAppEnum.浜哄崟鍚堜竴,
- });
- this.loginSuccess(res);
- return res;
- } catch (error) {}
+ // try {
+ // let res = await accountServices.wxMiniAppPhoneAuthLoginFromScan({
+ // uId: uuid,
+ // openId: wxIndentityRes.openId,
+ // sessionKey: wxIndentityRes.sessionKey,
+ // encryptedData: detail.encryptedData,
+ // iv: detail.iv,
+ // wxMiniApp: WxMiniAppEnum.C绔皬绋嬪簭,
+ // });
+ // this.loginSuccess(res);
+ // return res;
+ // } catch (error) {}
},
async getCurrentUserInfo() {
try {
- let res = await userServices.getUserInfo({ showLoading: false });
+ let res = await authServices.getPersonalLoginInfo({}, { showLoading: false });
if (res) {
- res.frontStatus = getUserCertificationFrontStatusAdapter(
- res.userCertificationStatus,
- res.userCertificationAuditStatus
- );
- res.originalAvatarUrl = res.avatarUrl;
- res.avatarUrl = res.avatarUrl ? setOSSLink(res.avatarUrl) : DefaultAvatar;
+ // 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.IdentityModelTokenCacheItem) {
+ setTokenAction(tokenInfo: API.LoginCommandCallback) {
this.token = tokenInfo?.accessToken;
this.refreshToken = tokenInfo.refreshToken ?? '';
},
- setUserInfoAction(info: API.IdentityModelTokenCacheItem) {
- this.userInfo = info;
- setUserInfo(info);
+ setUserInfoAction(info: API.LoginCommandCallback) {
+ this.userInfo = {
+ ...this.userInfo,
+ ...info,
+ };
+ setUserInfo(this.userInfo);
},
- setUserDetail(detail: API.UserInfoV2) {
+ setUserDetail(detail: API.GetPersonalLoginInfoQueryResult) {
this.userDetail = detail;
setUserDetail(detail);
},
@@ -234,7 +231,6 @@
this.userDetail = null;
removeUserInfo();
removeUserDetail();
- removeMatchMakingIdentity();
},
/**
@@ -242,7 +238,7 @@
*/
logout() {
this.resetState();
- myClient.removeQueries();
+ // myClient.removeQueries();
goAuthorization();
},
@@ -271,23 +267,6 @@
}
},
- async getTokenByRefreshToken(params: API.AccessRefreshToken) {
- try {
- const res = await accountServices.getTokenByRefreshToken(params, {
- showLoading: false,
- });
- if (res) {
- this.setTokenAction(res);
- this.setUserInfoAction(res);
- return res;
- } else {
- throw new Error('鍒锋柊token澶辫触');
- }
- } catch (error) {
- throw new Error('error');
- }
- },
-
setLocationCity(cityName: string, provinceName: string) {
this.locationCity = cityName;
this.locationProvince = provinceName;
@@ -300,6 +279,10 @@
// }
LocationUtils.currentProvinceName = provinceName;
},
+
+ setFirstLaunch(firstLaunch: boolean) {
+ this.firstLaunch = firstLaunch;
+ },
},
});
--
Gitblit v1.9.1