From d0db810c9b1c67b8eed03c7f7be6eb4a34a8dbc7 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期五, 06 十二月 2024 17:05:25 +0800
Subject: [PATCH] permissions合并
---
.env | 2 +-
src/store/modules/user.ts | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.env b/.env
index b6193f6..8f5ef47 100644
--- a/.env
+++ b/.env
@@ -8,7 +8,7 @@
VITE_OPEN=false
# 请求路径
-VITE_BASE_URL='http://localhost:8088'
+VITE_BASE_URL='http://localhost:48080'
# 平台路径
VITE_PLAT_URL='http://localhost:48080'
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 176152e..31651a8 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -63,7 +63,8 @@
}
const userInfo = await getInfo()
const appInfo = await getAppInfo()
- this.permissions = userInfo.permissions
+ this.permissions = userInfo.permissions.concat(appInfo.permissions)
+ userInfo.permissions = userInfo.permissions.concat(appInfo.permissions)
this.roles = userInfo.roles
this.user = userInfo.user
this.isSetUser = true
--
Gitblit v1.9.3