fe / YOHOBUYWAP · Commits

Go to a project

Authored by cailing
Commit f3257b550cc7f1bb32afe69c0df2d98f2042d1b7 2 parents 45744068 c597b963

Merge branch 'release/4.7' of http://git.yoho.cn/fe/YOHOBUYWAP into release/4.7

Inline Side-by-side
Showing 4 changed files with 13 additions and 13 deletions
This diff could not be displayed because it is too large.
@@ -27,7 +27,6 @@ var isRefreshByDelete = window.cookie('_yoho-cart-refreshByDelete') === 'true' ? @@ -27,7 +27,6 @@ var isRefreshByDelete = window.cookie('_yoho-cart-refreshByDelete') === 'true' ?
27 27
28 var lowStockCount = 0; 28 var lowStockCount = 0;
29 29
30 -  
31 loading.showLoadingMask(); 30 loading.showLoadingMask();
32 31
33 function needLoadRecommandForYou() { 32 function needLoadRecommandForYou() {
@@ -36,7 +35,6 @@ function needLoadRecommandForYou() { @@ -36,7 +35,6 @@ function needLoadRecommandForYou() {
36 $('.cart-goods').length <= 0; 35 $('.cart-goods').length <= 0;
37 } 36 }
38 37
39 -  
40 if (needLoadRecommandForYou()) { 38 if (needLoadRecommandForYou()) {
41 require('../product/recommend-for-you'); 39 require('../product/recommend-for-you');
42 } else { 40 } else {
@@ -242,3 +240,7 @@ $cartNav.on('touchstart', 'li', function(e) { @@ -242,3 +240,7 @@ $cartNav.on('touchstart', 'li', function(e) {
242 240
243 //提前触发lazyload 241 //提前触发lazyload
244 $(window).scrollTop(1).scrollTop(0); 242 $(window).scrollTop(1).scrollTop(0);
  243 +
  244 +if ($('.invalid-goods').find('.shopping-cart-good').length === 0) {
  245 + $('#failure-goods').removeClass('invalid-goods');
  246 +}
@@ -84,7 +84,7 @@ body.passport-body { @@ -84,7 +84,7 @@ body.passport-body {
84 padding-right: 40PX; 84 padding-right: 40PX;
85 right: 0; 85 right: 0;
86 color: #fff; 86 color: #fff;
87 - background-color: transparent; 87 + background-color: #575757;
88 border: 0; 88 border: 0;
89 border-radius: 5PX; 89 border-radius: 5PX;
90 appearance: none; 90 appearance: none;
@@ -4,21 +4,19 @@ @@ -4,21 +4,19 @@
4 {{/ goods}} 4 {{/ goods}}
5 </div> 5 </div>
6 6
7 -{{#if notValidGoods}}  
8 - <div class="invalid-goods"> 7 +<div class="invalid-goods" id="failure-goods">
  8 + {{#if notValidGoods}}
9 {{# notValidGoods}} 9 {{# notValidGoods}}
10 - {{> cart/good}} 10 + {{> cart/good}}
11 {{/ notValidGoods}} 11 {{/ notValidGoods}}
12 - </div>  
13 -{{/if}} 12 + {{/if}}
14 13
15 -{{#if offShelveGoods}}  
16 - <div class="invalid-goods off-shell-goods"> 14 + {{#if offShelveGoods}}
17 {{# offShelveGoods}} 15 {{# offShelveGoods}}
18 - {{> cart/good}} 16 + {{> cart/good}}
19 {{/ offShelveGoods}} 17 {{/ offShelveGoods}}
20 - </div>  
21 -{{/if}} 18 + {{/if}}
  19 +</div>
22 20
23 {{#if freebieOrAdvanceBuy}} 21 {{#if freebieOrAdvanceBuy}}
24 <ul class="freebie-and-advance-buy"> 22 <ul class="freebie-and-advance-buy">