From ba3d748f9eb65a66fca9bd74fc7796b90a0a70ae Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期五, 30 六月 2023 09:06:15 +0800
Subject: [PATCH] Merge branch 'release/v1.1.3发布'
---
uniapp/components/rowGoods.vue | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/uniapp/components/rowGoods.vue b/uniapp/components/rowGoods.vue
index 50df6c0..d2dde21 100644
--- a/uniapp/components/rowGoods.vue
+++ b/uniapp/components/rowGoods.vue
@@ -17,12 +17,12 @@
<view class="cardbottom-container colCenEnd">
<view class="discounts-container rowCen borderBox">
- <view class="coupon-box rowCenCen" v-if="items.couponPrice>0 || items.sourceType=='wph'">
+ <view class="coupon-box rowCenCen" style="border: 1px solid #f50d49;width:auto;color: #f50d49; background: none;" v-if="items.couponPrice>0 || items.sourceType=='wph'">
<view>
{{items.sourceType=='wph'?items.discount+'鎶�':items.couponPrice+'鍏冨埜'}}
</view>
</view>
- <view class="back-box rowCenCen" v-if="items.fanli">
+ <view class="back-box rowCenCen" style="background: #f50d49;" v-if="items.fanli">
<view>
杩攞{items.fanli}}鍏�
</view>
@@ -36,7 +36,9 @@
<view class="saleNum-content" v-if="items.monthSales!=''">
宸插敭{{items.monthSales}}
</view>
-
+ <view class="saleNum-content" v-if="items.shopName!=''">
+ {{items.shopName}}
+ </view>
<view class="shopEnter-bar rowCen">
<!-- <view class="storename">
{{items.shopName}}
@@ -87,21 +89,27 @@
.goodsnameinfo-content {
width: 100%;
-
+ position: relative;
.typeIcon-content {
width: 60rpx;
height: 24rpx;
- margin-right: 5rpx;
+ position: absolute;
+ top: 7rpx;
}
.tradename {
flex: 1;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
font-size: 28rpx;
font-weight: 500;
+ text-indent: 2.5em;
color: #333333;
+ text-overflow: -o-ellipsis-lastline;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-line-clamp: 2;
+ line-clamp: 2;
+ -webkit-box-orient: vertical;
}
}
--
Gitblit v1.9.3