diff --git a/src/main.ts b/src/main.ts index ecd4359..91a4dec 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,7 +1,7 @@ import { createApp, Directive } from "vue" +import store from "./store" import router from "./router" import "@/router/permission" -import store from "./store" import App from "./App.vue" import ElementPlus from "element-plus" import loadSvg from "@/icons" diff --git a/src/router/permission.ts b/src/router/permission.ts index 84401a6..da5a0f6 100644 --- a/src/router/permission.ts +++ b/src/router/permission.ts @@ -9,12 +9,12 @@ import asyncRouteSettings from "@/config/async-route" import NProgress from "nprogress" import "nprogress/nprogress.css" -const userStore = useUserStoreHook() -const permissionStore = usePermissionStoreHook() NProgress.configure({ showSpinner: false }) router.beforeEach(async (to: RouteLocationNormalized, _: RouteLocationNormalized, next: any) => { NProgress.start() + const userStore = useUserStoreHook() + const permissionStore = usePermissionStoreHook() // 判断该用户是否登录 if (getToken()) { if (to.path === "/login") {