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 @@
-
-
-
-
-
-
-
-
-
-
- {{ item.logs[0]?.content }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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 @@
+
-
+
-
+
-
-
- 物流状态:
- {{ state.info.status_text }}
-
- 快递单号:{{ state.info.express_no }}
- 快递公司:{{ state.info.express_name }}
+
+
+
+
+
+ 快递单号:{{ state.info.logisticsNo }}
+ 快递公司:{{ state.info.logisticsName }}
+
+
-
-
-
+
+
- {{ item.status_text }}
+
+
+
+
{{ item.content }}
- {{ item.change_date }}
+
+ {{ sheep.$helper.timeFormat(item.time, 'yyyy-mm-dd hh:MM:ss') }}
+
@@ -72,31 +53,38 @@
import sheep from '@/sheep';
import { onLoad } from '@dcloudio/uni-app';
import { computed, reactive } from 'vue';
+ import OrderApi from '@/sheep/api/trade/order';
const state = reactive({
info: [],
- current: 0,
+ tracks: [],
});
+
const goodsImages = computed(() => {
let array = [];
if (state.info.items) {
state.info.items.forEach((item) => {
array.push({
- image: item.goods_image,
+ image: item.picUrl,
});
});
}
return array;
});
- function change(e) {
- state.current = e.detail.current;
+
+ async function getExpressDetail(id) {
+ const { data } = await OrderApi.getOrderExpressTrackList(id);
+ state.tracks = data.reverse();
}
- async function getExpressdetail(id, orderId) {
- const { data } = await sheep.$api.order.express(id, orderId);
+
+ async function getOrderDetail(id) {
+ const { data } = await OrderApi.getOrder(id)
state.info = data;
}
- onLoad((Option) => {
- getExpressdetail(Option.id, Option.orderId);
+
+ onLoad((options) => {
+ getExpressDetail(options.id);
+ getOrderDetail(options.id);
});
diff --git a/pages/order/list.vue b/pages/order/list.vue
index faf2bc8..4b47f94 100644
--- a/pages/order/list.vue
+++ b/pages/order/list.vue
@@ -228,10 +228,10 @@
}
// #endif
- // 查看物流 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,
});
}
diff --git a/sheep/api/trade/order.js b/sheep/api/trade/order.js
index f2a2b69..96e4b70 100644
--- a/sheep/api/trade/order.js
+++ b/sheep/api/trade/order.js
@@ -70,34 +70,16 @@ const OrderApi = {
},
});
},
- // 取消订单
- cancelOrder: (id) => {
+ // 获得交易订单的物流轨迹
+ getOrderExpressTrackList: (id) => {
return request2({
- url: `/app-api/trade/order/cancel`,
- method: 'DELETE',
+ url: `/app-api/trade/order/get-express-track-list`,
+ method: 'GET',
params: {
id,
},
});
- },
- // 删除订单
- deleteOrder: (id) => {
- return request2({
- url: `/app-api/trade/order/delete`,
- method: 'DELETE',
- params: {
- id,
- },
- });
- },
- // 创建单个评论
- createOrderItemComment: (data) => {
- return request2({
- url: `/app-api/trade/order/item/create-comment`,
- method: 'POST',
- data,
- });
- },
+ }
};
export default OrderApi;