购物车bug修改

@@ -10,5 +10,6 @@
     <div class="cart-box">
     <div class="cart-box">
         
         
     </div>
     </div>
+    <div class="recommend-for-you box hide"></div> 
     <div id="chose-panel"></div>
     <div id="chose-panel"></div>
 </div>
 </div>

@@ -88,12 +88,12 @@
 {{/if}}
 {{/if}}
 {{#if hasNoSaleGoods}}
 {{#if hasNoSaleGoods}}
 <div class="disable-box box">
 <div class="disable-box box">
-    {{#notValidGoods}}
-        {{> cart-good}}
-    {{/notValidGoods}}
     {{#offShelveGoods}}
     {{#offShelveGoods}}
         {{> cart-good}}
         {{> cart-good}}
     {{/offShelveGoods}}
     {{/offShelveGoods}}
+    {{#notValidGoods}}
+        {{> cart-good}}
+    {{/notValidGoods}}
     
     
     <div class="remove-all">
     <div class="remove-all">
         <button class="btn btn-remove">清空失效商品</button>
         <button class="btn btn-remove">清空失效商品</button>

@@ -39,6 +39,4 @@
     </div>
     </div>
     {{/if}}
     {{/if}}
     <input id="cartType" type="hidden" value="{{cartType}}">
     <input id="cartType" type="hidden" value="{{cartType}}">
-    <div class="recommend-for-you box hide">
-    </div> 
 {{/if}}
 {{/if}}

@@ -117,7 +117,7 @@ let goodObj = {
         let self = this;
         let self = this;
 
 
         if (!$(e.currentTarget).hasClass('checked') && $(e.delegateTarget).find('.low-stocks').length > 0) {
         if (!$(e.currentTarget).hasClass('checked') && $(e.delegateTarget).find('.low-stocks').length > 0) {
-            tip.show('库存不足，无法购买');
+            tip.show('您勾选的商品库存不足');
             return false;
             return false;
         }
         }
         self.selectGood($(e.currentTarget));
         self.selectGood($(e.currentTarget));
@@ -160,16 +160,22 @@ let goodObj = {
             let checked = $(e.currentTarget).find('.chk.select').hasClass('checked');
             let checked = $(e.currentTarget).find('.chk.select').hasClass('checked');
 
 
             if (checked) {
             if (checked) {
-                let promise = self.clearLowStock();
+                new Promise(resolve => {
+                    let promise = self.clearLowStock();
 
 
-                if (promise) {
-                    tip.show('您全选的商品中存在库存不足商品，已帮您自动取消勾选');
-                    promise.then(() => {
-                        self.selectGood($('.good-item:not(.low-stocks) .chk.select'), true);
-                    });
-                } else {
+                    if (promise) {
+                        promise.then(() => {
+                            resolve();
+                        });
+                    } else {
+                        resolve();
+                    }
+                }).then(() => {
+                    if ($('.good-item.low-stocks').length) {
+                        tip.show('您全选的商品中存在库存不足商品，已帮您自动取消勾选');
+                    }
                     self.selectGood($('.good-item:not(.low-stocks) .chk.select'), true);
                     self.selectGood($('.good-item:not(.low-stocks) .chk.select'), true);
-                }
+                });
             } else {
             } else {
                 self.selectGood($('.good-item .chk.select'), false);
                 self.selectGood($('.good-item .chk.select'), false);
             }
             }

@@ -298,6 +298,14 @@
         }
         }
     }
     }
 
 
+    .all-gift-box {
+        display: none;
+    }
+
+    .total {
+        display: none;
+    }
+
     .cart-content.active {
     .cart-content.active {
         .cart-footer {
         .cart-footer {
             .check-all {
             .check-all {