zhuliu пре 1 година
родитељ
комит
1b67fe6689
3 измењених фајлова са 3 додато и 3 уклоњено
  1. 1 0
      src/router/index.js
  2. 1 0
      src/utils/axios.js
  3. 1 3
      src/views/login/index.vue

+ 1 - 0
src/router/index.js

@@ -615,6 +615,7 @@ router.beforeEach((to, from, next) => {
           var path = to.path
           if(to.matched.findIndex(item=>{ return item.path == path}) !=-1){
             var redirectUrl = {
+              userName:localStorage.getItem('username'),
               path:to.path,
               query:to.query,
               params:to.params

+ 1 - 0
src/utils/axios.js

@@ -63,6 +63,7 @@ _axios.interceptors.response.use(
     if (code === 401) {
       var redirectUrl = Router.app._route
       var route1 = {
+        userName:localStorage.getItem('username'),
         path:redirectUrl.path,
         query:redirectUrl.query,
         params:redirectUrl.params

+ 1 - 3
src/views/login/index.vue

@@ -268,8 +268,7 @@ export default {
           if(redirectUrl){
             redirectUrl = JSON.parse(redirectUrl)
             localStorage.removeItem('redirectUrl')
-            var arr = Object.keys(redirectUrl.query)
-            if(arr.length>0){
+            if(redirectUrl.username != this.ruleForm.username){
               this.$router.push({
                 path: '/home'
               })
@@ -280,7 +279,6 @@ export default {
                 params:redirectUrl.params
               })
             }
-            
           }else{
             this.$router.push({
               path: '/home'