From 81b833a5c49d7e13b12a022d9ee4c8eca9f603a4 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期二, 10 九月 2024 18:18:22 +0800
Subject: [PATCH] 1.收货地址新增手机号码校验

---
 sub_pages/customer/trade/detail.vue |   28 ++++++++++++++++++++++------
 1 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/sub_pages/customer/trade/detail.vue b/sub_pages/customer/trade/detail.vue
index ded7a1f..5dbc3e5 100644
--- a/sub_pages/customer/trade/detail.vue
+++ b/sub_pages/customer/trade/detail.vue
@@ -67,15 +67,31 @@
 				</view>
 			</view>
 			<view class="desc m-t-12">
-				<view class="m-r-15">已售:{{ dto.sales || 0 }}</view>
+				<view class="m-r-15">已售:{{ ((dto.sales||0) +(dto.realSales||0)) || 0 }}</view>
 				<view class="m-r-15">剩余:{{ dto.stock || 0 }}</view>
 				<view class=" ">{{ dto.unit || '-' }}</view>
 			</view>
-			<view class="flex m-t-12">
-				<view class="price m-r-a">
-					<span class="num">{{ dto.price || '-' }}</span>
-					元/扎
-				</view>
+			<view class="flex m-t-12">
+				<!-- #ifdef PUB_CUSTOMER_DEV -->
+				<view>
+					<view class="price m-r-a component-price-new">
+						<span class="num">{{ dto.priceMember || dto.price || '-' }}</span>
+						元/扎<span class="tip">会员价</span>
+					</view>
+					<view class="price m-r-a component-price-old">
+						<span class="num">{{ dto.price || '-' }}</span>
+						元/扎
+					</view>
+				</view>
+				<!-- #endif -->
+				<!-- #ifndef PUB_CUSTOMER_DEV -->
+				<view class="price m-r-a">
+					<span class="num">{{ dto.price || '-' }}</span>
+					元/扎
+				</view>
+				<!-- #endif -->
+				
+				
 				<view class="m-l-a m-r-15">
 					<button open-type="contact" class="component-button-contact">
 						<image src="../../../static/common/icon-kf.png" class="icon-kf m-l-15 img100"></image>

--
Gitblit v1.9.3