From 6f3fa4438517d0685abd9a45a7d040404f6364a3 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Sun, 26 Jan 2025 16:56:32 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A3180=20=E3=80=90=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=B7=B2=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E3=80=81=E5=B7=B2=E9=80=80=E6=AC=BE=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E4=B8=AD=E7=89=A9=E6=B5=81=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E2=80=9C=E6=9A=82=E6=97=A0=E7=89=A9=E6=B5=81=E8=BD=A8=E8=BF=B9?=
 =?UTF-8?q?=E2=80=9D=EF=BC=8C=E5=AE=9E=E9=99=85=E5=AD=98=E5=9C=A8=E7=89=A9?=
 =?UTF-8?q?=E6=B5=81=E8=BD=A8=E8=BF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/OrderDetails/index.vue | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue
index 3a74584..5a16356 100644
--- a/pages/order/OrderDetails/index.vue
+++ b/pages/order/OrderDetails/index.vue
@@ -29,7 +29,7 @@
       </view>
     </view>
     <!-- <view class="reject-reason" v-if="orderInfo._status._type==-3 && orderInfo.refundRejectReason">驳回原因：{{ orderInfo.refundRejectReason }}</view> -->
-    <view v-if="orderInfo._status._type == -2 || orderInfo._status._type == 4 || orderInfo._status._type == 3 || (orderInfo._status._type == 2 && orderInfo.isTickets!==1)">
+    <view v-if="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>
           <text class="v12-secondary-dark-text v12-font-28">{{ delivery.deliveryName }}：{{ delivery.deliveryId }}</text>
@@ -42,14 +42,14 @@
             <view class="v12-align-center v12-mr-2">
               <image class="logo" :src="webUrl+'/orderIcon/car.png'" mode="" style="margin-right:0; width: 32rpx; height:32rpx"/>
             </view>
-            <view class="v12-font-28 v12-secondary-dark-text">{{ logistics.Traces && logistics.Traces.length > 0 ? logistics.Traces[logistics.Traces.length - 1].acceptStation : '暂无轨迹信息'}}</view>
+            <view class="v12-font-28 v12-secondary-dark-text">{{ logistics[index] && logistics[index].Traces && logistics[index].Traces.length > 0 ? logistics[index] && logistics[index].Traces[logistics[index].Traces.length - 1].acceptStation : '暂无轨迹信息'}}</view>
           </view>
           <view>
             <uni-icons type="right" size="20" color="#707070"></uni-icons>
           </view>
         </view>
         <view class="v12-mt-2">
-          <text class="v12-dark-text v12-font-24">{{ logistics.Traces && logistics.Traces.length > 0 ? logistics.Traces[logistics.Traces.length - 1].acceptTime : '' }}</text>
+          <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>
       </view>
       <view class="v12-justify-center v12-mt-3" v-if="orderInfo.deliveryInfo.length > 2">
@@ -553,17 +553,17 @@ export default {
       this.showMore = false
       // this.$forceUpdate()
     },
-    getExpressInfo() {
+    getExpressInfo(delivery, i) {
       let params = {
         orderCode: this.orderInfo.id,
-        shipperCode: this.orderInfo.deliverySn,
-        logisticCode: this.orderInfo.deliveryId
+        shipperCode: delivery.deliverySn,
+        logisticCode: delivery.deliveryId
       };
       express(params)
         .then(res => {
           const {success, data} = res
           if(success) {
-            this.logistics = data || {}
+            this.logistics[i] = data || {}
           }
           
         })
@@ -913,8 +913,11 @@ export default {
             this.system_store = res.data.systemStore || {};
             this.mapKey = res.data.mapKay;
             this.setOfflinePayStatus(this.orderInfo.offlinePayStatus);
-            if(this.orderInfo._status._type == 3 || (this.orderInfo._status._type == 2 && this.orderInfo.isTickets!==1)) {
-              this.getExpressInfo()
+            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++) {
+                this.getExpressInfo(orderInfo.deliveryInfo[i], i)
+              }
             }
           })
           .catch(err => {