解决不存在页面404跳转空白Bug

ruoyi-ui/src/permission.js

@@ -1,64 +1,66 @@
-import router from './router'
+import router from './router'
-import store from './store'
+import store from './store'
-import { Message } from 'element-ui'
+import { Message } from 'element-ui'
-import NProgress from 'nprogress'
+import NProgress from 'nprogress'
-import 'nprogress/nprogress.css'
+import 'nprogress/nprogress.css'
-import { getToken } from '@/utils/auth'
+import { getToken } from '@/utils/auth'
-
+
-NProgress.configure({ showSpinner: false })
+NProgress.configure({ showSpinner: false })
-
+
-const whiteList = ['/login', '/auth-redirect', '/bind', '/register']
+const whiteList = ['/login', '/auth-redirect', '/bind', '/register']
-
+
-router.beforeEach((to, from, next) => {
+router.beforeEach((to, from, next) => {
-  NProgress.start()
+  NProgress.start()
-  if (getToken()) {
+  if (getToken()) {
-    /* has token*/
+    /* has token*/
-    if (to.path === '/login') {
+    if (to.path === '/login') {
-      next({ path: '/' })
+      next({ path: '/' })
-      NProgress.done()
+      NProgress.done()
-    } else {
+    } else {
-      if (store.getters.roles.length === 0) {
+      if (store.getters.roles.length === 0) {
-        // 判断当前用户是否已拉取完user_info信息
+        // 判断当前用户是否已拉取完user_info信息
-        store.dispatch('GetInfo').then(res => {
+        store.dispatch('GetInfo').then(res => {
-          // 拉取user_info
+          // 拉取user_info
-          const roles = res.roles
+          const roles = res.roles
-          store.dispatch('GenerateRoutes', { roles }).then(accessRoutes => {
+          store.dispatch('GenerateRoutes', { roles }).then(accessRoutes => {
-          // 测试 默认静态页面
+            //添加404跳转
-          // store.dispatch('permission/generateRoutes', { roles }).then(accessRoutes => {
+            accessRoutes.push({path: '*', redirect: '/404', hidden: true})
-            // 根据roles权限生成可访问的路由表
+          // 测试 默认静态页面
-            router.addRoutes(accessRoutes) // 动态添加可访问路由表
+          // store.dispatch('permission/generateRoutes', { roles }).then(accessRoutes => {
-            next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
+            // 根据roles权限生成可访问的路由表
-          })
+            router.addRoutes(accessRoutes) // 动态添加可访问路由表
-        })
+            next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
-          .catch(err => {
+          })
-            store.dispatch('FedLogOut').then(() => {
+        })
-              Message.error(err)
+          .catch(err => {
-              next({ path: '/' })
+            store.dispatch('FedLogOut').then(() => {
-            })
+              Message.error(err)
-          })
+              next({ path: '/' })
-      } else {
+            })
-        next()
+          })
-        // 没有动态改变权限的需求可直接next() 删除下方权限判断 ↓
+      } else {
-        // if (hasPermission(store.getters.roles, to.meta.roles)) {
+        next()
-        //   next()
+        // 没有动态改变权限的需求可直接next() 删除下方权限判断 ↓
-        // } else {
+        // if (hasPermission(store.getters.roles, to.meta.roles)) {
-        //   next({ path: '/401', replace: true, query: { noGoBack: true }})
+        //   next()
-        // }
+        // } else {
-        // 可删 ↑
+        //   next({ path: '/401', replace: true, query: { noGoBack: true }})
-      }
+        // }
-    }
+        // 可删 ↑
-  } else {
+      }
-    // 没有token
+    }
-    if (whiteList.indexOf(to.path) !== -1) {
+  } else {
-      // 在免登录白名单，直接进入
+    // 没有token
-      next()
+    if (whiteList.indexOf(to.path) !== -1) {
-    } else {
+      // 在免登录白名单，直接进入
-      next(`/login?redirect=${to.path}`) // 否则全部重定向到登录页
+      next()
-      NProgress.done()
+    } else {
-    }
+      next(`/login?redirect=${to.path}`) // 否则全部重定向到登录页
-  }
+      NProgress.done()
-})
+    }
-
+  }
-router.afterEach(() => {
+})
-  NProgress.done()
+
-})
+router.afterEach(() => {
+  NProgress.done()
+})