From 2dfc8dc4bcd3d3cd4aed1b6054e073e140eba9c8 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 19 May 2025 16:05:50 +0800
Subject: [PATCH] Merge branch 'master' into jiangwu
---
src/router/index.js | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index edef259..2649e49 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,32 +1,32 @@
-import { createRouter, createWebHistory } from 'vue-router';
-import PageRouter from './page/';
-import ViewsRouter from './views/';
-import AvueRouter from './avue-router';
-import i18n from '@/lang';
-import Store from '@/store/';
+import { createRouter, createWebHistory, createWebHashHistory } from 'vue-router'
+import PageRouter from './page/'
+import ViewsRouter from './views/'
+import AvueRouter from './avue-router'
+import i18n from '@/lang'
+import Store from '@/store/'
//创建路由
const Router = createRouter({
base: import.meta.env.VITE_APP_BASE,
- history: createWebHistory(import.meta.env.VITE_APP_BASE),
+ history: createWebHashHistory(import.meta.env.VITE_APP_BASE),
routes: [...PageRouter, ...ViewsRouter],
-});
+})
AvueRouter.install({
store: Store,
router: Router,
i18n: i18n,
-});
+})
-Router.$avueRouter.formatRoutes(Store.getters.menuAll, true);
+Router.$avueRouter.formatRoutes(Store.getters.menuAll, true)
-export function resetRouter() {
+export function resetRouter () {
// 重置路由 比如用于身份验证失败，需要重新登录时 先清空当前的路有权限
- const newRouter = createRouter();
- Router.matcher = newRouter.matcher; // reset router
+ const newRouter = createRouter()
+ Router.matcher = newRouter.matcher // reset router
AvueRouter.install(Vue, {
router: Router,
store: Store,
i18n: i18n,
- });
+ })
}
-export default Router;
+export default Router
--
Gitblit v1.9.3