feat(hooks): deleting the route export of useRoutePush, use vue-router

soybeanjs · Apr 15, 2024 · c6648b6 · c6648b6
1 parent bb74d99
commit c6648b6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/hooks/common/router.ts b/src/hooks/common/router.ts
@@ -92,7 +92,6 @@ export function useRouterPush(inSetup = true) {
   }
 
   return {
-    route,
     routerPush,
     routerBack,
     routerPushByKey,

diff --git a/src/store/modules/auth/index.ts b/src/store/modules/auth/index.ts
@@ -1,6 +1,7 @@
 import { computed, reactive, ref } from 'vue';
 import { defineStore } from 'pinia';
 import { useLoading } from '@sa/hooks';
+import { useRoute } from 'vue-router';
 import { SetupStoreId } from '@/enum';
 import { useRouterPush } from '@/hooks/common/router';
 import { fetchGetUserInfo, fetchLogin } from '@/service/api';
@@ -11,9 +12,11 @@ import { clearAuthStorage, getToken, getUserInfo } from './shared';
 
 export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
   const routeStore = useRouteStore();
-  const { route, toLogin, redirectFromLogin } = useRouterPush(false);
+  const { toLogin, redirectFromLogin } = useRouterPush(false);
   const { loading: loginLoading, startLoading, endLoading } = useLoading();
 
+  const route = useRoute();
+
   const token = ref(getToken());
 
   const userInfo: Api.Auth.UserInfo = reactive(getUserInfo());
@@ -36,7 +39,7 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
 
     authStore.$reset();
 
-    if (!route.value.meta.constant) {
+    if (!route.meta.constant) {
       await toLogin();
     }