Authored by 周少峰

Merge branch 'release/4.9.1.0'

No preview for this file type
This diff could not be displayed because it is too large.

1 KB | W: | H:

2.04 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
... ... @@ -95,14 +95,18 @@
.good-detail-text {
.name a {
display: block;
display: -webkit-box;
overflow: hidden;
word-break: break-all;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
margin: 15px 0 10px;
min-height: 50px;
color: #444;
font-size: 22px;
line-height: 30px;
height: 60px;
padding: 5px 0; /* 商品标题限制行数的bug修复 增加元素的clientHeight */
height: 55px;
padding: 5px 0; /* 商品标题限制行数的bug修复 增加元素的clientHeight */
}
.price {
line-height: 22px;
... ... @@ -122,15 +126,23 @@
display: inline-block;
text-align: center;
background: resolve('product/price-tag.png') no-repeat center;
background-size: cover;
background-size: contain;
color: #fff;
font-size: 18px;
width: 77px;
height: 26px;
line-height: 26px;
width: 70px;
height: 24px;
position: relative;
top: 2px;
}
}
.student-price {
.sale-price.no-price {
color: #d62927;
}
.sale-price {
display: inline-block;
height: 24px;
line-height: 24px;
}
.market-price {
margin: 0px;
display: block;
... ...
... ... @@ -35,7 +35,7 @@
<div class="price {{#if students}}student-price{{/if}}">
{{#if students}}
<span class="sale-price {{^price}}no-price{{/price}}"{{studentPrice}}</span>
<span class="students-price-tag">学生价</span>
<span class="students-price-tag"></span>
{{#salePrice}}
<span class="market-price"{{.}}</span>
{{/salePrice}}
... ...