fe / yohobuy-node · Commits

Go to a project

Authored by 郭成尧
Commit 2bde461ec1fc2628f0bba3eb6277586037bb6054 2 parents d5d4956d 78601c75

Merge branch 'release/4.6' of git.yoho.cn:fe/yohobuy-node into release/4.6

Inline Side-by-side
Showing 7 changed files with 29 additions and 28 deletions
... ... @@ -54,9 +54,9 @@
</span>
{{/ salesPrice}}
{{#vip}}<span class="vip-tag"> VIP </span><strong>更优惠</strong>{{/vip}}
{{#vip1}}<span class="vip-1"> </span><strong>{{vipPrice}}</strong>{{/vip1}}
{{#vip2}}<span class="vip-2"> </span><strong>{{vipPrice}}</strong>{{/vip2}}
{{#vip3}}<span class="vip-3"> </span><strong>{{vipPrice}}</strong>{{/vip3}}
{{#vip1}}<span class="vip-1"> </span>{{/vip1}}
{{#vip2}}<span class="vip-2"> </span>{{/vip2}}
{{#vip3}}<span class="vip-3"> </span>{{/vip3}}
</p>
</div>
</div>
... ...
{{# result}}
<div class="sale-page yoho-page center-content">
{{! 头部banner}}
{{#topBanner}}
{{> common/slide-banner}}
{{/topBanner}}
{{> common/slide-banner}}
{{> sale/activity-entry}}
{{> sale/brand-sale}}
... ...
<div class="new-sale-page product-page yoho-page sale-discount-page">
{{# saleList}}
{{#topBanner}}
{{> sale/sale-banner}}
{{/topBanner}}
{{> sale/sale-banner}}
<div class="center-content clearfix">
{{# pathNav}}
... ...
... ... @@ -9,10 +9,10 @@
<a class="item pull-left" href="{{link}}" target= "_blank">
<div class="pic">
<img src="{{image img 375 400}}">
<div class="time"><span class="iconfont">&#xe60a;</span>{{time}}</div>
<div class="time"><span class="time-span"><span class="iconfont">&#xe60a;</span>{{time}}</span></div>
</div>
<div class="detail">
<img class="brand pull-left" src="{{image brand 150 100}}">
<img class="brand pull-left" src="{{image brand 150 70}}">
<div class="text">
<div class="discount">
<span class="num">{{discount}}</span>
... ...
... ... @@ -51,9 +51,9 @@
¥{{salesPrice}}
</span>
{{#vip}}<span class="vip-tag"> VIP </span><strong>更优惠</strong>{{/vip}}
{{#vip1}}<span class="vip-1"> </span><strong>{{vipPrice}}</strong>{{/vip1}}
{{#vip2}}<span class="vip-2"> </span><strong>{{vipPrice}}</strong>{{/vip2}}
{{#vip3}}<span class="vip-3"> </span><strong>{{vipPrice}}</strong>{{/vip3}}
{{#vip1}}<span class="vip-1"> </span>{{/vip1}}
{{#vip2}}<span class="vip-2"> </span>{{/vip2}}
{{#vip3}}<span class="vip-3"> </span>{{/vip3}}
</p>
<div class="goodsList hide">
{{#goodsList}}
... ...
... ... @@ -60,7 +60,7 @@
.market-price {
text-decoration: line-through;
color: #999;
margin-right: 10px;
margin-right: 15px;
}
span.vip-tag {
... ... @@ -70,8 +70,8 @@
width: 40px;
color: #fff;
font-style: italic;
margin-right: 5px;
margin-left: 5px;
margin-right: 10px;
margin-left: 10px;
width: 30px;
}
... ... @@ -83,8 +83,8 @@
height: 12px;
color: #fff;
font-style: italic;
margin-right: 5px;
margin-left: 5px;
margin-right: 10px;
margin-left: 10px;
position: absolute;
}
... ... @@ -96,8 +96,8 @@
height: 12px;
color: #fff;
font-style: italic;
margin-right: 5px;
margin-left: 5px;
margin-right: 10px;
margin-left: 10px;
position: absolute;
}
... ... @@ -109,8 +109,8 @@
height: 12px;
color: #fff;
font-style: italic;
margin-right: 5px;
margin-left: 5px;
margin-right: 10px;
margin-left: 10px;
position: absolute;
}
... ...
... ... @@ -48,7 +48,6 @@
.slide-container {
position: relative;
height: 450px;
overflow: hidden;
}
/*
... ... @@ -157,11 +156,18 @@
bottom: 0;
opacity: 0.5;
width: 100%;
font-size: 22px;
font-size: 18px;
line-height: 30px;
text-align: right;
color: #fff;
background: #4e4e4e;
span {
margin-right: 10px;
}
}
.time-span {
margin-right: 20px;
}
.detail {
... ... @@ -175,7 +181,7 @@
.text {
padding: 24px 10px 48px 0;
font-size: 16px;
height: 74px;
padding-bottom: 20px;
color: #fd5659;
}
... ... @@ -210,6 +216,7 @@
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
text-align: center;
}
}
... ...