code review by hf: fixes some bugs to merge code
Showing
4 changed files
with
16 additions
and
5 deletions
@@ -8740,6 +8740,9 @@ if ('advance' === cartType) { | @@ -8740,6 +8740,9 @@ if ('advance' === cartType) { | ||
8740 | $cartContent.toggleClass('hide'); | 8740 | $cartContent.toggleClass('hide'); |
8741 | $('#common-cart-nav').removeClass('active'); | 8741 | $('#common-cart-nav').removeClass('active'); |
8742 | $('#presell-cart-nav').addClass('active'); | 8742 | $('#presell-cart-nav').addClass('active'); |
8743 | + $('.shopping-cart-good .name').each(function() { | ||
8744 | + this.mlellipsis(2); | ||
8745 | + }); | ||
8743 | } | 8746 | } |
8744 | 8747 | ||
8745 | if ($('.cart-nav').length > 0) { | 8748 | if ($('.cart-nav').length > 0) { |
@@ -8751,6 +8754,10 @@ if ($('.cart-nav').length > 0) { | @@ -8751,6 +8754,10 @@ if ($('.cart-nav').length > 0) { | ||
8751 | return; | 8754 | return; |
8752 | } | 8755 | } |
8753 | 8756 | ||
8757 | + $('.shopping-cart-good .name').each(function() { | ||
8758 | + this.mlellipsis(2); | ||
8759 | + }); | ||
8760 | + | ||
8754 | if (cartType === 'ordinary') { | 8761 | if (cartType === 'ordinary') { |
8755 | cartType = 'advance'; | 8762 | cartType = 'advance'; |
8756 | $('#cartType').val('advance'); | 8763 | $('#cartType').val('advance'); |
@@ -8859,9 +8866,11 @@ lazyLoad({ | @@ -8859,9 +8866,11 @@ lazyLoad({ | ||
8859 | try_again_css: 'good-failure' | 8866 | try_again_css: 'good-failure' |
8860 | }); | 8867 | }); |
8861 | 8868 | ||
8862 | -$('.shopping-cart-good .name').each(function() { | ||
8863 | - this.mlellipsis(2); | ||
8864 | -}); | 8869 | +setTimeout(function() { |
8870 | + $('.shopping-cart-good .name').each(function() { | ||
8871 | + this.mlellipsis(2); | ||
8872 | + }); | ||
8873 | +}, 0); | ||
8865 | 8874 | ||
8866 | function GoodInfo(properties) { | 8875 | function GoodInfo(properties) { |
8867 | this.goods_type = properties.goods_type; | 8876 | this.goods_type = properties.goods_type; |
@@ -9027,11 +9036,13 @@ function bottomCheckBoxHandeler(isSelected, type, handlerAfterTouch) { | @@ -9027,11 +9036,13 @@ function bottomCheckBoxHandeler(isSelected, type, handlerAfterTouch) { | ||
9027 | 9036 | ||
9028 | //全选按钮点击事件 | 9037 | //全选按钮点击事件 |
9029 | $selectAllBtn.on('touchend', function() { | 9038 | $selectAllBtn.on('touchend', function() { |
9030 | - if ($('.low-stocks').length > 0) { | 9039 | + var isSelect = $(this).hasClass('icon-cb-checked'); |
9040 | + | ||
9041 | + if (!isSelect && $('.low-stocks').length > 0) { | ||
9031 | tip.show('所选商品中含有库存不足的商品'); | 9042 | tip.show('所选商品中含有库存不足的商品'); |
9032 | return false; | 9043 | return false; |
9033 | } | 9044 | } |
9034 | - bottomCheckBoxHandeler($(this).hasClass('icon-cb-checked'), $('#cartType').val(), didUpdateAllGoodsCheckStatus); | 9045 | + bottomCheckBoxHandeler(isSelect, $('#cartType').val(), didUpdateAllGoodsCheckStatus); |
9035 | }); | 9046 | }); |
9036 | 9047 | ||
9037 | $('.down').on('touchend', function() { | 9048 | $('.down').on('touchend', function() { |
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
-
Please register or login to post a comment