From 3eaa632c71110cb4c83ada5d0e872c603506986f Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Wed, 20 Aug 2025 15:33:20 +0800
Subject: [PATCH] =?UTF-8?q?Fix(=E8=AE=A2=E5=8D=95):=E9=A2=84=E8=AE=A1?=
 =?UTF-8?q?=E9=80=81=E8=BE=BE=E6=97=B6=E9=97=B4=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/OrderDetails/index.vue | 60 ++++++++++++++++++------------
 1 file changed, 37 insertions(+), 23 deletions(-)

diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue
index 3749072..0263f48 100644
--- a/pages/order/OrderDetails/index.vue
+++ b/pages/order/OrderDetails/index.vue
@@ -30,20 +30,19 @@
     </view>
     <!-- <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
+        v-for="(delivery, index) in orderInfo.deliveryInfo"
+        :key="index"
+        :class="{
+          'order-deliver-item-show': index < 2 || showMoreDeliver
+        }"
+        class="v12-radius-20 v12-white v12-pa-3 v12-mt-4"
+      >
         <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>
-            {{ orderInfo._status._type === 2 ? 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">
@@ -56,8 +55,18 @@
             <uni-icons type="right" size="20" color="#707070"></uni-icons>
           </view>
         </view>
-        <view class="v12-mt-2">
+        <view class="v12-mt-2 time-wrap">
           <text class="v12-dark-text v12-font-24">{{ logistics[index] && logistics[index].Traces && logistics[index].Traces.length > 0 ? logistics[index] && logistics[index].Traces[logistics[index].Traces.length - 1].acceptTime : '' }}</text>
+          <view
+            v-if="delivery.estimatedTime"
+            :style="{
+              color: '#297EE0;',
+            }"
+            class="v12-font-26 time-box"
+          >
+            <image :src="webUrl+'/orderIcon/787.png'" class="time-bg"></image>
+            {{ delivery.estimatedTime }}
+          </view>
         </view>
       </view>
       <view class="v12-justify-center v12-mt-3" v-if="orderInfo.deliveryInfo.length > 2">
@@ -554,7 +563,7 @@ export default {
       pageKeyId: Object.freeze('userOrderInfo'),
       logistics: {},
       isGift: false,
-      loading: false
+      loading: true
     };
   },
   computed: {
@@ -620,16 +629,17 @@ export default {
         title: '您已催促成功，商家正在抓紧备货'
       })
     },
-    getDay(id, delivery) {
+    // 获取预计送达时间
+    getDay(delivery, index) {
       const params = {
-        orderId: id,
+        orderId: this.orderInfo.orderId,
         deliveryId: delivery.deliveryId,
         deliverySn: delivery.deliverySn
       }
       orderExpectedArrivalTime(params).then(res => {
         if(res.success) {
-          // this.orderInfo.expectedArrivalTime = res.data
-          delivery.estimatedTime = res.data.deliveryTime || ''
+          this.orderInfo.deliveryInfo[index].estimatedTime = res.data.deliveryTime || ''
+          this.$forceUpdate()
         }
       })
     },
@@ -734,14 +744,6 @@ export default {
         query: { id: cart.unique }
       });
     },
-    goOrderDetails(order) {
-      this.$yrouter.push({
-        path: "/pages/order/OrderDetails/index",
-        query: {
-          id: order.orderId
-        }
-      });
-    },
     goRoom(order) {
       const params = {
         goodsId: order.cartInfo[0].productId,
@@ -1021,7 +1023,11 @@ export default {
             const orderInfo = this.orderInfo
             if(orderInfo._status._type == -1 || orderInfo._status._type == -2 || orderInfo._status._type == 4 || orderInfo._status._type == 3 || (orderInfo._status._type == 2 && orderInfo.isTickets!==1)) {
               for(let i = 0; i < orderInfo.deliveryInfo.length; i++) {
+                orderInfo.deliveryInfo[i].estimatedTime = ''
                 this.getExpressInfo(orderInfo.deliveryInfo[i], i)
+                if (orderInfo._status._type === 2) {
+                  this.getDay(orderInfo.deliveryInfo[i], i)
+                }
               }
             }
           })
@@ -1299,4 +1305,12 @@ export default {
   position: relative;
   margin-left: 10rpx;
 }
+.order-deliver-item-show {
+  display: block;
+}
+.time-wrap {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
 </style>