From b94b71d44d62802bb8093f64a202d0176fdade50 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期二, 05 八月 2025 17:00:46 +0800
Subject: [PATCH] '一些更改'
---
src/store/modules/user.ts | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 152e9ec..fabcc62 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 => ({
@@ -35,7 +38,7 @@
username: storageLocal().getItem<DataInfo<number>>(userKey)?.username ?? "",
// 鏄电О
nickname: storageLocal().getItem<DataInfo<number>>(userKey)?.nickname ?? "",
- // 椤甸潰绾у埆鏉冮檺
+ // 褰撳墠瑙掕壊鍒楄〃
exRoles: storageLocal().getItem<DataInfo<number>>(userKey)?.exRoles ?? [],
// 鎸夐挳绾у埆鏉冮檺
permissions:
@@ -46,9 +49,11 @@
loginDay: 1,
// 浼佷笟璧勬枡
enterpriseInfo:
- storageLocal().getItem<DataInfo<number>>("enterpriseInfo") ?? {},
- nowRole: storageLocal().getItem<DataInfo<number>>("nowRole") ?? {},
- rolesList: storageLocal().getItem<DataInfo<number>>("rolesList") ?? []
+ storageLocal().getItem<CusExtendDto>("enterpriseInfo") ?? {},
+ nowRole: storageLocal().getItem<nowRoleType>("nowRole") ?? {},
+ rolesList: storageLocal().getItem<DataInfo<number>>("rolesList") ?? [],
+ // 椤甸潰绾у埆鏉冮檺
+ roles: storageLocal().getItem<DataInfo<number>>(userKey)?.roles ?? []
}),
actions: {
/** 瀛樺偍澶村儚 */
@@ -64,15 +69,19 @@
this.nickname = nickname;
},
/** 瀛樺偍鐢ㄦ埛瑙掕壊 */
- SET_ROLES(exRoles: Array<string>) {
+ SET_EXROLES(exRoles: Array<string>) {
this.exRoles = exRoles;
},
+ /** 瀛樺偍瑙掕壊 */
+ SET_ROLES(roles: Array<string>) {
+ this.roles = roles;
+ },
/** 瀛樺偍瑙掕壊褰撳墠瑙掕壊 */
- SET_NOW_ROLE(nowRole: object) {
+ SET_NOW_ROLE(nowRole: nowRoleType) {
this.nowRole = nowRole;
},
/** 瀛樺偍瑙掕壊鍒楄〃 */
- SET_ROLES_LIST(rolesList: Array<string>) {
+ SET_EXROLES_LIST(rolesList: Array<string>) {
this.rolesList = rolesList;
},
/** 瀛樺偍鎸夐挳绾у埆鏉冮檺 */
@@ -88,8 +97,8 @@
this.loginDay = Number(value);
},
// 璁剧疆浼佷笟璧勬枡
- SET_ENTERPRISEINFO(value: object) {
- this.loginDay = Number(value);
+ SET_ENTERPRISEINFO(enterpriseInfo: CusExtendDto) {
+ this.enterpriseInfo = enterpriseInfo;
},
/** 鐧诲叆 */
async loginByUsername(obj) {
@@ -97,6 +106,7 @@
getLogin(obj)
.then(data => {
if (data?.code == 200) {
+ data.result.roles = [obj.exRuleCode];
setToken(data.result);
this.getNowRole(obj.exRuleCode);
}
@@ -139,13 +149,14 @@
async changeLogoInExRule(obj) {
return new Promise<LoginResult>((resolve, reject) => {
getChangeLogoInExRule(obj)
- .then(data => {
+ .then(async data => {
if (data?.code == 200) {
+ data.result.roles = [obj.ruleCode];
setToken(data.result);
this.getNowRole(obj.ruleCode);
- this.getCusExtendInfo();
+ await this.getCusExtendInfo();
+ resolve(data);
}
- resolve(data);
})
.catch(error => {
reject(error);
@@ -153,12 +164,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);
}
})
@@ -171,6 +182,7 @@
logOut() {
this.username = "";
this.exRoles = [];
+ this.roles = [];
this.permissions = [];
removeToken();
useMultiTagsStoreHook().handleTags("equal", [...routerArrays]);
--
Gitblit v1.9.1