From d50a7bc02d89e14beeab83a28f0d3677dbd9f0ef Mon Sep 17 00:00:00 2001 From: zhangxiao <898441624@qq.com> Date: 星期五, 30 八月 2024 14:31:50 +0800 Subject: [PATCH] fix: 修改bug --- src/store/modules/user/index.ts | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/store/modules/user/index.ts b/src/store/modules/user/index.ts index faa226d..84388d7 100644 --- a/src/store/modules/user/index.ts +++ b/src/store/modules/user/index.ts @@ -71,16 +71,28 @@ const res = await userLogin(loginForm); setToken(res.data.access_token); + const userInfo = { avatar: res.data.avatar, - name: res.data.nickname, + name: res.data.userName, email: res.data.email, + role: res.data.roles[0].roleKey, }; - this.resources=res.data.resources; - setUserInfo(JSON.stringify(userInfo)); - setUserResources(JSON.stringify(this.resources)) + this.name=res.data.userName + + if(res.data?.roles.length>0) + //閬嶅巻roles + for (const r of res.data.roles) { + if (!(this.resources)) { + this.resources = []; + } + this.resources = this.resources.concat(r.resources); + } + setUserInfo(JSON.stringify(userInfo)); + setUserResources(JSON.stringify(this.resources)) for (const r of this.resources) { if (r.menuType == 0) { + return r.component } } -- Gitblit v1.8.0