提交代码

fhKeeper/formulahousekeeper/customerBuler-crm/src/App.vue

@@ -3,9 +3,11 @@
 </template>
 
 <script setup lang="ts">
-window.addEventListener('beforeunload', e => beforeunloadFn(e))
-const beforeunloadFn = ((e:any) => {
-  console.log(e)
+import { useStore } from '@/store/index'
+const { setAsyncRoutesMark } = useStore()
+window.addEventListener('beforeunload', () => beforeunloadFn())
+const beforeunloadFn = (() => {
+  setAsyncRoutesMark(false)
 })
 </script>
 

fhKeeper/formulahousekeeper/customerBuler-crm/src/router/index.ts

@@ -44,19 +44,18 @@ const router = createRouter({
   history: createWebHistory(),
   routes,
 });
-router.beforeEach((_to, _from, next) => {
+router.beforeEach((to, _from, next) => {
   const routerList = useStore().routers;
   const routers = router.getRoutes();
   console.log(routerList, routers);
   const { setAsyncRoutesMark, asyncRoutesMark } = useStore();
   const token = true;
   const skipPath = ['/login', '/register', '/test', '/testEcharts']
-  if (skipPath.includes(_to.path)) {
+  if (skipPath.includes(to.path)) {
     next();
   } else {
     if (token && routerList && routerList.length > 0) {
       if (asyncRoutesMark) {
-        console.log(routers, '<=== 以及有了')
         next();
       } else {
         setAsyncRoutesMark(true)
@@ -71,7 +70,7 @@ router.beforeEach((_to, _from, next) => {
           })
         })
         router.addRoute(addNewRouter);
-        next({ ..._to, replace: true });
+        next({ ...to, replace: true });
       }
     } else {
       console.log("无登录信息，跳转到登录页");