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
1 {{# result}} 1 {{# result}}
2 <div class="sale-discount-page yoho-page center-content .new-sale-page"> 2 <div class="sale-discount-page yoho-page center-content .new-sale-page">
3 3
4 - {{#topBanner}}  
5 - {{> sale/sale-banner}}  
6 - {{/topBanner}}  
7 -  
8 - <div class="center-content clearfix">  
9 - {{#saleTitle}}  
10 - <div class="sale-title">  
11 - <span class="title">{{title}}</span>  
12 - {{#if discount}}  
13 - <span class="discount">{{discount}}</span>  
14 - {{/if}}  
15 - {{#if up}}  
16 - 起  
17 - {{/if}}  
18 - <div class="time pull-right">  
19 - <span class="iconfont">&#xe60a;</span>  
20 - <label class="time-calculate hidden" data="{{time}}"></label>  
21 - </div>  
22 - </div>  
23 - {{/saleTitle}}  
24 - <ul class="sort">  
25 - <li class="title">分类：</li>  
26 - {{#leftContent}}  
27 - {{#allSort}}  
28 - {{#list}}  
29 - <li class="{{#if checked}}active{{/if}}"><a href="{{href}}">{{name}} {{#if num}}({{num}}){{/if}}</a></li>  
30 - {{/list}}  
31 - {{/allSort}}  
32 - {{/leftContent}}  
33 - </ul>  
34 - </div> 4 + {{> sale/sale-banner}}
35 5
36 {{> sale/discount-center-content}} 6 {{> sale/discount-center-content}}
37 7
@@ -10,9 +10,8 @@ @@ -10,9 +10,8 @@
10 {{> sale/activity-entry}} 10 {{> sale/activity-entry}}
11 {{> sale/brand-sale}} 11 {{> sale/brand-sale}}
12 12
13 - <div class="home-page">  
14 - {{> sale/sale-box}}  
15 - </div> 13 +
  14 + {{> sale/sale-box}}
16 15
17 </div> 16 </div>
18 {{/ result}} 17 {{/ result}}
1 -<div class="sale-list-banner">  
2 - <ul>  
3 - {{# list}}  
4 - <li class="banner-img" style="background:url({{image img 1920 360}}) no-repeat top center;"></li>  
5 - {{/ list}}  
6 - </ul>  
7 -</div> 1 +{{# topBanner}}
  2 + {{#if list}}
  3 + <div class="sale-list-banner" style="height: 360px;">
  4 + <ul>
  5 + {{# list}}
  6 + <li class="banner-img" style="background:url({{image img 1920 360}}) no-repeat top center;"></li>
  7 + {{/ list}}
  8 + </ul>
  9 + </div>
  10 + {{/if}}
  11 +{{/topBanner}}
1 {{#saleCategory}} 1 {{#saleCategory}}
2 - <div class="sale-box">  
3 - <div class="floor-header clearfix">  
4 - <h2 class="floor-title">{{title}}</h2>  
5 - </div>  
6 - <ul class="sale-nav" urlLocation="{{urlLocation}}" cursor:pointer>  
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>  
9 - {{/navItem}}  
10 - </ul>  
11 - <div class="commodity-list">  
12 - <ul class="clearfix goods"> 2 + {{#if navItem}}
  3 + <div class="sale-box">
  4 + <div class="floor-header clearfix">
  5 + <h2 class="floor-title">{{title}}</h2>
  6 + </div>
  7 + <ul class="sale-nav" urlLocation="{{urlLocation}}">
  8 + {{#navItem}}
  9 + <li class="{{#vip}}green{{/vip}} {{#incompleteSize}}yellow{{/incompleteSize}} {{#newDiscount}}red{{/newDiscount}} {{#if @first}}active first{{/if}} {{#if @last}}last{{/if}}" urlLocation='{{urlLocation}}'>{{title}}</li>
  10 + {{/navItem}}
13 </ul> 11 </ul>
  12 + <div class="commodity-list">
  13 + <ul class="clearfix goods">
  14 + </ul>
  15 + </div>
14 </div> 16 </div>
15 - </div> 17 + {{/if}}
16 {{/saleCategory}} 18 {{/saleCategory}}
1 -<div id="slider" class="slide-container {{#if pagination}}slide-thumb-container{{/if}}">  
2 - <div class="slide-wrapper">  
3 - <ul>  
4 - {{# list}}  
5 - <li style="{{#if bgColor}}background:{{bgColor}}{{/if}}">  
6 - <a href="{{href}}" target= "_blank">  
7 - {{#if @first}}  
8 - <img src="{{image img 1150 450}}" style="height: 450px;width: 1150px">  
9 - {{^}}  
10 - <img class="lazy" data-original="{{image img 1150 450}}" style="height: 450px;width: 1150px" alt="">  
11 - {{/if}}  
12 - </a>  
13 - {{# tips}}  
14 - <div class="slide-tips">  
15 - <div class="g-mark"></div>  
16 - <p>{{.}}</p>  
17 - </div>  
18 - {{/ tips}}  
19 - </li>  
20 - {{/ list}}  
21 - </ul>  
22 - </div>  
23 -  
24 - {{#if pagination}}  
25 - <div class="thumb-pagination">  
26 - <ul class="clearfix">  
27 - {{# pagination}}  
28 - <li>  
29 - <a href="{{href}}" target="_blank"></a>  
30 - <img src="{{img}}" alt=""> 1 +{{#topBanner}}
  2 + <div id="slider" class="slide-container {{#if pagination}}slide-thumb-container{{/if}}">
  3 + <div class="slide-wrapper">
  4 + <ul>
  5 + {{# list}}
  6 + <li style="{{#if bgColor}}background:{{bgColor}}{{/if}}">
  7 + <a href="{{href}}" target= "_blank">
  8 + {{#if @first}}
  9 + <img src="{{image img 1150 450}}" style="height: 450px;width: 1150px">
  10 + {{^}}
  11 + <img class="lazy" data-original="{{image img 1150 450}}" style="height: 450px;width: 1150px" alt="">
  12 + {{/if}}
  13 + </a>
  14 + {{# tips}}
  15 + <div class="slide-tips">
  16 + <div class="g-mark"></div>
  17 + <p>{{.}}</p>
  18 + </div>
  19 + {{/ tips}}
31 </li> 20 </li>
32 - {{/ pagination}} 21 + {{/ list}}
33 </ul> 22 </ul>
34 </div> 23 </div>
35 - {{/if}}  
36 -</div>  
37 -<div class="slide-container-placeholder {{#if pagination}}slide-thumb-container-placeholder{{/if}}"></div> 24 +
  25 + {{#if pagination}}
  26 + <div class="thumb-pagination">
  27 + <ul class="clearfix">
  28 + {{# pagination}}
  29 + <li>
  30 + <a href="{{href}}" target="_blank"></a>
  31 + <img src="{{img}}" alt="">
  32 + </li>
  33 + {{/ pagination}}
  34 + </ul>
  35 + </div>
  36 + {{/if}}
  37 + </div>
  38 + <div class="slide-container-placeholder {{#if pagination}}slide-thumb-container-placeholder{{/if}}"></div>
  39 +{{/topBanner}}
This diff could not be displayed because it is too large.
@@ -75,6 +75,7 @@ @@ -75,6 +75,7 @@
75 .title { 75 .title {
76 font-size: 16px; 76 font-size: 16px;
77 margin: 28px 0 14px; 77 margin: 28px 0 14px;
  78 + padding: 0 8px;
78 font-weight: bold; 79 font-weight: bold;
79 } 80 }
80 81
@@ -149,6 +150,17 @@ @@ -149,6 +150,17 @@
149 .good-item { 150 .good-item {
150 padding: 15px; 151 padding: 15px;
151 } 152 }
  153 +
  154 + .good-item > a {
  155 + width: 90px;
  156 + height: 120px;
  157 + display: inline-block;
  158 + }
  159 +
  160 + .good-item > img {
  161 + width: 100%;
  162 + height: 100%;
  163 + }
152 } 164 }
153 165
154 .item-text { 166 .item-text {