From 6d54fb64df667c0c396fc7d74aeed9e096d95f95 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 11 九月 2024 10:36:50 +0800
Subject: [PATCH] Merge branch 'v2' of ssh://47.96.225.205:29418/hmy_farmer-main into v2

---
 sub_pages/customer/trade/list.vue |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/sub_pages/customer/trade/list.vue b/sub_pages/customer/trade/list.vue
index 77f7c5b..0909deb 100644
--- a/sub_pages/customer/trade/list.vue
+++ b/sub_pages/customer/trade/list.vue
@@ -73,9 +73,21 @@
 					<view @click.stop="toDetail(item)">
 						<view class="title">
 							{{item.name||'-'}}
-							<view class="price">
-								¥{{item.price||0}}元/扎
-							</view>
+							
+							<!-- #ifdef PUB_CUSTOMER_DEV -->
+							<view class="price component-price-new">
+								<span class="tip">会员价</span>¥<span class="p">{{item.priceMember||item.price}}</span>/扎
+								<view class="component-price-old">
+									¥{{item.price}}/扎
+								</view>
+							</view>
+							<!-- #endif -->
+							<!-- #ifndef PUB_CUSTOMER_DEV -->
+							<view class="price">
+								¥{{item.price||0}}元/扎
+							</view>
+							<!-- #endif -->
+							
 						</view>
 						<view class="tags" v-if="item.tags">
 							<!-- 	<view class="tag red">限时抢购</view>
@@ -91,7 +103,7 @@
 						</view>
 						<view class="other-info flex">
 							<view class="m-r-15">
-								已售:{{item.sales||0}}
+								已售:{{ ((item.sales||0) +(item.realSales||0))   ||0}}
 							</view>
 							<view class="m-r-15">
 								剩余:{{item.stock||0}}

--
Gitblit v1.9.3