fe / yohobuy-node · Commits

Go to a project

Authored by 郭成尧
Commit df20e1b3ad259d5feeefacb1fbe421fad441bbaf 2 parents b9b147d0 e05b72a4

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

Inline Side-by-side
Showing 10 changed files with 60 additions and 37 deletions
... ... @@ -26,13 +26,15 @@
{{#leftContent}}
{{#allSort}}
{{#list}}
<li class="{{#if checked}}active{{/if}}"><a href="{{href}}">{{name}}({{num}})</a></li>
<li class="{{#if checked}}active{{/if}}"><a href="{{href}}">{{name}} {{#if num}}({{num}}){{/if}}</a></li>
{{/list}}
{{/allSort}}
{{/leftContent}}
</ul>
</div>
{{> sale/discount-center-content}}
{{# saleList}}
{{> product/standard-content}}
... ...
<div class="new-discount">
<p class="new-discount-label">最新折扣</p>
<ul class="discount-nav" urlLocation="{{urlLocation}}">
{{#discountNavItem}}
<li class="discount-nav-list" urlLocation='{{urlLocation}}'>{{title}}</li>
{{/discountNavItem}}
</ul>
<a url="{{discountMore}}">MORE</a>
</div>
\ No newline at end of file
... ... @@ -6,16 +6,17 @@
{{#brandSale}}
<div class="sale-group-big clearfix">
{{#big}}
<a class="item pull-left" href="{{link}}">
<a class="item pull-left" href="{{link}}" target= "_blank">
<div class="pic">
<img src="{{image img 375 400}}">
<div class="time"><span></span>&#xe60a;{{time}}</div>
<div class="time"><span class="iconfont">&#xe60a;</span>{{time}}</div>
</div>
<div class="detail">
<img class="brand pull-left" src="{{image brand 150 100}}">
<div class="text">
<div class="discount">
<span class="num">{{discount}}</span>
{{discountText}}
</div>
<div class="active-name">{{activityName}}</div>
<div class="title">
... ... @@ -28,10 +29,10 @@
</div>
<div class="sale-group clearfix">
{{#normal}}
<a class="item pull-left" href="{{link}}">
<a class="item pull-left" href="{{link}}" target= "_blank">
<img class="pic" src="{{image img 378 500}}">
<div class="detail">
<div class="title">{{title}}<span>{{discount}}</span>{{discountText}}</div>
<div class="title">{{title}}{{discount}}{{discountText}}</div>
<div class="time">{{time}}</div>
</div>
</a>
... ...
<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>
\ No newline at end of file
... ...
<div class="sale-list-banner" style="height: 360px;">
<div class="sale-list-banner">
<ul>
{{# list}}
<li class="banner-img" style="background:url({{image img 1920 360}}) no-repeat top center;"></li>
... ...
... ... @@ -3,7 +3,7 @@
<div class="floor-header clearfix">
<h2 class="floor-title">{{title}}</h2>
</div>
<ul class="sale-nav" urlLocation="{{urlLocation}}">
<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}}
... ...
<div class="filter-box">
{{# checkedConditions}}
<div class="checked-conditions section">
<span class="title">已选条件：</span>
<div class="attr-content clearfix">
{{#each conditions}}
<a class="tag" href="{{href}}">
{{#if name}}
{{name}}
{{^}}
<i class="color-block" style="background: {{color}}"></i>
{{/if}}
<i class="close iconfont">&#xe60d;</i>
</a>
{{/each}}
{{#if conditions}}
<div class="checked-conditions section">
<span class="title">已选条件：</span>
<div class="attr-content clearfix">
{{#each conditions}}
<a class="tag" href="{{href}}">
{{#if name}}
{{name}}
{{^}}
<i class="color-block" style="background: {{color}}"></i>
{{/if}}
<i class="close iconfont">&#xe60d;</i>
</a>
{{/each}}
<a class="clear-checked" href="{{clearUrl}}">清空筛选条件</a>
<a class="clear-checked" href="{{clearUrl}}">清空筛选条件</a>
</div>
</div>
</div>
{{/if}}
{{/ checkedConditions}}
{{#if channel}}
... ... @@ -111,7 +112,7 @@
{{#if showMore}}
<span id="brand-more" class="brand-more">
<em>更多</em>
<i class="iconfont">&#xe600;</i>
<i class="iconfont">&#xe60b;</i>
</span>
{{/if}}
... ... @@ -241,7 +242,7 @@
<li class="attr{{#unless sub}} no-sub{{/unless}}">
{{#if sub}}
{{name}}
<span class="iconfont">&#xe600;</span>
<span class="iconfont">&#xe60b;</span>
<div class="senior-up-icon"></div>
{{^}}
... ...
... ... @@ -45,7 +45,6 @@
<h2>
<a href="{{href}}" title="{{name}}">
{{name}}
<span>{{updateNum}}</span>
</a>
</h2>
</li>
... ...
... ... @@ -12,8 +12,8 @@ var checkUnicode = {
checked: '&#xe613;'
},
moreUnicode = {
up: '&#xe610;',
down: '&#xe600;'
up: '&#xe607;',
down: '&#xe60b;'
};
// 品牌相关变量
... ...
... ... @@ -264,6 +264,7 @@
width: 100%;
}
li {
cursor: pointer;
float: left;
width: 20%;
height: 40px;
... ... @@ -515,6 +516,7 @@
}
.time {
left-margin: 10px;
.iconfont {
margin-right: 5px;
}
... ...