diff --git a/static/js/cart/cart.js b/static/js/cart/cart.js index 95329d9..1cf93c1 100644 --- a/static/js/cart/cart.js +++ b/static/js/cart/cart.js @@ -65,6 +65,11 @@ $('.freebie').on('touchend', function() { }); $('.btn-balance').on('touchend', function() { + if ($('.low-stocks').length > 0) { + tip.show('请先删除库存不足商品'); + return false; + } + if (hasChecked) { window.location.href = '/cart/index/orderEnsure?cartType=' + cartType; } else { diff --git a/static/sass/cart/_index.scss b/static/sass/cart/_index.scss index ab25de1..15d8aed 100644 --- a/static/sass/cart/_index.scss +++ b/static/sass/cart/_index.scss @@ -120,7 +120,7 @@ .freebie-and-advance-buy { padding: 20rem / $pxConvertRem; font-size: 24rem / $pxConvertRem; - border-bottom: 1px solid #e0e0e0; + //border-bottom: 1px solid #e0e0e0; > li { box-sizing: border-box; @@ -152,6 +152,7 @@ } .activity-title{ + border-top: 1px solid #e0e0e0; font-size: 32rem / $pxConvertRem; padding: 20rem / $pxConvertRem 20rem / $pxConvertRem 0; } diff --git a/template/m.yohobuy.com/partials/cart/cart-content.phtml b/template/m.yohobuy.com/partials/cart/cart-content.phtml index 4650abc..187b689 100644 --- a/template/m.yohobuy.com/partials/cart/cart-content.phtml +++ b/template/m.yohobuy.com/partials/cart/cart-content.phtml @@ -42,6 +42,7 @@ {{/if}} {{/ promotionInfo}} +{{#if promotionInfo}} <div class="activity"> <ul> {{# promotionInfo}} @@ -49,6 +50,7 @@ {{/ promotionInfo}} </ul> </div> +{{/if}} <div class="price-compute"> <p>