Merge branch 'fix/issue' into 'develop'

  解决问题

 1. 购物车内有“库存不足商品时不能去结算页面。
 2. 购物车页面，没有参与活动时的样式问题修复。

See merge request !52

@@ -65,6 +65,11 @@ $('.freebie').on('touchend', function() {
 });
 });
 
 
 $('.btn-balance').on('touchend', function() {
 $('.btn-balance').on('touchend', function() {
+    if ($('.low-stocks').length > 0) {
+        tip.show('请先删除库存不足商品');
+        return false;
+    }
+
     if (hasChecked) {
     if (hasChecked) {
         window.location.href = '/cart/index/orderEnsure?cartType=' + cartType;
         window.location.href = '/cart/index/orderEnsure?cartType=' + cartType;
     } else {
     } else {

@@ -120,7 +120,7 @@
     .freebie-and-advance-buy {
     .freebie-and-advance-buy {
         padding: 20rem / $pxConvertRem;
         padding: 20rem / $pxConvertRem;
         font-size: 24rem / $pxConvertRem;
         font-size: 24rem / $pxConvertRem;
-        border-bottom: 1px solid #e0e0e0;
+        //border-bottom: 1px solid #e0e0e0;
 
 
         > li {
         > li {
             box-sizing: border-box;
             box-sizing: border-box;
@@ -152,6 +152,7 @@
     }
     }
 
 
     .activity-title{
     .activity-title{
+        border-top: 1px solid #e0e0e0;
         font-size: 32rem / $pxConvertRem;
         font-size: 32rem / $pxConvertRem;
         padding: 20rem / $pxConvertRem 20rem / $pxConvertRem 0;
         padding: 20rem / $pxConvertRem 20rem / $pxConvertRem 0;
     }
     }

@@ -42,6 +42,7 @@
 {{/if}}
 {{/if}}
 {{/ promotionInfo}}
 {{/ promotionInfo}}
 
 
+{{#if promotionInfo}}
 <div class="activity">
 <div class="activity">
     <ul>
     <ul>
         {{# promotionInfo}}
         {{# promotionInfo}}
@@ -49,6 +50,7 @@
         {{/ promotionInfo}}
         {{/ promotionInfo}}
     </ul>
     </ul>
 </div>
 </div>
+{{/if}}
 
 
 <div class="price-compute">
 <div class="price-compute">
     <p>
     <p>