From 77b33be4a711a5c0b9148088f7af5fe5379ff09b Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Wed, 22 Jul 2026 16:47:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BC=9A=E8=AE=AE=E5=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/getters.js | 1 + src/store/modules/user.js | 20 ++-- src/views/book/components/addAppointment.vue | 109 +++++++++++++------ 3 files changed, 92 insertions(+), 38 deletions(-) diff --git a/src/store/getters.js b/src/store/getters.js index a108508..3e864c4 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -5,6 +5,7 @@ const getters = { avatar: state => state.user.avatar, name: state => state.user.name, roles: state => state.user.roles, + roleNames: state => state.user.roleNames, permission_routes: state => state.permission.routes } export default getters diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 9b1d0e5..d269186 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -1,7 +1,7 @@ import { login, logout, - getInfo, + getInfo, loginMsg } from '@/api/user' import { @@ -18,7 +18,8 @@ const getDefaultState = () => { token: getToken(), name: '', avatar: '', - roles: [] + roles: [], + roleNames: [] } } @@ -39,6 +40,9 @@ const mutations = { }, SET_ROLES: (state, roles) => { state.roles = roles + }, + SET_ROLE_NAMES: (state, roleNames) => { + state.roleNames = roleNames } } @@ -68,7 +72,7 @@ const actions = { reject(error) }) }) - }, + }, loginMsg({ commit }, userInfo) { @@ -106,15 +110,17 @@ const actions = { if (!response) { reject('身份验证失败请重新登录') } - response["roles"] = ["admin"]; + const roleNames = (response.roles || []).map(role => { + return typeof role === 'string' ? role : role.name + }).filter(Boolean) + response.roles = ['admin'] const { roles, name, avatar } = response - - + commit('SET_ROLE_NAMES', roleNames) commit('SET_ROLES', roles) commit('SET_NAME', name) commit('SET_AVATAR', avatar) @@ -159,4 +165,4 @@ export default { state, mutations, actions -} +} diff --git a/src/views/book/components/addAppointment.vue b/src/views/book/components/addAppointment.vue index bee297a..fbc3e5d 100644 --- a/src/views/book/components/addAppointment.vue +++ b/src/views/book/components/addAppointment.vue @@ -154,27 +154,41 @@ - + @@ -182,6 +196,7 @@