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

@@ -27,7 +27,6 @@ var isRefreshByDelete = window.cookie('_yoho-cart-refreshByDelete') === 'true' ?
 
 
 var lowStockCount = 0;
 var lowStockCount = 0;
 
 
-
 loading.showLoadingMask();
 loading.showLoadingMask();
 
 
 function needLoadRecommandForYou() {
 function needLoadRecommandForYou() {
@@ -36,7 +35,6 @@ function needLoadRecommandForYou() {
             $('.cart-goods').length <= 0;
             $('.cart-goods').length <= 0;
 }
 }
 
 
-
 if (needLoadRecommandForYou()) {
 if (needLoadRecommandForYou()) {
     require('../product/recommend-for-you');
     require('../product/recommend-for-you');
 } else {
 } else {
@@ -242,3 +240,7 @@ $cartNav.on('touchstart', 'li', function(e) {
 
 
 //提前触发lazyload
 //提前触发lazyload
 $(window).scrollTop(1).scrollTop(0);
 $(window).scrollTop(1).scrollTop(0);
+
+if ($('.invalid-goods').find('.shopping-cart-good').length === 0) {
+    $('#failure-goods').removeClass('invalid-goods');
+}

@@ -4,21 +4,19 @@
     {{/ goods}}
     {{/ goods}}
 </div>
 </div>
 
 
-{{#if notValidGoods}}
-    <div class="invalid-goods">
+<div class="invalid-goods" id="failure-goods">
+    {{#if notValidGoods}} 
         {{# notValidGoods}}
         {{# notValidGoods}}
-           {{> cart/good}}
+            {{> cart/good}}
         {{/ notValidGoods}}
         {{/ notValidGoods}}
-    </div>
-{{/if}}
+    {{/if}}
 
 
-{{#if offShelveGoods}}
-    <div class="invalid-goods off-shell-goods">
+    {{#if offShelveGoods}}
         {{# offShelveGoods}}
         {{# offShelveGoods}}
-        {{> cart/good}}
+            {{> cart/good}}
         {{/ offShelveGoods}}
         {{/ offShelveGoods}}
-    </div>
-{{/if}}
+    {{/if}}
+</div>
 
 
 {{#if freebieOrAdvanceBuy}}
 {{#if freebieOrAdvanceBuy}}
     <ul class="freebie-and-advance-buy">
     <ul class="freebie-and-advance-buy">