111

src/permission.js

@@ -9,7 +9,8 @@ import cookies from 'vue-cookies';
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
 
 const whiteList = ['/login', '/api/docs'] // no redirect whitelist
-const loginUrl = 'development' === process.env.NODE_ENV ? '/login' : 'http://smartcity-dev.123cx.com/login';
+// const loginUrl = 'development' === process.env.NODE_ENV ? '/login' : 'http://smartcity-dev.123cx.com/login';
+const loginUrl = '/login';
 
 router.beforeEach(async (to, from, next) => {
   // start progress bar
@@ -42,11 +43,11 @@ router.beforeEach(async (to, from, next) => {
           // remove token and go to login page to re-login
           await store.dispatch('user/resetToken')
           Message.error(error || 'Has Error')
-          if ('development' === process.env.NODE_ENV) {
-            next(`${loginUrl}?redirect=${to.path}`)
-          } else {
-            window.location.href = loginUrl;
-          }
+          // if ('development' === process.env.NODE_ENV) {
+            next(`/login?redirect=${to.path}`)
+          // } else {
+            // window.location.href = loginUrl;
+          // }
           NProgress.done()
         }
       }
@@ -55,18 +56,18 @@ router.beforeEach(async (to, from, next) => {
     /* has no token*/
     if (whiteList.indexOf(to.path) !== -1) {
       // in the free login whitelist, go directly
-      if (to.path === '/login' && 'development' !== process.env.NODE_ENV) {
-        window.location.href = loginUrl;
-      } else {
+      // if (to.path === '/login' && 'development' !== process.env.NODE_ENV) {
+        // window.location.href = loginUrl;
+      // } else {
         next()
-      }
+      // }
     } else {
       // other pages that do not have permission to access are redirected to the login page.
-      if ('development' === process.env.NODE_ENV) {
-        next(`${loginUrl}?redirect=${to.path}`)
-      } else {
-        window.location.href = loginUrl;
-      }
+      // if ('development' === process.env.NODE_ENV) {
+        next(`/login?redirect=${to.path}`)
+      // } else {
+        // window.location.href = loginUrl;
+      // }
       NProgress.done()
     }
   }