From 5494ec36e514fe53334ff175782c2a512b4cbb87 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 09 三月 2021 09:32:49 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-ui/src/permission.js | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/ruoyi-ui/src/permission.js b/ruoyi-ui/src/permission.js
index 6a2ec21..5632e7d 100644
--- a/ruoyi-ui/src/permission.js
+++ b/ruoyi-ui/src/permission.js
@@ -19,10 +19,8 @@
} else {
if (store.getters.roles.length === 0) {
// 鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁宸叉媺鍙栧畬user_info淇℃伅
- store.dispatch('GetInfo').then(res => {
- // 鎷夊彇user_info
- const roles = res.roles
- store.dispatch('GenerateRoutes', { roles }).then(accessRoutes => {
+ store.dispatch('GetInfo').then(() => {
+ store.dispatch('GenerateRoutes').then(accessRoutes => {
// 鏍规嵁roles鏉冮檺鐢熸垚鍙闂殑璺敱琛�
router.addRoutes(accessRoutes) // 鍔ㄦ�佹坊鍔犲彲璁块棶璺敱琛�
next({ ...to, replace: true }) // hack鏂规硶 纭繚addRoutes宸插畬鎴�
--
Gitblit v1.9.3