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 45 additions and 22 deletions
@@ -26,13 +26,15 @@ @@ -26,13 +26,15 @@
26 {{#leftContent}} 26 {{#leftContent}}
27 {{#allSort}} 27 {{#allSort}}
28 {{#list}} 28 {{#list}}
29 - <li class="{{#if checked}}active{{/if}}"><a href="{{href}}">{{name}}({{num}})</a></li> 29 + <li class="{{#if checked}}active{{/if}}"><a href="{{href}}">{{name}} {{#if num}}({{num}}){{/if}}</a></li>
30 {{/list}} 30 {{/list}}
31 {{/allSort}} 31 {{/allSort}}
32 {{/leftContent}} 32 {{/leftContent}}
33 </ul> 33 </ul>
34 </div> 34 </div>
35 35
  36 + {{> sale/discount-center-content}}
  37 +
36 {{# saleList}} 38 {{# saleList}}
37 39
38 {{> product/standard-content}} 40 {{> product/standard-content}}
1 -<div class="new-discount">  
2 - <p class="new-discount-label">最新折扣</p>  
3 - <ul class="discount-nav" urlLocation="{{urlLocation}}">  
4 - {{#discountNavItem}}  
5 - <li class="discount-nav-list" urlLocation='{{urlLocation}}'>{{title}}</li>  
6 - {{/discountNavItem}}  
7 - </ul>  
8 - <a url="{{discountMore}}">MORE</a>  
9 -</div>  
@@ -6,16 +6,17 @@ @@ -6,16 +6,17 @@
6 {{#brandSale}} 6 {{#brandSale}}
7 <div class="sale-group-big clearfix"> 7 <div class="sale-group-big clearfix">
8 {{#big}} 8 {{#big}}
9 - <a class="item pull-left" href="{{link}}"> 9 + <a class="item pull-left" href="{{link}}" target= "_blank">
10 <div class="pic"> 10 <div class="pic">
11 <img src="{{image img 375 400}}"> 11 <img src="{{image img 375 400}}">
12 - <div class="time"><span></span>&#xe60a;{{time}}</div> 12 + <div class="time"><span class="iconfont">&#xe60a;</span>{{time}}</div>
13 </div> 13 </div>
14 <div class="detail"> 14 <div class="detail">
15 <img class="brand pull-left" src="{{image brand 150 100}}"> 15 <img class="brand pull-left" src="{{image brand 150 100}}">
16 <div class="text"> 16 <div class="text">
17 <div class="discount"> 17 <div class="discount">
18 <span class="num">{{discount}}</span> 18 <span class="num">{{discount}}</span>
  19 + {{discountText}}
19 </div> 20 </div>
20 <div class="active-name">{{activityName}}</div> 21 <div class="active-name">{{activityName}}</div>
21 <div class="title"> 22 <div class="title">
@@ -28,10 +29,10 @@ @@ -28,10 +29,10 @@
28 </div> 29 </div>
29 <div class="sale-group clearfix"> 30 <div class="sale-group clearfix">
30 {{#normal}} 31 {{#normal}}
31 - <a class="item pull-left" href="{{link}}"> 32 + <a class="item pull-left" href="{{link}}" target= "_blank">
32 <img class="pic" src="{{image img 378 500}}"> 33 <img class="pic" src="{{image img 378 500}}">
33 <div class="detail"> 34 <div class="detail">
34 - <div class="title">{{title}}<span>{{discount}}</span>{{discountText}}</div> 35 + <div class="title">{{title}}{{discount}}{{discountText}}</div>
35 <div class="time">{{time}}</div> 36 <div class="time">{{time}}</div>
36 </div> 37 </div>
37 </a> 38 </a>
  1 +<div class="center-content clearfix">
  2 + {{#saleTitle}}
  3 + <div class="sale-title">
  4 + <span class="title">{{title}}</span>
  5 + {{#if discount}}
  6 + <span class="discount">{{discount}}</span>
  7 + {{/if}}
  8 + {{#if up}}
  9 + 起
  10 + {{/if}}
  11 + <div class="time pull-right">
  12 + <span class="iconfont">&#xe60a;</span>
  13 + <label class="time-calculate hidden" data="{{time}}"></label>
  14 + </div>
  15 + </div>
  16 + {{/saleTitle}}
  17 + <ul class="sort">
  18 + <li class="title">分类：</li>
  19 + {{#leftContent}}
  20 + {{#allSort}}
  21 + {{#list}}
  22 + <li class="{{#if checked}}active{{/if}}"><a href="{{href}}">{{name}} {{#if num}}({{num}}){{/if}}</a></li>
  23 + {{/list}}
  24 + {{/allSort}}
  25 + {{/leftContent}}
  26 + </ul>
  27 +</div>
1 -<div class="sale-list-banner" style="height: 360px;"> 1 +<div class="sale-list-banner">
2 <ul> 2 <ul>
3 {{# list}} 3 {{# list}}
4 <li class="banner-img" style="background:url({{image img 1920 360}}) no-repeat top center;"></li> 4 <li class="banner-img" style="background:url({{image img 1920 360}}) no-repeat top center;"></li>
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <div class="floor-header clearfix"> 3 <div class="floor-header clearfix">
4 <h2 class="floor-title">{{title}}</h2> 4 <h2 class="floor-title">{{title}}</h2>
5 </div> 5 </div>
6 - <ul class="sale-nav" urlLocation="{{urlLocation}}"> 6 + <ul class="sale-nav" urlLocation="{{urlLocation}}" cursor:pointer>
7 {{#navItem}} 7 {{#navItem}}
8 <li class="{{#vip}}green{{/vip}} {{#incompleteSize}}yellow{{/incompleteSize}} {{#newDiscount}}red{{/newDiscount}} {{#if @first}}active first{{/if}} {{#if @last}}last{{/if}}" urlLocation='{{urlLocation}}'>{{title}}</li> 8 <li class="{{#vip}}green{{/vip}} {{#incompleteSize}}yellow{{/incompleteSize}} {{#newDiscount}}red{{/newDiscount}} {{#if @first}}active first{{/if}} {{#if @last}}last{{/if}}" urlLocation='{{urlLocation}}'>{{title}}</li>
9 {{/navItem}} 9 {{/navItem}}
1 <div class="filter-box"> 1 <div class="filter-box">
2 {{# checkedConditions}} 2 {{# checkedConditions}}
  3 + {{#if conditions}}
3 <div class="checked-conditions section"> 4 <div class="checked-conditions section">
4 <span class="title">已选条件：</span> 5 <span class="title">已选条件：</span>
5 -  
6 <div class="attr-content clearfix"> 6 <div class="attr-content clearfix">
7 {{#each conditions}} 7 {{#each conditions}}
8 <a class="tag" href="{{href}}"> 8 <a class="tag" href="{{href}}">
@@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@
18 <a class="clear-checked" href="{{clearUrl}}">清空筛选条件</a> 18 <a class="clear-checked" href="{{clearUrl}}">清空筛选条件</a>
19 </div> 19 </div>
20 </div> 20 </div>
  21 + {{/if}}
21 {{/ checkedConditions}} 22 {{/ checkedConditions}}
22 23
23 {{#if channel}} 24 {{#if channel}}
@@ -111,7 +112,7 @@ @@ -111,7 +112,7 @@
111 {{#if showMore}} 112 {{#if showMore}}
112 <span id="brand-more" class="brand-more"> 113 <span id="brand-more" class="brand-more">
113 <em>更多</em> 114 <em>更多</em>
114 - <i class="iconfont">&#xe600;</i> 115 + <i class="iconfont">&#xe60b;</i>
115 </span> 116 </span>
116 {{/if}} 117 {{/if}}
117 118
@@ -241,7 +242,7 @@ @@ -241,7 +242,7 @@
241 <li class="attr{{#unless sub}} no-sub{{/unless}}"> 242 <li class="attr{{#unless sub}} no-sub{{/unless}}">
242 {{#if sub}} 243 {{#if sub}}
243 {{name}} 244 {{name}}
244 - <span class="iconfont">&#xe600;</span> 245 + <span class="iconfont">&#xe60b;</span>
245 246
246 <div class="senior-up-icon"></div> 247 <div class="senior-up-icon"></div>
247 {{^}} 248 {{^}}
@@ -45,7 +45,6 @@ @@ -45,7 +45,6 @@
45 <h2> 45 <h2>
46 <a href="{{href}}" title="{{name}}"> 46 <a href="{{href}}" title="{{name}}">
47 {{name}} 47 {{name}}
48 - <span>{{updateNum}}</span>  
49 </a> 48 </a>
50 </h2> 49 </h2>
51 </li> 50 </li>
@@ -12,8 +12,8 @@ var checkUnicode = { @@ -12,8 +12,8 @@ var checkUnicode = {
12 checked: '&#xe613;' 12 checked: '&#xe613;'
13 }, 13 },
14 moreUnicode = { 14 moreUnicode = {
15 - up: '&#xe610;',  
16 - down: '&#xe600;' 15 + up: '&#xe607;',
  16 + down: '&#xe60b;'
17 }; 17 };
18 18
19 // 品牌相关变量 19 // 品牌相关变量
@@ -264,6 +264,7 @@ @@ -264,6 +264,7 @@
264 width: 100%; 264 width: 100%;
265 } 265 }
266 li { 266 li {
  267 + cursor: pointer;
267 float: left; 268 float: left;
268 width: 20%; 269 width: 20%;
269 height: 40px; 270 height: 40px;
@@ -515,6 +516,7 @@ @@ -515,6 +516,7 @@
515 } 516 }
516 517
517 .time { 518 .time {
  519 + left-margin: 10px;
518 .iconfont { 520 .iconfont {
519 margin-right: 5px; 521 margin-right: 5px;
520 } 522 }