diff --git a/mer_plat_admin/src/router/index.js b/mer_plat_admin/src/router/index.js index 8e7a888..59002bd 100644 --- a/mer_plat_admin/src/router/index.js +++ b/mer_plat_admin/src/router/index.js @@ -28,7 +28,7 @@ import operationRouter from './modules/operation'; import merchant from './modules/merchant'; import pagediy from '@/router/modules/pagediy'; import areaRouter from './modules/area'; -import merchantOrderRouter from './modules/merchantOrder'; +// merchantOrderRouter 已合并到 orderRouter 中,不再独立注册 /** * Note: sub-menu only appear when route children.length >= 1 * Detail see: https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html @@ -78,8 +78,6 @@ export const constantRoutes = [ pagediy, // 圈层管理 areaRouter, - // 商户订单管理(从商户端移植) - merchantOrderRouter, { path: '/404', component: () => import('@/views/error-page/404'), @@ -180,7 +178,7 @@ export const constantRoutes = [ ], }, { - path: '/merchantOrder/print/:orderNo', + path: '/order/merchantPrint/:orderNo', component: () => import('@/views/merchantOrder/orderPrint'), name: 'MerchantOrderPrint', hidden: true, diff --git a/mer_plat_admin/src/router/modules/order.js b/mer_plat_admin/src/router/modules/order.js index 984da52..7efb8ac 100644 --- a/mer_plat_admin/src/router/modules/order.js +++ b/mer_plat_admin/src/router/modules/order.js @@ -33,6 +33,38 @@ const orderRouter = { name: 'refund', meta: { title: '退款单' }, }, + { + path: 'merchantList', + component: () => import('@/views/merchantOrder/index'), + name: 'MerchantOrderIndex', + meta: { title: '商户订单' }, + }, + { + path: 'merchantRefund', + component: () => import('@/views/merchantOrder/refund/index'), + name: 'MerchantRefund', + meta: { title: '商户退款订单' }, + }, + { + path: 'merchantReservation', + component: () => import('@/views/merchantOrder/reservation/index'), + name: 'MerchantOrderReservation', + meta: { title: '商户预约', icon: '' }, + children: [ + { + path: 'service', + component: () => import('@/views/merchantOrder/reservation/service'), + name: 'MerchantService', + meta: { title: '商户预约看板', icon: '' }, + }, + { + path: 'workOrder', + component: () => import('@/views/merchantOrder/reservation/workOrder'), + name: 'MerchantWorkOrder', + meta: { title: '商户工单管理', icon: '' }, + }, + ], + }, ], }; diff --git a/mer_plat_admin/src/views/merchantOrder/index.vue b/mer_plat_admin/src/views/merchantOrder/index.vue index 76dd1f6..821f743 100644 --- a/mer_plat_admin/src/views/merchantOrder/index.vue +++ b/mer_plat_admin/src/views/merchantOrder/index.vue @@ -662,7 +662,7 @@ export default { // 订单打印(新窗口打开打印页) handleOrderPrint(row) { const routeData = this.$router.resolve({ - path: `/merchantOrder/print/${row.orderNo}`, + path: `/order/merchantPrint/${row.orderNo}`, }); window.open(routeData.href, '_blank'); },