diff --git a/layouts/admin/router/adminComponentMap.uts b/layouts/admin/router/adminComponentMap.uts index 50849561..96504f7b 100644 --- a/layouts/admin/router/adminComponentMap.uts +++ b/layouts/admin/router/adminComponentMap.uts @@ -38,7 +38,7 @@ import ProductLabel from '@/pages/mall/admin/product/labels/index.uvue' import ProductProtection from '@/pages/mall/admin/product/protection/index.uvue' // --- 订单模块 --- -import OrderList from '@/pages/mall/admin/order/list.uvue' +import OrderList from '@/pages/mall/admin/order/order-management/index.uvue' import OrderStatistic from '@/pages/mall/admin/order/order-statistics/index.uvue' import OrderRefund from '@/pages/mall/admin/order/aftersales-order/index.uvue' import OrderCashier from '@/pages/mall/admin/order/cashier-order/index.uvue' diff --git a/layouts/admin/router/adminRoutes.uts b/layouts/admin/router/adminRoutes.uts index 0e928ae5..97a25328 100644 --- a/layouts/admin/router/adminRoutes.uts +++ b/layouts/admin/router/adminRoutes.uts @@ -79,7 +79,7 @@ export const topMenus: TopMenu[] = [ id: 'order', title: '订单', icon: 'order', - path: '/pages/mall/admin/order/list', + path: '/pages/mall/admin/order/order-management/index', order: 3, groups: [ { id: 'order-manage', title: '', order: 1 } @@ -400,7 +400,7 @@ export const routes: RouteRecord[] = [ { id: 'order_list', title: '订单管理', - path: '/pages/mall/admin/order/list', + path: '/pages/mall/admin/order/order-management/index', componentKey: 'OrderList', parentId: 'order', groupId: 'order-manage', diff --git a/pages.json b/pages.json index 18a5c762..f0297591 100644 --- a/pages.json +++ b/pages.json @@ -452,22 +452,15 @@ { "root": "pages/mall/admin", "pages": [ - { - "path": "order-management", - "style": { - "navigationBarTitleText": "订单管理", - "navigationStyle": "custom" - } - } ] }, { "root": "pages/mall/admin/order", "pages": [ { - "path": "list", + "path": "order-management/index", "style": { - "navigationBarTitleText": "订单列表", + "navigationBarTitleText": "订单管理", "navigationStyle": "custom" } }, diff --git a/pages/mall/admin/order-management.uvue b/pages/mall/admin/order-management.uvue deleted file mode 100644 index 42d41ee8..00000000 --- a/pages/mall/admin/order-management.uvue +++ /dev/null @@ -1,63 +0,0 @@ - - - - - diff --git a/pages/mall/admin/order/list.uvue b/pages/mall/admin/order/list.uvue deleted file mode 100644 index 291d6708..00000000 --- a/pages/mall/admin/order/list.uvue +++ /dev/null @@ -1,481 +0,0 @@ - - - - - diff --git a/pages/mall/admin/order/order-management/components/OrderDetailDrawer.uvue b/pages/mall/admin/order/order-management/components/OrderDetailDrawer.uvue new file mode 100644 index 00000000..ed57e73b --- /dev/null +++ b/pages/mall/admin/order/order-management/components/OrderDetailDrawer.uvue @@ -0,0 +1,414 @@ + + + + + diff --git a/pages/mall/admin/order/order-management/index.uvue b/pages/mall/admin/order/order-management/index.uvue index 84a1c86b..7636c507 100644 --- a/pages/mall/admin/order/order-management/index.uvue +++ b/pages/mall/admin/order/order-management/index.uvue @@ -1,25 +1,828 @@ +