From e3c0ebbd9f9ee111f29be9f76979edd97f1d6f3a Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 11 九月 2024 10:32:33 +0800
Subject: [PATCH] Merge branch 'v2' of http://47.96.225.205:8888/r/hmy_farmer-main into remote-v2
---
sub_pages/customer/trade/list.vue | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/sub_pages/customer/trade/list.vue b/sub_pages/customer/trade/list.vue
index 6cd22bc..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}}
@@ -526,15 +538,15 @@
display: flex;
.tag {
- min-width: 60rpx;
+ // min-width: 60rpx;
padding-left: 10rpx;
padding-right: 10rpx;
line-height: 30rpx;
background: #FEE6E6;
border-radius: 10rpx;
- font-size: 22rpx;
+ font-size: 18rpx;
color: #CD1212;
- margin-right: 12rpx;
+ margin-right: 6rpx;
text-align: center;
}
--
Gitblit v1.9.3