fe / yohobuy-node · Commits

Go to a project

Authored by 郭成尧
Commit 8d4a7406c172a89a9004413e20f549e2b41b57e8 2 parents c0f561b1 157f957e

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 76 additions and 87 deletions
{{# result}}
<div class="sale-discount-page yoho-page center-content .new-sale-page">
{{#topBanner}}
{{> sale/sale-banner}}
{{/topBanner}}
<div class="center-content clearfix">
{{#saleTitle}}
<div class="sale-title">
<span class="title">{{title}}</span>
{{#if discount}}
<span class="discount">{{discount}}</span>
{{/if}}
{{#if up}}
起
{{/if}}
<div class="time pull-right">
<span class="iconfont">&#xe60a;</span>
<label class="time-calculate hidden" data="{{time}}"></label>
</div>
</div>
{{/saleTitle}}
<ul class="sort">
<li class="title">分类：</li>
{{#leftContent}}
{{#allSort}}
{{#list}}
<li class="{{#if checked}}active{{/if}}"><a href="{{href}}">{{name}} {{#if num}}({{num}}){{/if}}</a></li>
{{/list}}
{{/allSort}}
{{/leftContent}}
</ul>
</div>
{{> sale/sale-banner}}
{{> sale/discount-center-content}}
... ...
... ... @@ -10,9 +10,8 @@
{{> sale/activity-entry}}
{{> sale/brand-sale}}
<div class="home-page">
{{> sale/sale-box}}
</div>
{{> sale/sale-box}}
</div>
{{/ result}}
... ...
<div class="sale-list-banner">
<ul>
{{# list}}
<li class="banner-img" style="background:url({{image img 1920 360}}) no-repeat top center;"></li>
{{/ list}}
</ul>
</div>
{{# topBanner}}
{{#if list}}
<div class="sale-list-banner" style="height: 360px;">
<ul>
{{# list}}
<li class="banner-img" style="background:url({{image img 1920 360}}) no-repeat top center;"></li>
{{/ list}}
</ul>
</div>
{{/if}}
{{/topBanner}}
\ No newline at end of file
... ...
{{#saleCategory}}
<div class="sale-box">
<div class="floor-header clearfix">
<h2 class="floor-title">{{title}}</h2>
</div>
<ul class="sale-nav" urlLocation="{{urlLocation}}" cursor:pointer>
{{#navItem}}
<li class="{{#vip}}green{{/vip}} {{#incompleteSize}}yellow{{/incompleteSize}} {{#newDiscount}}red{{/newDiscount}} {{#if @first}}active first{{/if}} {{#if @last}}last{{/if}}" urlLocation='{{urlLocation}}'>{{title}}</li>
{{/navItem}}
</ul>
<div class="commodity-list">
<ul class="clearfix goods">
{{#if navItem}}
<div class="sale-box">
<div class="floor-header clearfix">
<h2 class="floor-title">{{title}}</h2>
</div>
<ul class="sale-nav" urlLocation="{{urlLocation}}">
{{#navItem}}
<li class="{{#vip}}green{{/vip}} {{#incompleteSize}}yellow{{/incompleteSize}} {{#newDiscount}}red{{/newDiscount}} {{#if @first}}active first{{/if}} {{#if @last}}last{{/if}}" urlLocation='{{urlLocation}}'>{{title}}</li>
{{/navItem}}
</ul>
<div class="commodity-list">
<ul class="clearfix goods">
</ul>
</div>
</div>
</div>
{{/if}}
{{/saleCategory}}
... ...
<div id="slider" class="slide-container {{#if pagination}}slide-thumb-container{{/if}}">
<div class="slide-wrapper">
<ul>
{{# list}}
<li style="{{#if bgColor}}background:{{bgColor}}{{/if}}">
<a href="{{href}}" target= "_blank">
{{#if @first}}
<img src="{{image img 1150 450}}" style="height: 450px;width: 1150px">
{{^}}
<img class="lazy" data-original="{{image img 1150 450}}" style="height: 450px;width: 1150px" alt="">
{{/if}}
</a>
{{# tips}}
<div class="slide-tips">
<div class="g-mark"></div>
<p>{{.}}</p>
</div>
{{/ tips}}
</li>
{{/ list}}
</ul>
</div>
{{#if pagination}}
<div class="thumb-pagination">
<ul class="clearfix">
{{# pagination}}
<li>
<a href="{{href}}" target="_blank"></a>
<img src="{{img}}" alt="">
{{#topBanner}}
<div id="slider" class="slide-container {{#if pagination}}slide-thumb-container{{/if}}">
<div class="slide-wrapper">
<ul>
{{# list}}
<li style="{{#if bgColor}}background:{{bgColor}}{{/if}}">
<a href="{{href}}" target= "_blank">
{{#if @first}}
<img src="{{image img 1150 450}}" style="height: 450px;width: 1150px">
{{^}}
<img class="lazy" data-original="{{image img 1150 450}}" style="height: 450px;width: 1150px" alt="">
{{/if}}
</a>
{{# tips}}
<div class="slide-tips">
<div class="g-mark"></div>
<p>{{.}}</p>
</div>
{{/ tips}}
</li>
{{/ pagination}}
{{/ list}}
</ul>
</div>
{{/if}}
</div>
<div class="slide-container-placeholder {{#if pagination}}slide-thumb-container-placeholder{{/if}}"></div>
{{#if pagination}}
<div class="thumb-pagination">
<ul class="clearfix">
{{# pagination}}
<li>
<a href="{{href}}" target="_blank"></a>
<img src="{{img}}" alt="">
</li>
{{/ pagination}}
</ul>
</div>
{{/if}}
</div>
<div class="slide-container-placeholder {{#if pagination}}slide-thumb-container-placeholder{{/if}}"></div>
{{/topBanner}}
... ...
This diff could not be displayed because it is too large.
... ... @@ -75,6 +75,7 @@
.title {
font-size: 16px;
margin: 28px 0 14px;
padding: 0 8px;
font-weight: bold;
}
... ... @@ -149,6 +150,17 @@
.good-item {
padding: 15px;
}
.good-item > a {
width: 90px;
height: 120px;
display: inline-block;
}
.good-item > img {
width: 100%;
height: 100%;
}
}
.item-text {
... ...