7658-devToTest_2428 #508

Merged
alexm merged 392 commits from 7658-devToTest_2428 into test 2024-07-02 10:38:20 +00:00
1 changed files with 35 additions and 26 deletions
Showing only changes of commit 151978160b - Show all commits

View File

@ -11,7 +11,7 @@ export default {
component: RouterView,
redirect: { name: 'TicketMain' },
menus: {
main: ['TicketList', 'TicketAdvance', 'TicketFuture'],
main: ['TicketList', 'TicketAdvance', 'TicketWeekly', 'TicketFuture'],
card: [
'TicketBasicData',
'TicketBoxing',
@ -49,13 +49,13 @@ export default {
component: () => import('src/pages/Ticket/TicketCreate.vue'),
},
{
name: 'TicketAdvance',
path: 'advance',
name: 'TicketWeekly',
path: 'weekly',
meta: {
title: 'ticketAdvance',
icon: 'keyboard_double_arrow_left',
title: 'weeklyTickets',
icon: 'access_time',
},
component: () => import('src/pages/Ticket/TicketAdvance.vue'),
component: () => import('src/pages/Ticket/TicketWeekly.vue'),
},
{
name: 'TicketFuture',
@ -66,6 +66,15 @@ export default {
},
component: () => import('src/pages/Ticket/TicketFuture.vue'),
},
{
name: 'TicketAdvance',
path: 'advance',
meta: {
title: 'ticketAdvance',
icon: 'keyboard_double_arrow_left',
},
component: () => import('src/pages/Ticket/TicketAdvance.vue'),
},
],
},
{
@ -103,22 +112,14 @@ export default {
component: () => import('src/pages/Ticket/Card/TicketSale.vue'),
},
{
path: 'boxing',
name: 'TicketBoxing',
path: 'request',
name: 'TicketPurchaseRequest',
meta: {
title: 'boxing',
icon: 'vn:package',
title: 'purchaseRequest',
icon: 'vn:buyrequest',
},
component: () => import('src/pages/Ticket/Card/TicketBoxing.vue'),
},
{
path: 'sms',
name: 'TicketSms',
meta: {
title: 'sms',
icon: 'sms',
},
component: () => import('src/pages/Ticket/Card/TicketSms.vue'),
component: () =>
import('src/pages/Ticket/Card/TicketPurchaseRequest.vue'),
},
{
path: 'tracking',
@ -139,14 +140,22 @@ export default {
component: () => import('src/pages/Ticket/Card/TicketLog.vue'),
},
{
path: 'request',
name: 'TicketPurchaseRequest',
path: 'boxing',
name: 'TicketBoxing',
meta: {
title: 'purchaseRequest',
icon: 'vn:buyrequest',
title: 'boxing',
icon: 'vn:package',
},
component: () =>
import('src/pages/Ticket/Card/TicketPurchaseRequest.vue'),
component: () => import('src/pages/Ticket/Card/TicketBoxing.vue'),
},
{
path: 'sms',
name: 'TicketSms',
meta: {
title: 'sms',
icon: 'sms',
},
component: () => import('src/pages/Ticket/Card/TicketSms.vue'),
},
],
},