From 78921416615f450f4cc29ec4f740fbf1b47d8b00 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期二, 19 八月 2025 17:18:28 +0800
Subject: [PATCH] 注册登录更改
---
src/utils/auth.ts | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
index 65b67b0..69ae036 100644
--- a/src/utils/auth.ts
+++ b/src/utils/auth.ts
@@ -2,6 +2,7 @@
import { useUserStoreHook } from "@/store/modules/user";
import { storageLocal, isString, isIncludeAllChildren } from "@pureadmin/utils";
import type { nowRoleType } from "@/store/types";
+import type { LoginResult, RoleItem } from "@/api/types";
export interface DataInfo<T> {
/** token */
@@ -172,7 +173,7 @@
* 灏哷accessToken`銆乣expires`銆乣refreshToken`杩欎笁鏉′俊鎭斁鍦╧ey鍊间负authorized-token鐨刢ookie閲岋紙杩囨湡鑷姩閿�姣侊級
* 灏哷avatar`銆乣username`銆乣nickname`銆乣exRoles`銆乣permissions`銆乣refreshToken`銆乣expires`杩欎竷鏉′俊鎭斁鍦╧ey鍊间负`user-info`鐨刲ocalStorage閲岋紙鍒╃敤`multipleTabsKey`褰撴祻瑙堝櫒瀹屽叏鍏抽棴鍚庤嚜鍔ㄩ攢姣侊級
*/
-export function setToken(data: DataInfo<Date>) {
+export function setToken(data: LoginResult) {
let expires = 0;
const { accessToken, refreshToken } = data;
const { isRemembered, loginDay } = useUserStoreHook();
@@ -264,7 +265,7 @@
storageLocal().setItem(userKey, obj);
}
-export function setRoleListInfo(data: DataInfo<string>) {
+export function setRoleListInfo(data: RoleItem[]) {
useUserStoreHook().SET_EXROLES_LIST(data);
storageLocal().setItem("rolesList", data);
}
@@ -275,7 +276,7 @@
const obj = list.find(item => {
return item.code == data.code;
});
- data = { ...obj, ...data };
+ data = Object.assign(obj, data);
}
useUserStoreHook().SET_ROLES([data.name]);
useUserStoreHook().SET_NOW_ROLE(data);
--
Gitblit v1.9.1