Browse Source

Revert "刷新重置"

This reverts commit 7c567fa05c3c458c9163303c225dc98f15bde549.
mo 1 year ago
parent
commit
12eca44be3
2 changed files with 6 additions and 15 deletions
  1. 5 6
      src/components/RouterError/index.tsx
  2. 1 9
      src/store/modules/users.ts

+ 5 - 6
src/components/RouterError/index.tsx

@@ -4,7 +4,6 @@ import { useRouter } from 'vue-router';
 import downBg from './images/downBg.png'
 import rocketIcon from './images/rocketIcon.png'
 import styles from './index.module.less'
-import { useUserStore } from '/src/store/modules/users';
 export default defineComponent({
   name: 'router-error',
   setup() {
@@ -12,7 +11,7 @@ export default defineComponent({
     const dialog = useDialog();
     let refreshing = false;
     const showModalMask = ref(false)
-    const userInfo = useUserStore()
+
 
     router.onError((error, to, form) => {
       const str = error.message + '';
@@ -22,7 +21,8 @@ export default defineComponent({
 
       if (isChunkLoadFailed != -1 && !refreshing) {
         refreshing = true;
-        userInfo.setIsRouterError(true)
+        console.log('onError刷新');
+        sessionStorage.setItem('isRouter','true')
           showModalMask.value = true;
           router.push(to.path)
 
@@ -72,18 +72,17 @@ export default defineComponent({
           if (refreshing) {
             return;
           }
-          const isRouter =  userInfo.getIsRouteError()
+          const isRouter = sessionStorage.getItem('isRouter')
           if(!isRouter){
             showModalMask.value = true
           }
-          userInfo.setIsRouterError(false)
           refreshing = true;
 
         });
       }
     }
     onBeforeUnmount(()=>{
-      userInfo.setIsRouterError(false)
+      sessionStorage.removeItem('isRouter')
     })
     checkNewVersion()
 

+ 1 - 9
src/store/modules/users.ts

@@ -12,7 +12,6 @@ export interface IUserState {
   info: any;
   imUserInfo: any;
   noReadCount: number;
-  isRouteError: boolean;
 }
 
 export const useUserStore = defineStore('user-store', {
@@ -23,8 +22,7 @@ export const useUserStore = defineStore('user-store', {
     avatar: '',
     noReadCount: 0, // 未读数量
     info: storage.get(CURRENT_USER, {}),
-    imUserInfo: {}, // IM
-    isRouteError: false
+    imUserInfo: {} // IM
   }),
   getters: {
     getNoReadCount(): number {
@@ -47,9 +45,6 @@ export const useUserStore = defineStore('user-store', {
     },
     getImUserInfo(): any {
       return this.imUserInfo;
-    },
-    getIsRouteError(): any {
-      return this.isRouteError;
     }
   },
   actions: {
@@ -74,9 +69,6 @@ export const useUserStore = defineStore('user-store', {
     setImUserInfo(info: any) {
       this.imUserInfo = info;
     },
-    setIsRouterError(info: boolean) {
-      this.isRouteError = info;
-    },
     // 登录
     async login(userInfo: any) {
       try {