Browse Source

bug 修复

lilei 4 năm trước cách đây
mục cha
commit
d272a6e669
2 tập tin đã thay đổi với 45 bổ sung44 xóa
  1. 43 42
      src/permission.js
  2. 2 2
      vue.config.js

+ 43 - 42
src/permission.js

@@ -10,7 +10,7 @@ import { ACCESS_TOKEN } from '@/store/mutation-types'
 
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
 
-const whiteList = ['login'] // no redirect whitelist
+const whiteList = ['login', 'register', 'registerResult'] // no redirect whitelist
 const defaultRoutePath = '/home'
 
 router.beforeEach((to, from, next) => {
@@ -18,7 +18,7 @@ router.beforeEach((to, from, next) => {
   to.meta && (typeof to.meta.title !== 'undefined' && setDocumentTitle(`${to.meta.title} - ${domTitle}`))
   let token = store.state.user.token || sessionStorage.getItem(ACCESS_TOKEN)
   token = token != 'undefined' ? token : ''
-  console.log(token == 'null')
+  // console.log(token)
   // 已登录
   if (token) {
     /* has token */
@@ -28,52 +28,53 @@ router.beforeEach((to, from, next) => {
     } else {
       const userInfo = Vue.ls.get('userName')
       console.log(userInfo)
-      if (userInfo && token != 'null') {
+      if (userInfo) {
         store.dispatch('SetInfo', userInfo)
-        if (store.getters.roles.permissionList.length === 0) {
-          store
-            .dispatch('GetInfo', token)
-            .then(res => {
-              const roles = res
-              console.log(roles, 'roles')
-              if (roles.permissionList.length == 0 || !roles) {
-                store.dispatch('Logout').then(() => {
-                  store.dispatch('ResetRoutes').then(() => {
-                    next({ path: '/user/login', query: { redirect: to.fullPath } })
-                  })
-                })
-              } else {
-                store.dispatch('GenerateRoutes', { roles }).then(() => {
-                  // 根据roles权限生成可访问的路由表
-                  // 动态添加可访问路由表
-                  // router.addRoutes(store.getters.addRouters)
-                  const redirect = decodeURIComponent(from.query.redirect || to.path)
-                  if (to.path === redirect) {
-                    // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
-                    next({ ...to, replace: true })
-                  } else {
-                    // 跳转到目的路由
-                    next({ path: redirect })
-                  }
+      } else {
+        store.dispatch('Logout').then(() => {
+          next({ path: '/user/login', query: { redirect: to.fullPath } })
+        })
+      }
+      // console.log(store.getters.roles)
+      if (store.getters.roles.permissionList.length === 0) {
+        store
+          .dispatch('GetInfo', token)
+          .then(res => {
+            const roles = res
+            console.log(roles, 'roles')
+            if (roles.permissionList.length == 0 || !roles) {
+              store.dispatch('Logout').then(() => {
+                store.dispatch('ResetRoutes').then(() => {
+                  next({ path: '/user/login', query: { redirect: to.fullPath } })
                 })
-              }
-            })
-            .catch(() => {
-              notification.error({
-                message: '错误',
-                description: '请求用户信息失败,请重试'
               })
-              store.dispatch('Logout').then(() => {
-                next({ path: '/user/login', query: { redirect: to.fullPath } })
+            } else {
+              store.dispatch('GenerateRoutes', { roles }).then(() => {
+                // 根据roles权限生成可访问的路由表
+                // 动态添加可访问路由表
+                // router.addRoutes(store.getters.addRouters)
+                const redirect = decodeURIComponent(from.query.redirect || to.path)
+                if (to.path === redirect) {
+                  // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+                  next({ ...to, replace: true })
+                } else {
+                  // 跳转到目的路由
+                  next({ path: redirect })
+                }
               })
+            }
+          })
+          .catch(() => {
+            notification.error({
+              message: '错误',
+              description: '请求用户信息失败,请重试'
+            })
+            store.dispatch('Logout').then(() => {
+              next({ path: '/user/login', query: { redirect: to.fullPath } })
             })
-        } else {
-          next()
-        }
+          })
       } else {
-        store.dispatch('Logout').then(() => {
-          next({ path: '/user/login', query: { redirect: to.fullPath } })
-        })
+        next()
       }
     }
   } else {

+ 2 - 2
vue.config.js

@@ -108,8 +108,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.16.103:8301/gc-admin/',
-        // target: 'https://lese.test.sxzxyj.net/gc-admin/',
+        // target: 'http://192.168.16.103:8301/gc-admin/',
+        target: 'https://lese.test.sxzxyj.net/gc-admin/',
         ws: false,
         changeOrigin: true,
         pathRewrite: {