From 445c059cc3c0ce36269b84cd52298af378837913 Mon Sep 17 00:00:00 2001 From: zhangwei <1504152376@qq.com> Date: 星期二, 05 八月 2025 10:24:31 +0800 Subject: [PATCH] '个人中心状态判断' --- src/store/modules/user.ts | 32 +++++++++++++++----------------- 1 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 145823a..b4f62ea 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -17,6 +17,8 @@ import { useMultiTagsStoreHook } from "./multiTags"; import { type DataInfo, + type ResponseEnterprise, + type CusExtendDto, setToken, setRoleListInfo, setNowRole, @@ -26,6 +28,7 @@ } from "@/utils/auth"; import { exRole } from "@/api/register/index"; import { cusExtendInfo } from "@/api/mine"; +import type { nowRoleType } from "@/store/types"; export const useUserStore = defineStore("pure-user", { state: (): userType => ({ @@ -46,10 +49,9 @@ loginDay: 1, // 浼佷笟璧勬枡 enterpriseInfo: - storageLocal().getItem<DataInfo<number>>("enterpriseInfo") ?? {}, - nowRole: storageLocal().getItem<DataInfo<number>>("nowRole") ?? {}, - rolesList: storageLocal().getItem<DataInfo<number>>("rolesList") ?? [], - isFlsh: storageLocal().getItem<DataInfo<number>>("isFlsh") ?? false + storageLocal().getItem<CusExtendDto>("enterpriseInfo") ?? {}, + nowRole: storageLocal().getItem<nowRoleType>("nowRole") ?? {}, + rolesList: storageLocal().getItem<DataInfo<number>>("rolesList") ?? [] }), actions: { /** 瀛樺偍澶村儚 */ @@ -69,16 +71,12 @@ this.exRoles = exRoles; }, /** 瀛樺偍瑙掕壊褰撳墠瑙掕壊 */ - SET_NOW_ROLE(nowRole: object) { + SET_NOW_ROLE(nowRole: nowRoleType) { this.nowRole = nowRole; }, /** 瀛樺偍瑙掕壊鍒楄〃 */ SET_ROLES_LIST(rolesList: Array<string>) { this.rolesList = rolesList; - }, - /** 褰撳墠瑙掕壊鏄惁瀹℃牳 */ - SET_IS_FLSH(isFlsh: boolean | string) { - this.isFlsh = isFlsh; }, /** 瀛樺偍鎸夐挳绾у埆鏉冮檺 */ SET_PERMS(permissions: Array<string>) { @@ -93,8 +91,8 @@ this.loginDay = Number(value); }, // 璁剧疆浼佷笟璧勬枡 - SET_ENTERPRISEINFO(value: object) { - this.loginDay = Number(value); + SET_ENTERPRISEINFO(enterpriseInfo: CusExtendDto) { + this.enterpriseInfo = enterpriseInfo; }, /** 鐧诲叆 */ async loginByUsername(obj) { @@ -144,13 +142,13 @@ async changeLogoInExRule(obj) { return new Promise<LoginResult>((resolve, reject) => { getChangeLogoInExRule(obj) - .then(data => { + .then(async data => { if (data?.code == 200) { setToken(data.result); this.getNowRole(obj.ruleCode); - this.getCusExtendInfo(); + await this.getCusExtendInfo(); + resolve(data); } - resolve(data); }) .catch(error => { reject(error); @@ -158,12 +156,12 @@ }); }, async getCusExtendInfo() { - return new Promise<LoginResult>((resolve, reject) => { + return new Promise<ResponseEnterprise>((resolve, reject) => { cusExtendInfo() .then(data => { - data.result.username = data.result.enterpriseName; + setEnterpriseInfo(data.result); if (data?.code == 200) { - setEnterpriseInfo(data.result); + data.result.username = data.result?.enterpriseName; resolve(data); } }) -- Gitblit v1.9.1