From 063373d8e7b15ae1e26f5a253136f9d15f4d5cbd Mon Sep 17 00:00:00 2001
From: zhangxiao <898441624@qq.com>
Date: 星期一, 26 八月 2024 14:55:52 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/flow_web

---
 src/store/modules/user/index.ts |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/store/modules/user/index.ts b/src/store/modules/user/index.ts
index 1ee0211..426abc7 100644
--- a/src/store/modules/user/index.ts
+++ b/src/store/modules/user/index.ts
@@ -75,11 +75,13 @@
           avatar: res.data.avatar,
           name: res.data.nickname,
           email: res.data.email,
+          role: res.data.roles[0].roleKey,
         };
-        if(res.data.roles && res.data.roles.length>0)
+     
+        if(res.data?.roles.length>0)
             this.resources=res.data.roles[0].resources;
-        setUserInfo(JSON.stringify(userInfo));
-        setUserResources(JSON.stringify(this.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