Merge branch 'feature/oneset' into release/5.3.1

@@ -225,7 +225,7 @@ const tool = {
         return {
         return {
             title: '优惠套装',
             title: '优惠套装',
             href: helpers.urlFormat('/product/bundle/detail', {skn: skn}),
             href: helpers.urlFormat('/product/bundle/detail', {skn: skn}),
-            description: '立省￥' + priceShow + '元',
+            description: '立省￥' + priceShow,
             productList: productProcess.processProductList(bundleData && bundleData.productList)
             productList: productProcess.processProductList(bundleData && bundleData.productList)
         };
         };
     },
     },

@@ -56,7 +56,7 @@
                         </a>
                         </a>
                     </div>
                     </div>
                     {{#if @root.discountBuy}}
                     {{#if @root.discountBuy}}
-                    <span class="left-num-discount" style="color: #e10;position: absolute;top: 0.5rem;left: 9.5rem;overflow: hidden;white-space: nowrap;width: 5.2rem;-o-text-overflow: ellipsis;text-overflow: ellipsis;">{{@root.discountBuy.num}}件起购，享{{@root.discountBuy.discount}}折</span>
+                    <span class="left-num-discount" style="color: #e10;position: absolute;top: 0.5rem;left: 9.5rem;overflow: hidden;white-space: nowrap;width: 5.2rem;-o-text-overflow: ellipsis;text-overflow: ellipsis;">{{@root.discountBuy.num}}件起购享{{@root.discountBuy.discount}}折</span>
                     <input id="mnum" type="hidden" value="{{@root.discountBuy.num}}">
                     <input id="mnum" type="hidden" value="{{@root.discountBuy.num}}">
                     {{^}}
                     {{^}}
                     <span class="left-num"></span>
                     <span class="left-num"></span>

@@ -40,6 +40,13 @@ var $chosePanel = $('.chose-panel'),
 
 
 var productSkn;
 var productSkn;
 
 
+/* 为套装调整样式 */
+function disableShowNum() {
+    $('.num').css('display', 'none');
+    $chosePanel.find('.infos').css('height', '9rem');
+    $chosePanel.find('.main').css('height', '12.8rem');
+}
+
 // 禁用数字编辑
 // 禁用数字编辑
 function disableNumEdit() {
 function disableNumEdit() {
     var $numBtn = $chosePanel.find('.num .btn>.iconfont');
     var $numBtn = $chosePanel.find('.num .btn>.iconfont');
@@ -67,6 +74,7 @@ function init(sknId) {
     curColorIndex = 0;
     curColorIndex = 0;
     curSizeIndex = 0;
     curSizeIndex = 0;
     productSkn = sknId;
     productSkn = sknId;
+    disableShowNum();
 }
 }
 
 
 // 删除面板
 // 删除面板

@@ -2,6 +2,7 @@
     height: 344px;
     height: 344px;
     overflow: hidden;
     overflow: hidden;
     background-color: #fff;
     background-color: #fff;
+    margin-bottom: 30px;
 
 
     .bundle-nav {
     .bundle-nav {
         overflow: hidden;
         overflow: hidden;