From 4c85457a83afeebb0bb4977d0525222493d29de2 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 29 九月 2025 17:19:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_fix_sub' into dev_fix_sub
---
pages/order/orderDetail.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pages/order/orderDetail.vue b/pages/order/orderDetail.vue
index 29e10f4..a3f454b 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>
@@ -141,15 +141,15 @@
<view class="title">鏈嶅姟</view>
</view>
<view class="customer-list">
- <view class="customer-service"
+<!-- <view class="customer-service"
v-if="orderDetail.allowOperationVO && orderDetail.allowOperationVO.cancel == true"
- @click="onCancel(order.sn)">鍙栨秷璁㈠崟</view>
+ @click="onCancel(order.sn)">鍙栨秷璁㈠崟</view> -->
<view class="customer-service" v-if="order.orderStatus == 'DELIVERED'" @click="onLogistics(order)">鏌ョ湅鐗╂祦</view>
<view class="customer-service" v-if="order.orderStatus != 'UNPAID' && order.orderPromotionType == 'PINTUAN'"
@click="ByUserMessage(order)">鏌ョ湅鎷煎洟淇℃伅</view>
<view class="customer-service"
@click="contact(order.storeId)">鑱旂郴瀹㈡湇</view>
- <view class="customer-service" v-if="order.orderStatus==='COMPLETED'"
+ <view class="customer-service" v-if="order.orderStatus==='COMPLETED' && order.orderType !=='VIRTUAL'"
@click="buyBack"
>鍐嶆潵涓�鍗�</view>
</view>
@@ -263,11 +263,11 @@
</template>
<script>
-import '@/components/uview-components/uview-ui'
+import '@/pages/subComponents/uview-components/uview-ui'
import { getExpress, getPackage ,buyBack} from "@/api/trade.js";
import { cancelOrder, confirmReceipt, getOrderDetail } from "@/api/order.js";
-import shares from "@/pages/subComponents/m-share/index.vue"; //鍒嗕韩
+import shares from "@/pages/order/m-share/index.vue"; //鍒嗕韩
import { getClearReason } from "@/api/after-sale.js";
--
Gitblit v1.8.0