From 4edaa14e28e7b595edd1395740d97cdb64d6b93c Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sun, 07 Mar 2021 15:21:33 +0800
Subject: [PATCH] 删除多余的代码
---
ruoyi-ui/src/permission.js | 6 ++----
ruoyi-ui/src/store/modules/user.js | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/ruoyi-ui/src/permission.js b/ruoyi-ui/src/permission.js
index 2c0b1cf..ae0bda2 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已完成
diff --git a/ruoyi-ui/src/store/modules/user.js b/ruoyi-ui/src/store/modules/user.js
index 5e2349f..103706d 100644
--- a/ruoyi-ui/src/store/modules/user.js
+++ b/ruoyi-ui/src/store/modules/user.js
@@ -55,7 +55,7 @@
// 获取用户信息
GetInfo({ commit, state }) {
return new Promise((resolve, reject) => {
- getInfo(state.token).then(res => {
+ getInfo().then(res => {
const user = res.user
const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : user.avatar;
if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
--
Gitblit v1.9.3