Merge branch 'develop' into test

@@ -79,6 +79,9 @@ if ('advance' === cartType) {
     $cartContent.toggleClass('hide');
     $cartContent.toggleClass('hide');
     $('#common-cart-nav').removeClass('active');
     $('#common-cart-nav').removeClass('active');
     $('#presell-cart-nav').addClass('active');
     $('#presell-cart-nav').addClass('active');
+    $('.shopping-cart-good .name').each(function() {
+        this.mlellipsis(2);
+    });
 }
 }
 
 
 if ($('.cart-nav').length > 0) {
 if ($('.cart-nav').length > 0) {
@@ -90,6 +93,10 @@ if ($('.cart-nav').length > 0) {
             return;
             return;
         }
         }
 
 
+        $('.shopping-cart-good .name').each(function() {
+            this.mlellipsis(2);
+        });
+
         if (cartType === 'ordinary') {
         if (cartType === 'ordinary') {
             cartType = 'advance';
             cartType = 'advance';
             $('#cartType').val('advance');
             $('#cartType').val('advance');

@@ -22,9 +22,11 @@ lazyLoad({
     try_again_css: 'good-failure'
     try_again_css: 'good-failure'
 });
 });
 
 
-$('.shopping-cart-good .name').each(function() {
-    this.mlellipsis(2);
-});
+setTimeout(function() {
+    $('.shopping-cart-good .name').each(function() {
+        this.mlellipsis(2);
+    });
+}, 0);
 
 
 function GoodInfo(properties) {
 function GoodInfo(properties) {
     this.goods_type = properties.goods_type;
     this.goods_type = properties.goods_type;
@@ -190,11 +192,13 @@ function bottomCheckBoxHandeler(isSelected, type, handlerAfterTouch) {
 
 
 //全选按钮点击事件
 //全选按钮点击事件
 $selectAllBtn.on('touchend', function() {
 $selectAllBtn.on('touchend', function() {
-    if ($('.low-stocks').length > 0) {
+    var isSelect = $(this).hasClass('icon-cb-checked');
+
+    if (!isSelect && $('.low-stocks').length > 0) {
         tip.show('所选商品中含有库存不足的商品');
         tip.show('所选商品中含有库存不足的商品');
         return false;
         return false;
     }
     }
-    bottomCheckBoxHandeler($(this).hasClass('icon-cb-checked'), $('#cartType').val(), didUpdateAllGoodsCheckStatus);
+    bottomCheckBoxHandeler(isSelect, $('#cartType').val(), didUpdateAllGoodsCheckStatus);
 });
 });
 
 
 $('.down').on('touchend', function() {
 $('.down').on('touchend', function() {

@@ -58,6 +58,7 @@
         }
         }
         .sale-price {
         .sale-price {
             color: #e10;
             color: #e10;
+            margin-right: pxToRem(15px);
 
 
             &.no-price {
             &.no-price {
                 color: #000;
                 color: #000;