From 8a9ec7adc18a198a281f9d434b0f078f8f84ceac Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 10 九月 2024 15:00:39 +0800
Subject: [PATCH] Merge branch 'v2' of http://47.96.225.205:8888/r/hmy_farmer-main into remote-v2
---
sub_pages/customer/shop/shop.vue | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/sub_pages/customer/shop/shop.vue b/sub_pages/customer/shop/shop.vue
index e05d579..407070c 100644
--- a/sub_pages/customer/shop/shop.vue
+++ b/sub_pages/customer/shop/shop.vue
@@ -34,17 +34,17 @@
<view class="label">发布</view>
</view>
<view class="form-item">
- <view class="value">0</view>
+ <view class="value">*</view>
<view class="label">获赞</view>
</view>
<view class="form-item">
- <view class="value">0</view>
+ <view class="value">*</view>
<view class="label">粉丝</view>
</view>
- <view class="form-item">
+ <!-- <view class="form-item">
<view class="value">0</view>
<view class="label">关注</view>
- </view>
+ </view> -->
</view>
<view class="p10" style="padding-left: 20rpx;padding-right: 20rpx;">
<top-tabs :tabs="tabs" :flg="flg" @change="changeTab">
@@ -105,9 +105,20 @@
<view class="m-l-12 info-container flex1">
<view class="title" @click.stop="toDetail(item)">
{{item.name}}
+ <!-- #ifdef PUB_CUSTOMER_DEV -->
+ <view class="price component-price-new">
+ ￥{{item.priceMember||item.price}}/扎<span class="tip">会员价</span>
+ <view class="component-price-old">
+ ￥{{item.price}}/扎
+ </view>
+ </view>
+ <!-- #endif -->
+ <!-- #ifndef PUB_CUSTOMER_DEV -->
<view class="price">
￥{{item.price}}/扎
</view>
+ <!-- #endif -->
+
</view>
<view class="tags" v-if="item.tags||false" @click.stop="toDetail(item)">
<!-- <view class="tag red">限时抢购</view>
@@ -123,7 +134,7 @@
</view> -->
<view class="other-info flex" @click.stop="toDetail(item)">
<view class="m-r-15">
- 已售:{{item.sales || 0}}
+ 已售:{{ ((item.sales||0) +(item.realSales||0)) || 0}}
</view>
<view class="m-r-15">
剩余:{{item.stock || 0}}
@@ -573,15 +584,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