diff --git a/pages.json b/pages.json index 74ed57a..9b83189 100644 --- a/pages.json +++ b/pages.json @@ -260,16 +260,6 @@ "auth": true, "title": "物流轨迹" } - }, - { - "path": "express/list", - "style": { - "navigationBarTitleText": "订单包裹" - }, - "meta": { - "auth": true, - "title": "订单包裹" - } } ] }, diff --git a/pages/order/detail.vue b/pages/order/detail.vue index 1a3828e..5299873 100644 --- a/pages/order/detail.vue +++ b/pages/order/detail.vue @@ -299,10 +299,10 @@ }); } - // 查看物流 TODO 芋艿:待测试 - async function onExpress(orderId) { - sheep.$router.go('/pages/order/express/list', { - orderId, + // 查看物流 + async function onExpress(id) { + sheep.$router.go('/pages/order/express/log', { + id, }); } @@ -376,7 +376,7 @@ merchant_trade_no: state.merchantTradeNo, }); } else { - res = await sheep.$api.order.detail(id); + res = await OrderApi.getOrder(id); } if (res.code === 0) { state.orderInfo = res.data; diff --git a/pages/order/express/list.vue b/pages/order/express/list.vue deleted file mode 100644 index 5e285a2..0000000 --- a/pages/order/express/list.vue +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - diff --git a/pages/order/express/log.vue b/pages/order/express/log.vue index 1dd8091..0292dbf 100644 --- a/pages/order/express/log.vue +++ b/pages/order/express/log.vue @@ -2,65 +2,46 @@