From 3fd8a13fa5cd843f6a116653711526d580f98330 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期一, 08 九月 2025 15:32:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_fix_sub' into dev_fix_sub
---
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 29e10f4..ba55edb 100644
--- a/pages/order/orderDetail.vue
+++ b/pages/order/orderDetail.vue
@@ -141,9 +141,9 @@
<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>
@@ -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