33

src/router/index.js

@@ -320,25 +320,19 @@ router.beforeEach(async (to, from, next) => {
         const hasUser = JSON.parse(window.sessionStorage.getItem('user'))
         const hasMenu = JSON.parse(window.sessionStorage.getItem('menuList'))
         if (hasUser && hasMenu) {
+          if (hasUser.type === '3' && !!!hasUser.projType && hasUser.roles != '4') {
             if (to.path === '/sys') {
-            if (!!!hasUser.projType && hasUser.type === '3' && hasUser.roles != '4') {
               next()
               NProgress.done()
-            }
-            else {
-              next({ path: '/' })
-              NProgress.done()
-            }
             } else {
-            if (!!!hasUser.projType && hasUser.type === '3' && hasUser.roles != '4') {
               next(`/sys`)
               NProgress.done()
+            }
           } else {
             await store.dispatch('app/auth', to.path)
             next()
             NProgress.done()
           }
-          }
         } else {
           await store.dispatch('user/getUser')
           next({ ...to, replace: true })