Merge branch 'feature/cartTips' into release/5.5

@@ -592,7 +592,10 @@ const formatCart = (cartDataRet, uid, shoppingKey, cartDelList) => {
 
         promotionInfos: formatPromotionInfos(_.get(ordCartData, 'promotion_info'), goodsList),
         stat: formatShoppingCartData(_.get(ordCartData, 'shopping_cart_data')),
-        ensureUrl: helpers.urlFormat('/cart/ensure')
+        ensureUrl: helpers.urlFormat('/cart/ensure'),
+
+        // 免运费提示
+        tips: _.get(ordCartData, 'shipping_cost_prompt.shipping_cost_tips', '')
     };
 
     let advStat = result.advanceCart.stat;

@@ -21,7 +21,7 @@
         </div>
 
         {{#advanceCart}}
-            <div class="mb40" data-role="advance">
+            <div class="mb20" data-role="advance">
                 <!-- 预售商品   -->
                 <div class="pre-sell">
                     <code>预售商品</code>预售商品不参加活动，不可使用优惠券，不同上市期的商品我们将为您先到先发。
@@ -73,6 +73,11 @@
 
         {{#ordinaryCart}}
             <div data-role="ordinary">
+            <!-- 预售商品   -->
+                <div class="pre-sell ordinary-sell">
+                    <code>普通商品</code> {{tips}}
+                </div>
+
             {{#pools}}
                 <div class="promotion-pool {{#unless @first}}mt20{{/unless}}" data-role="promotion-pool">
                     {{#if promotionInfos}}

@@ -274,6 +274,9 @@
             margin-right: 30px;
         }
     }
+   .ordinary-sell {
+       padding-top: 0px;
+   }
 
    .gift-sell {
        border: 1px solid #e0e0e0;