Merge branch 'release/4.6' of git.yoho.cn:fe/yohobuy-node into release/4.6
Showing
7 changed files
with
27 additions
and
38 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}} | 4 | {{> 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"></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> | ||
| 35 | 5 | ||
| 36 | {{> sale/discount-center-content}} | 6 | {{> sale/discount-center-content}} |
| 37 | 7 |
| 1 | -<div class="sale-list-banner"> | 1 | +{{# topBanner}} |
| 2 | + {{#if list}} | ||
| 3 | + <div class="sale-list-banner" style="height: 360px;"> | ||
| 2 | <ul> | 4 | <ul> |
| 3 | {{# list}} | 5 | {{# list}} |
| 4 | <li class="banner-img" style="background:url({{image img 1920 360}}) no-repeat top center;"></li> | 6 | <li class="banner-img" style="background:url({{image img 1920 360}}) no-repeat top center;"></li> |
| 5 | {{/ list}} | 7 | {{/ list}} |
| 6 | </ul> | 8 | </ul> |
| 7 | -</div> | 9 | + </div> |
| 10 | + {{/if}} | ||
| 11 | +{{/topBanner}} |
| 1 | {{#saleCategory}} | 1 | {{#saleCategory}} |
| 2 | + {{#if navItem}} | ||
| 2 | <div class="sale-box"> | 3 | <div class="sale-box"> |
| 3 | <div class="floor-header clearfix"> | 4 | <div class="floor-header clearfix"> |
| 4 | <h2 class="floor-title">{{title}}</h2> | 5 | <h2 class="floor-title">{{title}}</h2> |
| 5 | </div> | 6 | </div> |
| 6 | - <ul class="sale-nav" urlLocation="{{urlLocation}}" cursor:pointer> | 7 | + <ul class="sale-nav" urlLocation="{{urlLocation}}"> |
| 7 | {{#navItem}} | 8 | {{#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 | <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 | {{/navItem}} |
| @@ -13,4 +14,5 @@ | @@ -13,4 +14,5 @@ | ||
| 13 | </ul> | 14 | </ul> |
| 14 | </div> | 15 | </div> |
| 15 | </div> | 16 | </div> |
| 17 | + {{/if}} | ||
| 16 | {{/saleCategory}} | 18 | {{/saleCategory}} |
| 1 | -<div id="slider" class="slide-container {{#if pagination}}slide-thumb-container{{/if}}"> | 1 | +{{#topBanner}} |
| 2 | + <div id="slider" class="slide-container {{#if pagination}}slide-thumb-container{{/if}}"> | ||
| 2 | <div class="slide-wrapper"> | 3 | <div class="slide-wrapper"> |
| 3 | <ul> | 4 | <ul> |
| 4 | {{# list}} | 5 | {{# list}} |
| @@ -33,5 +34,6 @@ | @@ -33,5 +34,6 @@ | ||
| 33 | </ul> | 34 | </ul> |
| 34 | </div> | 35 | </div> |
| 35 | {{/if}} | 36 | {{/if}} |
| 36 | -</div> | ||
| 37 | -<div class="slide-container-placeholder {{#if pagination}}slide-thumb-container-placeholder{{/if}}"></div> | 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 { |
-
Please register or login to post a comment