diff --git a/package1/order/orderDetail.vue b/package1/order/orderDetail.vue
index c9b4fb7..b4f5afb 100644
--- a/package1/order/orderDetail.vue
+++ b/package1/order/orderDetail.vue
@@ -94,9 +94,9 @@
- 
+
-
+
+
+
+ 订单号
+
+
+ {{orderDetail.numberCode}}
+
+
+
+
+ 下单时间
+
+
+ {{orderDetail.createTime | formatTime}}
+
+
配送员
@@ -249,30 +267,56 @@
未指定等待接单中
-
+
- 订单号
+ 配送员接单时间
- {{orderDetail.numberCode}}
+ {{orderDetail.deliveryInfo.acceptTime | formatTime}}
-
+
- 送达时间
+ 商家出餐时间
+
+
+ {{orderDetail.shopMakeTime ? orderDetail.shopMakeTime : '' | formatTime}}
+
+
+
+
+ 配送员到店时间
- 尽快送达
+ {{orderDetail.deliveryInfo.arriveTime ? orderDetail.deliveryInfo.arriveTime : '' | formatTime}}
-
+
- 下单时间
+ 配送员取货时间
- {{orderDetail.createTime}}
+ {{orderDetail.deliveryInfo.getTime ? orderDetail.deliveryInfo.getTime : '' | formatTime}}
+
+
+ 配送员送达时间
+
+
+ {{orderDetail.deliveryInfo.finishTime ? orderDetail.deliveryInfo.finishTime : '' | formatTime}}
+
+
+
+
+
+ 送达时间
+
+
+ {{orderDetail.deliveryInfo.finishTime ? orderDetail.deliveryInfo.finishTime : '尽快送达' | formatTime}}
+
+
+
@@ -330,6 +374,32 @@
// 拼接格式：日-日-时:分
return `${day}-${hour}:${minute}`;
+ },
+ formatTime(value) {
+ if (!value) return '';
+
+ const date = new Date(value);
+
+ // 获取年份
+ const year = date.getFullYear();
+
+ // 获取月份 (getMonth 返回 0-11，所以需要 +1)，并补齐0
+ const month = String(date.getMonth() + 1).padStart(2, '0');
+
+ // 获取日 (getDate)，并补齐0
+ const day = String(date.getDate()).padStart(2, '0');
+
+ // 获取小时 (getHours)，并补齐0
+ const hour = String(date.getHours()).padStart(2, '0');
+
+ // 获取分钟 (getMinutes)，并补齐0
+ const minute = String(date.getMinutes()).padStart(2, '0');
+
+ // 获取秒 (getSeconds)，并补齐0
+ const second = String(date.getSeconds()).padStart(2, '0');
+
+ // 拼接格式：年-月-日 时:分:秒
+ return `${year}-${month}-${day} ${hour}:${minute}:${second}`;
}
},
onLoad(option) {
@@ -375,6 +445,11 @@
this.getOrderDetail(item.id)
this.$forceUpdate();
},
+ returnProducts(item){
+ uni.navigateTo({
+ url: '/package1/order/returnOrder?order=' + encodeURIComponent(JSON.stringify(item))
+ });
+ },
getOrderDetail(id){
let that = this
that.tui.request("/mall/order/detail/"+id, "GET", {}, false, true).then((res) => {
diff --git a/package1/order/orderList.vue b/package1/order/orderList.vue
index affcbdb..f3923ac 100644
--- a/package1/order/orderList.vue
+++ b/package1/order/orderList.vue
@@ -78,6 +78,12 @@
已取消
+
+ 售后中
+
+ 已售后
@@ -175,9 +181,6 @@
取消订单
-
- 申请售后
-
去支付