From 7a8f1cb7741436c43fc5859707da5041d6648953 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期一, 21 七月 2025 17:21:41 +0800
Subject: [PATCH] -
---
src/views/home/index.vue | 2 +-
src/views/register/registernav.vue | 20 ++++++++++----------
src/utils/auth.ts | 2 +-
src/store/modules/user.ts | 10 ++++------
src/store/types.ts | 2 +-
src/layout/hooks/useNav.ts | 6 ++----
src/router/index.ts | 2 +-
types/router.d.ts | 2 +-
src/router/utils.ts | 2 +-
9 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/src/layout/hooks/useNav.ts b/src/layout/hooks/useNav.ts
index 2da245e..0937a9e 100644
--- a/src/layout/hooks/useNav.ts
+++ b/src/layout/hooks/useNav.ts
@@ -53,10 +53,8 @@
/** 瑙掕壊 */
const userRoles = computed(() => {
- console.log(useUserStoreHook()?.roles, "useUserStoreHook()?.roles");
-
- return isAllEmpty(useUserStoreHook()?.roles)
- ? useUserStoreHook()?.roles
+ return isAllEmpty(useUserStoreHook()?.exRoles)
+ ? useUserStoreHook()?.exRoles
: {};
});
diff --git a/src/router/index.ts b/src/router/index.ts
index a4d8e99..353db8c 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -137,7 +137,7 @@
}
if (Cookies.get(multipleTabsKey) && userInfo) {
// 鏃犳潈闄愯烦杞�403椤甸潰
- if (to.meta?.roles && !isOneOfArray(to.meta?.roles, userInfo?.roles)) {
+ if (to.meta?.roles && !isOneOfArray(to.meta?.roles, userInfo?.exRoles)) {
next({ path: "/error/403" });
}
// 寮�鍚殣钘忛椤靛悗鍦ㄦ祻瑙堝櫒鍦板潃鏍忔墜鍔ㄨ緭鍏ラ椤祑elcome璺敱鍒欒烦杞埌404椤甸潰
diff --git a/src/router/utils.ts b/src/router/utils.ts
index 28e32b8..d8ef0f7 100644
--- a/src/router/utils.ts
+++ b/src/router/utils.ts
@@ -84,7 +84,7 @@
/** 浠巐ocalStorage閲屽彇鍑哄綋鍓嶇櫥褰曠敤鎴风殑瑙掕壊roles锛岃繃婊ゆ棤鏉冮檺鐨勮彍鍗� */
function filterNoPermissionTree(data: RouteComponent[]) {
const currentRoles =
- storageLocal().getItem<DataInfo<number>>(userKey)?.roles ?? [];
+ storageLocal().getItem<DataInfo<number>>(userKey)?.exRoles ?? [];
const newTree = cloneDeep(data).filter((v: any) =>
isOneOfArray(v.meta?.roles, currentRoles)
);
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 877b4d8..3afc5e6 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -25,7 +25,7 @@
// 鏄电О
nickname: storageLocal().getItem<DataInfo<number>>(userKey)?.nickname ?? "",
// 椤甸潰绾у埆鏉冮檺
- roles: storageLocal().getItem<DataInfo<number>>(userKey)?.roles ?? [],
+ exRoles: storageLocal().getItem<DataInfo<number>>(userKey)?.exRoles ?? [],
// 鎸夐挳绾у埆鏉冮檺
permissions:
storageLocal().getItem<DataInfo<number>>(userKey)?.permissions ?? [],
@@ -48,10 +48,8 @@
this.nickname = nickname;
},
/** 瀛樺偍瑙掕壊 */
- SET_ROLES(roles: Array<string>) {
- console.log(roles, "setroles");
-
- this.roles = roles;
+ SET_ROLES(exRoles: Array<string>) {
+ this.exRoles = exRoles;
},
/** 瀛樺偍鎸夐挳绾у埆鏉冮檺 */
SET_PERMS(permissions: Array<string>) {
@@ -83,7 +81,7 @@
/** 鍓嶇鐧诲嚭锛堜笉璋冪敤鎺ュ彛锛� */
logOut() {
this.username = "";
- this.roles = [];
+ this.exRoles = [];
this.permissions = [];
removeToken();
useMultiTagsStoreHook().handleTags("equal", [...routerArrays]);
diff --git a/src/store/types.ts b/src/store/types.ts
index c33268a..73a1f57 100644
--- a/src/store/types.ts
+++ b/src/store/types.ts
@@ -40,7 +40,7 @@
avatar?: string;
username?: string;
nickname?: string;
- roles?: Array<string>;
+ exRoles?: Array<string>;
permissions?: Array<string>;
isRemembered?: boolean;
loginDay?: number;
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
index 7e5a326..fd8a4cc 100644
--- a/src/utils/auth.ts
+++ b/src/utils/auth.ts
@@ -43,7 +43,7 @@
* @description 璁剧疆`token`浠ュ強涓�浜涘繀瑕佷俊鎭苟閲囩敤鏃犳劅鍒锋柊`token`鏂规
* 鏃犳劅鍒锋柊锛氬悗绔繑鍥瀈accessToken`锛堣闂帴鍙ｄ娇鐢ㄧ殑`token`锛夈�乣refreshToken`锛堢敤浜庤皟鐢ㄥ埛鏂癭accessToken`鐨勬帴鍙ｆ椂鎵�闇�鐨刞token`锛宍refreshToken`鐨勮繃鏈熸椂闂达紙姣斿30澶╋級搴斿ぇ浜巂accessToken`鐨勮繃鏈熸椂闂达紙姣斿2灏忔椂锛夛級銆乣expires`锛坄accessToken`鐨勮繃鏈熸椂闂达級
* 灏哷accessToken`銆乣expires`銆乣refreshToken`杩欎笁鏉′俊鎭斁鍦╧ey鍊间负authorized-token鐨刢ookie閲岋紙杩囨湡鑷姩閿�姣侊級
- * 灏哷avatar`銆乣username`銆乣nickname`銆乣roles`銆乣permissions`銆乣refreshToken`銆乣expires`杩欎竷鏉′俊鎭斁鍦╧ey鍊间负`user-info`鐨刲ocalStorage閲岋紙鍒╃敤`multipleTabsKey`褰撴祻瑙堝櫒瀹屽叏鍏抽棴鍚庤嚜鍔ㄩ攢姣侊級
+ * 灏哷avatar`銆乣username`銆乣nickname`銆乣exRoles`銆乣permissions`銆乣refreshToken`銆乣expires`杩欎竷鏉′俊鎭斁鍦╧ey鍊间负`user-info`鐨刲ocalStorage閲岋紙鍒╃敤`multipleTabsKey`褰撴祻瑙堝櫒瀹屽叏鍏抽棴鍚庤嚜鍔ㄩ攢姣侊級
*/
export function setToken(data: DataInfo<Date>) {
let expires = 0;
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index b1fcd4d..0b2c4fa 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -407,7 +407,7 @@
const userStore = useUserStore();
// 璁块棶 state 灞炴��
-console.log(userStore.roles,'-'); // 鐩存帴鑾峰彇鍊�
+// console.log(userStore.roles,'-'); // 鐩存帴鑾峰彇鍊�
defineOptions({
name: "Main"
});
diff --git a/src/views/register/registernav.vue b/src/views/register/registernav.vue
index 27338d8..917e7df 100644
--- a/src/views/register/registernav.vue
+++ b/src/views/register/registernav.vue
@@ -390,7 +390,7 @@
<div v-if="active !== 3" class="mx-auto pt-2 pb-5 flex justify-center">
<el-button :disabled="active == 1" @click="backStep">涓婁竴姝�</el-button>
<el-button type="primary" @click="nextStep(ruleFormRef)"
- ><span v-if="active == 1">鍚屾剰</span>涓嬩竴姝�</el-button
+ ><span v-if="active == 0">鍚屾剰</span>涓嬩竴姝�</el-button
>
</div>
</div>
@@ -417,7 +417,7 @@
import { getToken } from "@/utils/auth";
import { useRoute, useRouter } from "vue-router";
const router = useRouter();
-const { route, username, userRoles } = useNav();
+const { route } = useNav();
defineOptions({
name: "RegisterNav"
@@ -598,20 +598,20 @@
};
// 椤甸潰鍒濆鍖�
onMounted(async () => {
- // console.log(
- // userRoles.code,
- // username.value,
- // "hhhhhhh",
- // storageLocal().getItem<DataInfo<number>>(userKey)?.roles
- // );
- // console.log(useUserStoreHook()?.roles, "useUserStoreHook()?.roles");
- state.ruleForm.transactionCode = route.query.code;
+ let nowRole = useUserStoreHook()?.exRoles;
+ if (nowRole.length >= 1 && !route.query.code) {
+ state.ruleForm.transactionCode = nowRole[0].code;
+ } else {
+ state.ruleForm.transactionCode = route.query.code;
+ }
// 浼佷笟绫诲瀷
let res = await enterpriseTypes();
state.enterpriseList = res?.result;
});
let active = ref(0);
const nextStep = async (formEl: FormInstance | undefined) => {
+ console.log(state.ruleForm);
+
if (active.value >= 1) {
if (!formEl) return;
await formEl.validate((valid, fields) => {
diff --git a/types/router.d.ts b/types/router.d.ts
index 0355852..415a953 100644
--- a/types/router.d.ts
+++ b/types/router.d.ts
@@ -23,7 +23,7 @@
/** 鏄惁鏄剧ず鐖剁骇鑿滃崟 `鍙�塦 */
showParent?: boolean;
/** 椤甸潰绾у埆鏉冮檺璁剧疆 `鍙�塦 */
- roles?: Array<string>;
+ exRoles?: Array<string>;
/** 鎸夐挳绾у埆鏉冮檺璁剧疆 `鍙�塦 */
auths?: Array<string>;
/** 璺敱缁勪欢缂撳瓨锛堝紑鍚� `true`銆佸叧闂� `false`锛塦鍙�塦 */
--
Gitblit v1.9.1