Commit 8e22098a authored by youjie's avatar youjie

no message

parent b6e6f18f
......@@ -28,43 +28,43 @@ const collapsed = ref(false)
const activeMenu = computed(() => {
const path = route.path
const menu = menuList.value.find(item => path.startsWith(item.path))
return menu?.key || 'accommodation'
return menu?.key || ''
})
const menuList = ref([
{
key: 'accommodation',
path: '/accommodation',
// path: '/',
label: t('menu.accommodation'),
icon: ''
},
{
key: 'transportation',
path: '/transportation',
// path: '/',
label: t('menu.transportation'),
icon: ''
},
{
key: 'tripExperience',
path: '/tripExperience',
// path: '/',
label: t('menu.tripExperience'),
icon: ''
},
{
key: 'sightseeingTicket',
path: '/sightseeingTicket',
// path: '/',
label: t('menu.sightseeingTicket'),
icon: ''
},
{
key: 'travelService',
path: '/travelService',
// path: '/',
label: t('menu.travelService'),
icon: ''
},
{
key: 'food',
path: '/food',
// path: '/',
label: t('menu.food'),
icon: ''
}
......
......@@ -11,7 +11,7 @@
<a-divider v-if="index" direction="vertical" class="h-[17px] app-menu-divider"/>
<div class="app-menu flex items-center text-nowrap px-[9px] py-[7px]
rounded-[6px] cursor-pointer fx-sm"
:class="{'active': item.key === activeMenu}">
:class="{'active': activeMenu&&item.key === activeMenu}">
{{ t(item.label) }}
</div>
</template>
......
......@@ -24,10 +24,10 @@ export const createPermissionGuard = (
}
// 检查用户是否登录
if (!userStore.getUserToken) {
next('/login')
return
}
// if (!userStore.getUserToken) {
// next('/login')
// return
// }
next()
}
......@@ -15,41 +15,41 @@ const router = createRouter({
component: () => import ('../views/home/index.vue')
},
{
path: '/personalCenter',
path: '',
meta: { title: "page.profile" },
component: () => import ('../views/personalCenter/index.vue'),
children: [{
path: '/personalCenter/myOrder',
path: '/myOrder',//我的订单
meta: { title: "page.myOrder" },
component: () => import ('../views/personalCenter/myOrder.vue')
},
{
path: '/personalCenter/systemMessage',
path: '/systemMessage',//系统消息
meta: { title: "page.systemMessage" },
component: () => import ('../views/personalCenter/systemMessage.vue')
},
{
path: '/personalCenter/myCollection',
path: '/myCollection',//我的收藏
meta: { title: "page.myCollection" },
component: () => import ('../views/personalCenter/myCollection.vue')
},
{
path: '/personalCenter/coupon',
path: '/myCoupon',//我的优惠券
meta: { title: "page.coupon" },
component: () => import ('../views/personalCenter/coupon.vue')
component: () => import ('../views/personalCenter/myCoupon.vue')
},
{
path: '/personalCenter/accountCenter',
path: '/accountCenter',//账号中心
meta: { title: "page.accountCenter" },
component: () => import ('../views/personalCenter/accountCenter.vue')
},
{
path: '/personalCenter/commonPassengerInfo',
path: '/commonPassengerInfo',//常用旅客信息
meta: { title: "page.commonPassengerInfo" },
component: () => import ('../views/personalCenter/commonPassengerInfo.vue')
},
{
path: '/personalCenter/distributionCenter',
path: '/distributionCenter',//分销中心
meta: { title: "page.distributionCenter" },
component: () => import ('../views/personalCenter/distributionCenter.vue')
},
......
......@@ -34,38 +34,38 @@ const activeMenu = computed(() => {
const menuList = ref([
{
name: t('personal.menu.myOrder'),
path: '/personalCenter/myOrder',
path: '/myOrder',
key: 'myOrder',
},
{
name: t('personal.menu.systemMessage'),
path: '/personalCenter/systemMessage',
path: '/systemMessage',
key: 'systemMessage',
},
{
name: t('personal.menu.myCollection'),
path: '/personalCenter/myCollection',
path: '/myCollection',
key: 'myCollection',
},
{
name: t('personal.menu.coupon'),
path: '/personalCenter/coupon',
key: 'coupon',
path: '/myCoupon',
key: 'myCoupon',
count: 2,
},
{
name: t('personal.menu.accountCenter'),
path: '/personalCenter/accountCenter',
path: '/accountCenter',
key: 'accountCenter',
},
{
name: t('personal.menu.commonPassengerInfo'),
path: '/personalCenter/commonPassengerInfo',
path: '/commonPassengerInfo',
key: 'commonPassengerInfo',
},
{
name: t('personal.menu.distributionCenter'),
path: '/personalCenter/distributionCenter',
path: '/distributionCenter',
key: 'distributionCenter',
},
])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment