diff --git a/app.wxss b/app.wxss
index 6f4643d..736dc43 100644
--- a/app.wxss
+++ b/app.wxss
@@ -36,6 +36,13 @@ button {
white-space: nowrap;
text-overflow: ellipsis;
}
+.ellipsis-1x {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 1;
+}
.ellipsis-2 {
overflow: hidden;
text-overflow: ellipsis;
diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxml b/components/diy_goodsGroup/diy_goodsGroup.wxml
index ce71705..d197091 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.wxml
+++ b/components/diy_goodsGroup/diy_goodsGroup.wxml
@@ -130,7 +130,7 @@
销量：{{item.sales_sum}}件
-
+
@@ -264,6 +264,7 @@
销量：{{item.sales_sum}}件
+
@@ -400,6 +401,7 @@
销量：{{item.sales_sum}}件
+
diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxss b/components/diy_goodsGroup/diy_goodsGroup.wxss
index aeb3a85..a781e45 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.wxss
+++ b/components/diy_goodsGroup/diy_goodsGroup.wxss
@@ -37,7 +37,7 @@
.zs_center {
width: 100%;
- min-height: 200rpx;
+ /* min-height: 200rpx; */
font-size: 28rpx;
color: #333;
text-align: left;
@@ -294,7 +294,6 @@
.zs_center_2l {
width: 100%;
- min-height: 200rpx;
font-size: 28rpx;
color: #333;
text-align: left;
diff --git a/components/goods_list/goods_list.wxml b/components/goods_list/goods_list.wxml
index eb5ed88..85c9718 100644
--- a/components/goods_list/goods_list.wxml
+++ b/components/goods_list/goods_list.wxml
@@ -40,9 +40,9 @@
￥
{{filter.toFix(item[card_field],2)}}
-
+
- {{card_name}}
+ {{card_name}}
@@ -86,14 +86,16 @@
{{item.market_price}}
-
+
-
- ￥
- {{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}
-
- {{g_filter.get_card_price(item,card_list,1)}}
-
+
+ ￥
+ {{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}
+
+
+ {{g_filter.get_card_price(item,card_list,1)}}
+
+
diff --git a/components/goods_list/goods_list.wxss b/components/goods_list/goods_list.wxss
index 0c7f8dc..31d0361 100644
--- a/components/goods_list/goods_list.wxss
+++ b/components/goods_list/goods_list.wxss
@@ -3,6 +3,10 @@
margin-bottom: 40rpx;
}
+.ai-center{
+ align-items: center;
+}
+
.ib {
display: inline-block;
}
@@ -37,6 +41,20 @@
align-items: center;
}
+.ellipsis-1 {
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+}
+
+/* .ellipsis-1x {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 1;
+} */
+
.xc-wc {
color: #d60021;
}
@@ -167,29 +185,34 @@
}
.card_bg {
- display: flex;
+ box-sizing: border-box;
padding: 2rpx 10rpx;
- height: 25rpx;
- align-items: center;
+ height: 28rpx;
border-radius: 26rpx;
- font-size: 19rpx;
- line-height: 25rpx;
- max-width: 110rpx;
+ font-size: 18rpx;
+ line-height: 28rpx;
+ max-width: 210rpx;
background: #333;
color: #fff;
- justify-content: center;
margin-left: 8rpx;
}
.card_bg image {
width: 19rpx;
height: 19rpx;
- margin-right: 1rpx;
+ margin-right: 8rpx;
}
-.card_bg .card_name {
+/* .card_bg .card_name {
max-width: 76rpx;
width: auto;
overflow: hidden;
white-space: nowrap;
+} */
+
+.card_name {
+ position: relative;
+ top: -4rpx;
}
+
+
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index b413b8f..03ec227 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -3336,10 +3336,15 @@ Page({
context.lineTo(520 * unit, 710 * unit)
context.stroke();
//---文字---
- context.setFontSize(22 * unit)
context.setFillStyle("black")
- context.fillText("优惠乐翻天，精彩就在你身边", 40 * unit, 776 * unit);
- context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 826 * unit);
+ context.setFontSize(22 * unit)
+ // 原来start --->
+ context.fillText("优惠乐翻天，精彩就在你身边", 40 * unit, 776 * unit);
+ context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 826 * unit);
+ // <--- 原来end
+ // context.fillText("优惠乐翻天，精彩就在你身边", 40 * unit, 816 * unit);
+ // context.setFontSize(18 * unit)
+ // context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 850 * unit);
//---二维吗图---
context.drawImage(vpath, 380 * unit, 736 * unit, 120 * unit, 120 * unit);
break;
@@ -3353,7 +3358,7 @@ Page({
//画秒杀的图片
var miaos_path = '../../../images/share/miao_share.png';
context.drawImage(miaos_path, 43 * unit, 700 * unit, 222 * unit, 40 * unit);
-
+
//---文字---
context.setFontSize(22 * unit)
context.setFillStyle("black")
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index fcd8e8e..6485a4b 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -282,7 +282,7 @@
-
+
{{g_filters.get_card_price(data,card_list,1)}}
@@ -302,7 +302,7 @@
-
+
{{card_name}}
diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss
index 65c49f1..126e092 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxss
+++ b/pages/goods/goodsInfo/goodsInfo.wxss
@@ -2547,8 +2547,9 @@ border-radius: 55rpx;
}
.grade-card-frame .card-name{
- margin-left: 5rpx;
- max-width: 120rpx;
+ margin-left: 8rpx;
+ /* max-width: 120rpx; */
+ max-width: 165rpx;
}
.card-effect{
margin-left: 15rpx;
diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml
index 36b4f38..fdf5099 100644
--- a/pages/goods/goodsList/goodsList.wxml
+++ b/pages/goods/goodsList/goodsList.wxml
@@ -67,11 +67,11 @@
-
+
￥{{item[card_field]}}
-
+
- {{card_name}}
+ {{card_name}}