diff --git a/ruoyi-ui/src/permission.js b/ruoyi-ui/src/permission.js index 17e5b3d..2c0b1cf 100644 --- a/ruoyi-ui/src/permission.js +++ b/ruoyi-ui/src/permission.js @@ -23,28 +23,18 @@ router.beforeEach((to, from, next) => { // 拉取user_info const roles = res.roles store.dispatch('GenerateRoutes', { roles }).then(accessRoutes => { - // 测试 默认静态页面 - // store.dispatch('permission/generateRoutes', { roles }).then(accessRoutes => { // 根据roles权限生成可访问的路由表 router.addRoutes(accessRoutes) // 动态添加可访问路由表 next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 }) - }) - .catch(err => { - store.dispatch('FedLogOut').then(() => { + }).catch(err => { + store.dispatch('LogOut').then(() => { Message.error(err) next({ path: '/' }) }) }) } else { next() - // 没有动态改变权限的需求可直接next() 删除下方权限判断 ↓ - // if (hasPermission(store.getters.roles, to.meta.roles)) { - // next() - // } else { - // next({ path: '/401', replace: true, query: { noGoBack: true }}) - // } - // 可删 ↑ } } } else { diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue index 574ca0b..6b2139e 100644 --- a/ruoyi-ui/src/views/login.vue +++ b/ruoyi-ui/src/views/login.vue @@ -126,15 +126,12 @@ export default { Cookies.remove("password"); Cookies.remove('rememberMe'); } - this.$store - .dispatch("Login", this.loginForm) - .then(() => { - this.$router.push({ path: this.redirect || "/" }); - }) - .catch(() => { - this.loading = false; - this.getCode(); - }); + this.$store.dispatch("Login", this.loginForm).then(() => { + this.$router.push({ path: this.redirect || "/" }).catch(()=>{}); + }).catch(() => { + this.loading = false; + this.getCode(); + }); } }); }