diff --git a/src/pages/Index/Index.vue b/src/pages/Index/Index.vue index 79cca6d..7063a0c 100644 --- a/src/pages/Index/Index.vue +++ b/src/pages/Index/Index.vue @@ -32,21 +32,21 @@ 常规 历史 设置 @@ -400,6 +400,12 @@ import CloseSvg from '@/assets/close-device.svg' import LogoutSvg from '@/assets/user-logout.svg' import CancelSvg from '@/assets/user-cancel.svg' +const router = useRouter() +// 获取当前的路由 +const currentRoute = computed(() => router.currentRoute.value) +console.log(currentRoute.value) + + const selectedTab = ref(sessionStorage.getItem('selectedTab') || '常规') const lineWidth = ref(0) const lineLeft = ref(0) @@ -548,7 +554,7 @@ const handleAppEvent = (data: AppEventMessage['data']) => { } //注销用户 -const router = useRouter() + const onLogout = () => { logout().then((res) => { if(res.success){ @@ -1316,5 +1322,5 @@ watch( width: 11rem; padding-top: 5px; } - + diff --git a/src/pages/Index/components/Consumables/TabBar.vue b/src/pages/Index/components/Consumables/TabBar.vue index 1432d03..6462917 100644 --- a/src/pages/Index/components/Consumables/TabBar.vue +++ b/src/pages/Index/components/Consumables/TabBar.vue @@ -1,34 +1,23 @@ diff --git a/src/router/router.ts b/src/router/router.ts index 9cb9a7c..0c2dc85 100644 --- a/src/router/router.ts +++ b/src/router/router.ts @@ -1,4 +1,4 @@ -import { createRouter, createWebHistory } from 'vue-router' +import { createRouter, createWebHashHistory } from 'vue-router' const routes = [ { @@ -15,6 +15,8 @@ const routes = [ }, { path: 'regular', //常规 + name: 'regular', + redirect: '/index/regular', component: () => import('@/pages/Index/Regular.vue'), children: [ { @@ -37,10 +39,12 @@ const routes = [ }, { path: 'history', + name: 'history', component: () => import('@/pages/Index/History.vue'), }, { path: 'setting', + name: 'setting', component: () => import('@/pages/Index/Setting.vue'), meta: { requiresAuth: true, requiresAdmin: true }, // 需要登录和 Admin 权限 children: [ @@ -88,7 +92,7 @@ const routes = [ }, ] const router = createRouter({ - history: createWebHistory(), + history: createWebHashHistory(), routes, })