Merge remote-tracking branch 'origin/master'

src/components/Editor/index.vue

@@ -193,12 +193,16 @@ export default {
                 closeOnClickModal: false,
                 cancelButtonClass: 'resetBtn',
                 confirmButtonClass: 'queryBtn', type: 'warning' }).then(() => {
-              sessionStorage.setItem('isRelogin', '')
+              setTimeout(() => {
+                sessionStorage.setItem('isRelogin', '')
+              }, 3000)
               store.dispatch('LogOut').then(() => {
                 location.href = '/index'
               })
             }).catch(() => {
-              sessionStorage.setItem('isRelogin', '')
+              setTimeout(() => {
+                sessionStorage.setItem('isRelogin', '')
+              }, 3000)
             })
           }
         } else {

src/permission.js

@@ -22,7 +22,9 @@ router.beforeEach((to, from, next) => {
         sessionStorage.setItem('isRelogin', 'true')
         // 判断当前用户是否已拉取完user_info信息
         store.dispatch('GetInfo').then(() => {
-          sessionStorage.setItem('isRelogin', '')
+          setTimeout(() => {
+            sessionStorage.setItem('isRelogin', '')
+          }, 3000)
           store.dispatch('GenerateRoutes').then(accessRoutes => {
             // 根据roles权限生成可访问的路由表
             router.addRoutes(accessRoutes) // 动态添加可访问路由表

src/utils/request.js

@@ -84,12 +84,16 @@ service.interceptors.response.use(res => {
             cancelButtonClass: 'resetBtn',
             closeOnClickModal: false,
             confirmButtonClass: 'queryBtn',type: 'warning' }).then(() => {
-          sessionStorage.setItem('isRelogin','')
+          setTimeout(()=>{
+            sessionStorage.setItem('isRelogin','')
+          },3000)
           store.dispatch('LogOut').then(() => {
             location.href = '/index';
           })
       }).catch(() => {
-        sessionStorage.setItem('isRelogin','')
+          setTimeout(() => {
+            sessionStorage.setItem('isRelogin', '')
+          }, 3000)
         });
     }
       return Promise.reject('无效的会话，或者会话已过期，请重新登录。')