diff --git a/src/router/index.ts b/src/router/index.ts index 7e10930..69e1432 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -7,22 +7,20 @@ const router = createRouter({ history: createWebHashHistory(), routes, // `routes: routes` 的缩写 }) -//路由的请求拦截器 +//路由的请求拦截器 +//to 是即将进入的路由对象，from 是当前离开的路由对象，next 是一个函数，调用它会继续导航。 router.beforeEach((to, from, next) => { - const store = userStore() - if (to.name == 'login') { - //当回到登录页时，清空pinia - store.$reset() - next() - return + const store = userStore(); + if (to.name === 'login') { + // 当导航到登录页时清空 Pinia 状态 + store.$reset(); + next(); + } else if (store.loginUser.userRole === "notLogin") { + // 如果未登录则重定向到登录页 + next({ name: 'login' }); + } else { + // 允许已登录用户导航 + next(); } - if (store.loginUser.userRole == "notLogin") { - router.back() - return - } - if (store.loginUser.userRole != "notLogin") { - next() - return - } -}) +}); export default router diff --git a/src/router/routes.ts b/src/router/routes.ts index 6757190..a49aabf 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -39,5 +39,10 @@ export const routes = [ component: ()=> import("../views/Commodity/TypeManagement.vue") } ] - } + }, + { + path: '/Test', + name:'test', + component: () => import("../views/test.vue") + }, ] diff --git a/src/views/Commodity/TypeManagement.vue b/src/views/Commodity/TypeManagement.vue index 9cb6d30..e4a39b1 100644 --- a/src/views/Commodity/TypeManagement.vue +++ b/src/views/Commodity/TypeManagement.vue @@ -1,143 +1,161 @@