m

@@ -367,6 +367,7 @@
                 <i class="iconfont">&#xe60d;</i>
                 <i class="iconfont">&#xe60d;</i>
             </div>
             </div>
             <div class="content goods-select-content">
             <div class="content goods-select-content">
+                <div class="detail-body"></div>
             </div>
             </div>
         </div>
         </div>
     </div>
     </div>

-<div class="detail-body">
-    <div class="slide-img">
-        <p class="sell-class-title"><!--选赠品:-->
-            <em class="slide-img-title">
-                <span class="active">{{promotionTitle}}</span>
-                <!--<code class="spacing">|</code>
-                <span>59元加价购</span>
-                <code class="spacing">|</code>
-                <span>99元加价购</span>-->
-            </em>
-        </p>
-        <div class="side-img-dd">
-            <ul class="img-list">
-                {{#each goodsList}}
-                    <li class="img-item {{#if active}}active{{/if}}"
-                        data-id="{{id}}"
-                        data-skn="{{skn}}"
-                        data-ispricegift="{{isPriceGift}}"
-                        data-isgift="{{isGift}}">
-                        <span class="hide goods-id">{{goods_id}}</span>
-                        <div class="good">
-                            <a href="javascript:void(0)" target="_blank">   {{!--{{link}}--}}
-                                <img class="lazy" src="{{imgCover}}"/>
-                            </a>
-                        </div>
-                        {{#if_cond ../selectedSkn '==' skn}}<i class="iconfont checked">&#xe6cb;</i>{{/if_cond}}
-                    </li>
-                {{/each}}
-            </ul>
-            <div class="img-brand-switch">
-                <a class="prev iconfont" href="javascript:;">&#xe609;</a>
-                <a class="next iconfont" href="javascript:;">&#xe608;</a>
-            </div>
+<div class="slide-img">
+    <p class="sell-class-title">
+        {{#if isGift}}选赠品:{{/if}}<!--选赠品:-->
+        {{#if isPriceGift}}{{promotionTitle}}{{/if}}
+        {{!--<em class="slide-img-title">
+            <span class="active">{{promotionTitle}}</span>
+            <!--<code class="spacing">|</code>
+            <span>59元加价购</span>
+            <code class="spacing">|</code>
+            <span>99元加价购</span>-->
+        </em>--}}
+    </p>
+    <div class="side-img-dd">
+        <ul class="img-list">
+            {{#each goodsList}}
+                <li class="img-item {{#if active}}active{{/if}}"
+                    data-id="{{id}}"
+                    data-skn="{{skn}}"
+                    data-ispricegift="{{isPriceGift}}"
+                    data-isgift="{{isGift}}">
+                    <span class="hide goods-id">{{goods_id}}</span>
+                    <div class="good">
+                        <a href="javascript:void(0)" target="_blank">   {{!--{{link}}--}}
+                            <img class="lazy" src="{{imgCover}}"/>
+                        </a>
+                    </div>
+                    {{#if_cond ../selectedSkn '==' skn}}<i class="iconfont checked">&#xe6cb;</i>{{/if_cond}}
+                </li>
+            {{/each}}
+        </ul>
+        <div class="img-brand-switch">
+            <a class="prev iconfont" href="javascript:;">&#xe609;</a>
+            <a class="next iconfont" href="javascript:;">&#xe608;</a>
         </div>
         </div>
     </div>
     </div>
-    <div class="product-detail-info" data-promotionid="{{promotionId}}" {{#if swap}}data-swap="{{swap}}"{{/if}}>
-        {{#productInfo}}
-            {{> cart-product-info-tpl}}
-        {{/productInfo}}
-    </div>
+</div>
+<div class="product-detail-info"
+     data-promotionid="{{promotionId}}"
+     data-maxselectnum="{{maxSelectNumber}}"
+     {{#if swap}}data-swap="{{swap}}"{{/if}}>
+    {{#productInfo}}
+        {{> cart-product-info-tpl}}
+    {{/productInfo}}
 </div>
 </div>

@@ -30,7 +30,7 @@
         <div class="price">
         <div class="price">
             {{#if salePrice}}
             {{#if salePrice}}
                 <span class="newprice">现价：<b class="promotion-price">¥{{salePrice}}</b></span>
                 <span class="newprice">现价：<b class="promotion-price">¥{{salePrice}}</b></span>
-                <span class="oldprice">原价：<del>¥{{marketPrice}}</del></span>
+                <span class="oldprice">活动价：<del>¥{{marketPrice}}</del></span>
             {{^}}
             {{^}}
                 <span class="newprice {{#presalePrice}}none{{/presalePrice}}">原价：<b class="promotion-price">¥{{marketPrice}}</b></span>
                 <span class="newprice {{#presalePrice}}none{{/presalePrice}}">原价：<b class="promotion-price">¥{{marketPrice}}</b></span>
             {{/if}}
             {{/if}}

@@ -19,7 +19,7 @@ var $ = require('yoho-jquery'),
         '[data-role=pg-resel-btn]'];
         '[data-role=pg-resel-btn]'];
 
 
 function renderAndShowGiftWin(plist) {
 function renderAndShowGiftWin(plist) {
-    $goodsSelWin.find('.content').empty().html(giftsWinTpl(plist));
+    $goodsSelWin.find('.detail-body').empty().html(giftsWinTpl(plist));
     capi.showMDialog('#Y_goodsSelectWinDialog');
     capi.showMDialog('#Y_goodsSelectWinDialog');
 }
 }
 
 

@@ -158,7 +158,7 @@ $('.bottom-tab-slide').on('click', '.bottom-title', function() {
 function showTogetherSelWin(id, skn) {
 function showTogetherSelWin(id, skn) {
 
 
     capi.getProductInfo(id, skn).then(res => {
     capi.getProductInfo(id, skn).then(res => {
-        $goodsSelWin.find('.content').empty().append(productInfoTpl(res));
+        $goodsSelWin.find('.detail-body').empty().append(productInfoTpl(res));
     });
     });
 
 
     capi.showMDialog('#Y_goodsSelectWinDialog');
     capi.showMDialog('#Y_goodsSelectWinDialog');