From 2640b049b5696056607fafa558718143da41ba85 Mon Sep 17 00:00:00 2001
From: LinCyJang <linxi957440651@163.com>
Date: Mon, 28 Jul 2025 01:48:44 +0800
Subject: [PATCH] =?UTF-8?q?Feat=EF=BC=9A=E9=A2=84=E8=AE=A1=E5=88=B0?=
 =?UTF-8?q?=E8=BE=BE=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/order.js                       | 11 +++++++++-
 pages/order/OrderDetails/index.vue | 34 ++++++++++++++++++++++++++++--
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/api/order.js b/api/order.js
index 210abfe..78b6103 100644
--- a/api/order.js
+++ b/api/order.js
@@ -186,4 +186,13 @@ export function aginConfirm(params) {
  */
 export function editAddress(params) {
     return request.post('/order/editAddress', params)
-}
\ No newline at end of file
+}
+
+/**
+ * 订单预计到达时间
+ * @param {*} params 
+ * @returns 
+ */
+export function orderExpectedArrivalTime(params) {
+    return request.post('/order/express/estimatedTime', params)
+}
diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue
index 62e6294..6838554 100644
--- a/pages/order/OrderDetails/index.vue
+++ b/pages/order/OrderDetails/index.vue
@@ -31,11 +31,19 @@
     <!-- <view class="reject-reason" v-if="orderInfo._status._type==-3 && orderInfo.refundRejectReason">驳回原因：{{ orderInfo.refundRejectReason }}</view> -->
     <view v-if="orderInfo.deliveryId !== null && (orderInfo._status._type == -1 || orderInfo._status._type == -2 || orderInfo._status._type == 4 || orderInfo._status._type == 3 || (orderInfo._status._type == 2 && orderInfo.isTickets!==1))">
       <view v-if="index < 2 || showMoreDeliver" v-for="(delivery, index) in orderInfo.deliveryInfo" :key="index" class="v12-radius-20 v12-white v12-pa-3 v12-mt-4">
-        <view>
+        <view class="v12-align-center">
           <text class="v12-secondary-dark-text v12-font-28">{{ delivery.deliveryName }}：{{ delivery.deliveryId }}</text>
           <text class="v12-font-22 v12-px-2 v12-py-1 v12-ml-1 v12-primary-text v12-primary-border v12-radius-40" @click="copyClipboard(delivery.deliveryId)">
             复制
           </text>
+          <view 
+            class="v12-font-26 time-box" 
+            :style="{
+              color: '#297EE0;',
+            }">
+            <image :src="webUrl+'/orderIcon/787.png'" class="time-bg"></image>
+            {{ getDay(orderInfo.orderId, delivery) || '' }} {{ delivery.estimatedTime || '' }}
+          </view>
         </view>
         <view class="v12-mt-2 v12-justify-between" @click="goLogistics(orderInfo, index)">
           <view class="v12-align-center">
@@ -483,7 +491,7 @@
 <script>
 import passkeyborad from '@/components/yzc-paykeyboard/yzc-paykeyboard'
 import OrderGoods from "@/components/OrderGoods";
-import {orderDetail, orderDelay, aginConfirm, express, editAddress} from "@/api/order";
+import {orderDetail, orderDelay, aginConfirm, express, editAddress, orderExpectedArrivalTime} from "@/api/order";
 import Payment from "@/components/Payment";
 import DataFormat from "@/components/DataFormat";
 import {copyClipboard} from "@/utils";
@@ -600,6 +608,19 @@ export default {
   },
   methods: {
     copyClipboard,
+    getDay(id, delivery) {
+      const params = {
+        orderId: id,
+        deliveryId: delivery.deliveryId,
+        deliverySn: delivery.deliverySn
+      }
+      orderExpectedArrivalTime(params).then(res => {
+        if(res.success) {
+          // this.orderInfo.expectedArrivalTime = res.data
+          delivery.estimatedTime = res.data.deliveryTime || ''
+        }
+      })
+    },
     goGoodsCon(item) {
       this.$yrouter.push({
         path: '/pages/shop/GoodsCon/index',
@@ -1249,4 +1270,13 @@ export default {
   margin-top: 30rpx;
   padding: 30rpx;
 }
+.time-bg{
+  position: absolute;
+  height: 38rpx;
+  width: 100%;
+}
+.time-box{
+  position: relative;
+  margin-left: 10rpx;
+}
 </style>