From b38e93ebf640d02dc2fa1bc5980989863b9190b4 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Thu, 18 Sep 2025 09:41:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=87=91=E9=A2=9D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/online-shop/components/product-sku.vue | 7 +++++--
 src/pages/online-shop/goods-detail.vue           | 4 +---
 src/pages/order/detail.vue                       | 4 ++++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/pages/online-shop/components/product-sku.vue b/src/pages/online-shop/components/product-sku.vue
index d9a87e3..80706ce 100644
--- a/src/pages/online-shop/components/product-sku.vue
+++ b/src/pages/online-shop/components/product-sku.vue
@@ -22,10 +22,13 @@
 				/>
 				<view class="flex-1 overflow-hidden">
 					<view class="sub-text-32 truncate">{{ state.goodsDetail.productName }}</view>
-					<view class="second-text-32 c-red!">
-						<text> ¥{{ displayPrice(state.selectedSku.promotionPrice, "") || displayPrice(state.selectedSku.retailPrice, "") || 0 }} </text>
+					<view v-if="state.selectedSku.promotionPrice" class="second-text-32 c-red!">
+						<text> ¥{{ displayPrice(state.selectedSku.promotionPrice, "") || 0 }} </text>
 						<text class="m-l-20rpx second-text-28 line-through">¥{{ displayPrice(state.selectedSku.retailPrice, "") || 0 }}</text>
 					</view>
+					<view v-else class="flex items-end mt-1">
+						<text class="second-text-32 c-red!">¥{{ displayPrice(state.selectedSku.retailPrice, "") || 0 }}</text>
+					</view>
 					<view class="second-text-26">库存 {{ state.selectedSku.stock || 0 }}</view>
 					<view class="second-text-26">
 						已选择 {{ `${state.selectedSku.spec || "未选择"} / ${state.selectedSku.unit || "未选择"}，数量 ${state.goodsCount}` }}
diff --git a/src/pages/online-shop/goods-detail.vue b/src/pages/online-shop/goods-detail.vue
index c140a2f..bc8cb0b 100644
--- a/src/pages/online-shop/goods-detail.vue
+++ b/src/pages/online-shop/goods-detail.vue
@@ -90,9 +90,7 @@ const goCart = async () => {
 								<text>{{ item?.stock || 0 }}</text>
 							</view>
 							<view v-if="item.promotionPrice" class="flex items-end mt-1">
-								<text class="c-red! second-text-32 mr-2">
-									¥{{ displayPrice(item.promotionPrice, "") || displayPrice(item.retailPrice, "") || 0 }}
-								</text>
+								<text class="c-red! second-text-32 mr-2">¥{{ displayPrice(item.promotionPrice, "") || 0 }}</text>
 								<text class="line-through">¥{{ displayPrice(item.retailPrice, "") || 0 }}</text>
 							</view>
 							<view v-else class="flex items-end mt-1">
diff --git a/src/pages/order/detail.vue b/src/pages/order/detail.vue
index 77c5d52..7aefda3 100644
--- a/src/pages/order/detail.vue
+++ b/src/pages/order/detail.vue
@@ -96,6 +96,10 @@ const doCancelRefund = async () => {
 					<view>商户</view>
 					<view>{{ state.detail.merchantName }}</view>
 				</view>
+				<view class="info_cell">
+					<view>自提点</view>
+					<view>{{ state.detail.merchantName }}</view>
+				</view>
 				<view class="m-t-15rpx h-1px bg-#999 bg-opacity-5" />
 				<view class="info_cell">
 					<view>订单号</view>