Merge branch 'feature/freeShipping' into 'release/6.2'

预售提示修改



See merge request !993

@@ -40,7 +40,7 @@
     {{/if}}
     {{#if advanceCart}}
     <div class="cart-content advance-good active">
-        {{#commonCart}}
+        {{#preSellCart}}
             <div class="tips clearfix">
                 <div>
                     {{#if shipCost.shippingTip}}
@@ -55,8 +55,6 @@
                 <span class="txt">由于商品上市期不同，先到的将先发货</span>
                 <span class="txt">预售商品不参加活动，不可使用优惠券</span>
             </p>
-        {{/commonCart}}
-        {{#preSellCart}}
             {{> cart-content}}
         {{/preSellCart}}
     </div>