Merge branch 'release/6.2' of http://git.yoho.cn/fe/yohobuy-node

@@ -576,6 +576,10 @@ const formatCart = (cartDataRet, uid, shoppingKey, cartDelList) => {
         return result;
     }
 
+
+    // 预售购物车，普通购物车 凑单链接
+    result.moreGoodsLink = '//list.yohobuy.com/new';
+
     result.advanceCart = {
         // 未参加活动的商品
         // goodsList: chelper.formatCartGoods(_.get(advCartData, 'goods_list'), true, false, false, analysisData),
@@ -584,6 +588,8 @@ const formatCart = (cartDataRet, uid, shoppingKey, cartDelList) => {
         soldOuts: formatSoldOuts(_.get(advCartData, 'sold_out_goods_list'), true, analysisData),
         promotionInfos: formatPromotionInfos(_.get(advCartData, 'promotion_info')),
         stat: formatShoppingCartData(_.get(advCartData, 'shopping_cart_data')),
+        isShippingCostFree: _.get(advCartData, 'shipping_cost_prompt.is_shipping_cost_free', '') === 'Y',
+        tips: _.get(advCartData, 'shipping_cost_prompt.shipping_cost_tips', ''),
         ensureUrl: helpers.urlFormat('/cart/ensure', {
             type: 2
         })
@@ -615,6 +621,7 @@ const formatCart = (cartDataRet, uid, shoppingKey, cartDelList) => {
         ensureUrl: helpers.urlFormat('/cart/ensure'),
 
         // 免运费提示
+        isShippingCostFree: _.get(ordCartData, 'shipping_cost_prompt.is_shipping_cost_free', '') === 'Y',
         tips: _.get(ordCartData, 'shipping_cost_prompt.shipping_cost_tips', ''),
 
         // 低档赠品

@@ -13,7 +13,7 @@ module.exports = class extends global.yoho.BaseModel {
 
     signinByPasswordWithAes(area, profile, password, shoppingKey) {
         let param = {
-            method: 'sesame.flowering.higher',
+            method: 'smart.inner.go',
             area: area,
             profile: profile,
             password: aes.aesPwd(password)

@@ -25,7 +25,11 @@
                 <!-- 预售商品   -->
                 <div class="pre-sell pre-sell-title">
                     <i class="cart-item-check iconfont {{#isChecked}}cart-item-checked{{/isChecked}}" data-role="cart-item-check"></i>
-                    <code>预售商品</code>预售商品不参加活动，不可使用优惠券，不同上市期的商品我们将为您先到先发。
+                    <code>预售商品</code>
+                    预售商品购物须知 <i class="iconfont hover-tip">&#xe6c9;
+                        <p class="tip-text">预售商品不参加活动，不可使用优惠券，不同上市期的商品我们将为您先到先发。</p>
+                    </i>{{tips}}
+                    <a class="btn-clear blue order-pay-link" target="_blank" href="{{../moreGoodsLink}}">{{#unless isShippingCostFree}}去凑单{{/unless}}&nbsp;<i class="iconfont">&#xe6ef;</i></a>
                 </div>
 
                 {{#pools}}
@@ -78,6 +82,7 @@
                 <div class="pre-sell ord-sell-title">
                     <i class="cart-item-check iconfont {{#isChecked}}cart-item-checked{{/isChecked}}" data-role="cart-item-check"></i>
                     <code>普通商品</code> {{tips}}
+                    <a class="btn-clear blue order-pay-link" target="_blank" href="{{../moreGoodsLink}}">{{#unless isShippingCostFree}}去凑单{{/unless}}&nbsp;<i class="iconfont">&#xe6ef;</i></a>
                 </div>
 
             {{#pools}}

@@ -337,6 +337,16 @@
         padding: 0 10px !important;
     }
 
+    .pre-sell-title > .order-pay-link,
+    .ord-sell-title > .order-pay-link {
+        float: right;
+        margin-right: 30px;
+
+        i {
+            font-size: 12px;
+        }
+    }
+
     .pre-sell {
         background: #fff;
         color: #818181;
@@ -357,6 +367,25 @@
             display: inline-block;
             margin-right: 30px;
         }
+
+        .hover-tip {
+            margin-right: 16px;
+            cursor: pointer;
+
+            .tip-text {
+                font-size: 12px;
+                position: absolute;
+                z-index: 10;
+                padding: 0 20px;
+                background-color: #fff;
+                border: 1px solid #e0e0e0;
+                display: none;
+            }
+
+            &:hover .tip-text {
+                display: block;
+            }
+        }
     }
 
     .ord-sell {