m

@@ -132,10 +132,13 @@
 
 
                                                     {{>cart-promotion-btn}}
                                                     {{>cart-promotion-btn}}
 
 
-                                                    {{#if isPriceGift}}
+                                                    {{!--{{#if isPriceGift}}
                                                         {{#if isNotReach}}
                                                         {{#if isNotReach}}
                                                             <a class="btn-clear blue order-pay-link" target="_blank" href="{{promotionPageUrl}}">去凑单&nbsp;></a>
                                                             <a class="btn-clear blue order-pay-link" target="_blank" href="{{promotionPageUrl}}">去凑单&nbsp;></a>
                                                         {{/if}}
                                                         {{/if}}
+                                                    {{/if}}--}}
+                                                    {{#if isNotReach}}
+                                                        <a class="btn-clear blue order-pay-link" target="_blank" href="{{promotionPageUrl}}">去凑单&nbsp;></a>
                                                     {{/if}}
                                                     {{/if}}
 
 
                                                     {{!--{{> cart-sel-gift-tpl }}--}}
                                                     {{!--{{> cart-sel-gift-tpl }}--}}
@@ -320,8 +323,6 @@
         </textarea>
         </textarea>
         </div>
         </div>
 
 
-        {{#if cart.isEmpty}}
-
         <div class="bottom-tab bottom-tab-slide">
         <div class="bottom-tab bottom-tab-slide">
             <span class="bottom-title {{#if cart.deleteShop}}cur{{/if}}  {{#unless cart.deleteShop}}none{{/unless}}">凑单商品</span>
             <span class="bottom-title {{#if cart.deleteShop}}cur{{/if}}  {{#unless cart.deleteShop}}none{{/unless}}">凑单商品</span>
             <span class="bottom-title {{#unless cart.deleteShop}}cur{{/unless}}">为您优选</span>
             <span class="bottom-title {{#unless cart.deleteShop}}cur{{/unless}}">为您优选</span>
@@ -364,7 +365,6 @@
             </div>
             </div>
         </div>
         </div>
         {{> cart-together-tpl }}
         {{> cart-together-tpl }}
-        {{/if}}
     {{/unless}}
     {{/unless}}
 
 
     <div class="loading"><span></span>请稍后...</div>
     <div class="loading"><span></span>请稍后...</div>

@@ -43,6 +43,9 @@
                     {{#promotionInfos}}
                     {{#promotionInfos}}
                         <li>{{promotionTitle}}
                         <li>{{promotionTitle}}
                             {{>cart-promotion-btn}}
                             {{>cart-promotion-btn}}
+                            {{#if isNotReach}}
+                                <a class="btn-clear blue order-pay-link" target="_blank" href="{{promotionPageUrl}}">去凑单&nbsp;></a>
+                            {{/if}}
                         </li>
                         </li>
                     {{/promotionInfos}}
                     {{/promotionInfos}}
                 </ul>
                 </ul>

 <div class="yoho-dialog cart-preSell-dialog"
 <div class="yoho-dialog cart-preSell-dialog"
      data-role="cart-pre-sell"
      data-role="cart-pre-sell"
      style="margin-top:-200px;margin-left: -350px; display:none;">
      style="margin-top:-200px;margin-left: -350px; display:none;">
+
     <span class="close">
     <span class="close">
         <i class="iconfont">&#xe60d;</i>
         <i class="iconfont">&#xe60d;</i>
     </span>
     </span>
@@ -8,7 +9,7 @@
         <div class="detail-body">
         <div class="detail-body">
             {{#advanceCart}}
             {{#advanceCart}}
                 <div class="slide-img">
                 <div class="slide-img">
-                    <p class="sell-class-title">预售商品<strong>3</strong>&nbsp;&nbsp;&nbsp;总金额<strong>￥809.00</strong></p>
+                    <p class="sell-class-title">预售商品<strong>{{stat.selectedGoodsCount}}</strong>&nbsp;&nbsp;&nbsp;总金额<strong>￥809.00</strong></p>
                     <div class="side-img-dd">
                     <div class="side-img-dd">
                         <div class="side-img-container">
                         <div class="side-img-container">
                             <ul class="img-list">
                             <ul class="img-list">

@@ -175,6 +175,13 @@ $(function() {
         $('.img-brand-switch .next').trigger('click');
         $('.img-brand-switch .next').trigger('click');
     });
     });
 
 
+    // 商品子优惠显示和隐藏
+    $('.sale-info').mouseenter(function() {
+        $(this).addClass('active').children('ul').removeClass('none');
+    }).mouseleave(function() {
+        $(this).removeClass('active').children('ul').addClass('none');
+    });
+
 
 
     isCheckAll();
     isCheckAll();
     isCheckFav();
     isCheckFav();
@@ -208,3 +215,4 @@ $cartGoodsDetail.on('click', '.btn-favCount', function() {
 require('./cart-action');
 require('./cart-action');
 require('./cart-color-panel');
 require('./cart-color-panel');
 require('./cart-goods-win');
 require('./cart-goods-win');
+require('./cart-together');