From eabb18cf60273b25471509858b287474cea9b370 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 30 九月 2025 09:19:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into send_coupon
---
pages/order/orderDetail.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pages/order/orderDetail.vue b/pages/order/orderDetail.vue
index 5d5e5cc..adcf955 100644
--- a/pages/order/orderDetail.vue
+++ b/pages/order/orderDetail.vue
@@ -10,7 +10,7 @@
</div>
<!-- 鐗╂祦淇℃伅 -->
<view class="info-view logistics-view">
- <view class="logistics-List" v-if="logisticsList && logisticsList.traces && logisticsList.traces.length != 0 ">
+ <view class="logistics-List" v-if="logisticsList && logisticsList.traces && logisticsList.traces.length != 0 && !(orderPackage && orderPackage.length)">
<view class="logistics-List-title">
{{ logisticsList.traces[logisticsList.traces.length - 1].AcceptStation }}
</view>
@@ -408,9 +408,9 @@
},
// 鑾峰彇鐗╂祦淇℃伅
loadLogistics(sn) {
- // getExpress(sn).then((res) => {
- // this.logisticsList = res.data.result;
- // });
+ getExpress(sn).then((res) => {
+ this.logisticsList = res.data.result;
+ });
},
// 鍒嗕韩褰撳墠鎷煎洟淇℃伅
--
Gitblit v1.8.0