fe / yohoblk-wap · Commits

Go to a project

Authored by ccbikai
Commit e3aa890132e75e5703a2e776ff85c67926dc3f5f 2 parents 6552930a 5b209508

Merge branch 'develop' of git.yoho.cn:fe/yohoblk-wap into develop

Inline Side-by-side
Showing 4 changed files with 8 additions and 7 deletions
... ... @@ -81,7 +81,6 @@
list-style: none;
border: none;
margin-left: 18px;
margin-top: 30px;
margin-bottom: 0;
padding: 0;
max-width: 600px;
... ... @@ -92,11 +91,13 @@
}
section {
margin-top: 30px;
h4 {
margin: 0;
float: left;
margin-top: 20px;
font-size: 25px;
line-height: 80px;
line-height: 88px;
display: inline-block;
}
... ...
... ... @@ -218,6 +218,7 @@
.filter-cate-label {
font-size: 36px;
font-weight: bold;
font-family: "BrownStd-Bold", "PingFang SC", Helvetica, Roboto, "Heiti SC", "\9ED1\4F53", Arial;
}
.filter-cate-val {
... ...
... ... @@ -15,7 +15,7 @@
<span class="title line-clamp-2">{{item.title}}</span>
<div class="fav-price">
<span class="new-price" v-if="item.discountPrice">{{item.discountPrice}}</span>
<!--<span class="{{ item.discountPrice ? 'price-underline' : ''}}">{{item.price}}</span>-->
<span class="{{ item.discountPrice ? 'price-underline' : ''}}">{{item.price}}</span>
</div>
<br/>
<div class="save-price">
... ...
... ... @@ -266,7 +266,6 @@
i.price {
color: #b0b0b0;
font-size: 32px;
font-weight: lighter;
font-style: normal;
&.strike-through {
... ... @@ -288,7 +287,7 @@
.control-button {
min-width: 100px;
border: none;
border-top: 1px solid #ccc;
border-top: 1px solid #eee;
width: 187.5px;
float: left;
display: block;
... ... @@ -299,7 +298,7 @@
}
.control-button:first-child {
border-right: 1px solid #ccc;
border-right: 1px solid #eee;
}
.button-solid {
... ...