Merge branch 'feature/package' into 'release/5.5'

Feature/package



See merge request !373

@@ -39,7 +39,7 @@ const detail = (params, isApp) => {
 
 
             return {
             return {
                 bundleDatas: _.map(result.data, (bundle, index) => {
                 bundleDatas: _.map(result.data, (bundle, index) => {
-                    let query = {skn: params.skn, index: index + 1};
+                    let query = {bundle_skn: params.skn || params.bundle_skn, productId: params.productId, index: index + 1};
 
 
                     if (isApp) {
                     if (isApp) {
                         query.app_version = isApp;
                         query.app_version = isApp;

@@ -223,13 +223,13 @@ const tool = {
      * @param skn
      * @param skn
      * @returns {{}}
      * @returns {{}}
      */
      */
-    processBundle(bundleData, skn, gid, index) {
+    processBundle(bundleData, skn, productId, index) {
         let subPrice = _.get(bundleData, 'bundleInfo.subPrice', 0);
         let subPrice = _.get(bundleData, 'bundleInfo.subPrice', 0);
 
 
         return {
         return {
             tabName: _.get(bundleData, 'bundleInfo.tabName') || '',
             tabName: _.get(bundleData, 'bundleInfo.tabName') || '',
             title: _.get(bundleData, 'bundleInfo.bundleName') || '优惠套装',
             title: _.get(bundleData, 'bundleInfo.bundleName') || '优惠套装',
-            href: helpers.urlFormat('/product/bundle/detail', {skn: skn, gid: gid, index: index}),
+            href: helpers.urlFormat('/product/bundle/detail', {skn: skn, productId: productId, index: index}),
             description: subPrice ? '立省¥' + subPrice : 0,
             description: subPrice ? '立省¥' + subPrice : 0,
             productList: productProcess.processProductList(bundleData && bundleData.productList)
             productList: productProcess.processProductList(bundleData && bundleData.productList)
         };
         };
@@ -297,7 +297,6 @@ const newDetail = {
         let brandId = params.brandId;
         let brandId = params.brandId;
         let productId = params.productId;
         let productId = params.productId;
         let skn = params.skn;
         let skn = params.skn;
-        let gid = params.gid;
 
 
         let apiArray = [
         let apiArray = [
             this.queryShopsByBrandId(brandId), // 0 品牌信息
             this.queryShopsByBrandId(brandId), // 0 品牌信息
@@ -338,7 +337,7 @@ const newDetail = {
                 tool.processDiscount(finalResult, _.find(bundleDatas, data => data.discountType === 2));
                 tool.processDiscount(finalResult, _.find(bundleDatas, data => data.discountType === 2));
             } else { /* 套装 */
             } else { /* 套装 */
                 finalResult.bundleDatas = _.map(bundleDatas, (data, index) => {
                 finalResult.bundleDatas = _.map(bundleDatas, (data, index) => {
-                    return tool.processBundle(data, skn, gid, ++index);
+                    return tool.processBundle(data, skn, productId, ++index);
                 });
                 });
             }
             }
 
 

@@ -52,4 +52,5 @@
         <input type="hidden" id="shareTitle" value="{{title}}">
         <input type="hidden" id="shareTitle" value="{{title}}">
         <input type="hidden" id="shareUrl" value="{{url}}">
         <input type="hidden" id="shareUrl" value="{{url}}">
     {{/shareInfo}}
     {{/shareInfo}}
+    <input type="hidden" id="no-download" value="1" >
 </div>
 </div>

@@ -562,3 +562,4 @@ $(window).scroll(function() {
         $('.address-bottom').hide();
         $('.address-bottom').hide();
     }
     }
 });
 });
+

@@ -75,7 +75,8 @@ $('.goods-img').on('touchend', function() {
             op: 'YB_GDS_PACKAGE_GOODS_C',
             op: 'YB_GDS_PACKAGE_GOODS_C',
             param: JSON.stringify({
             param: JSON.stringify({
                 C_ID: window._ChannelVary[window.cookie('_Channel')],
                 C_ID: window._ChannelVary[window.cookie('_Channel')],
-                PRD_ID: window.queryString.gid,
+                PRD_ID: window.queryString.productId,
+                TAB_ID: window.queryString.index || 1,
                 PACKAGE_GOODS: packGood.data('id'),
                 PACKAGE_GOODS: packGood.data('id'),
                 PACKAGE_INDEX: packGood.data('index') + 1
                 PACKAGE_INDEX: packGood.data('index') + 1
             })
             })
@@ -90,6 +91,17 @@ $('.bundle-tabs').on('click', '.swiper-slide', (e) => {
     if ($tab.hasClass('selected')) {
     if ($tab.hasClass('selected')) {
         return;
         return;
     }
     }
+    if (window._yas && window._yas.sendCustomInfo) {
+        window._yas.sendCustomInfo({
+            op: 'YB_GDS_PACKAGE_TAB_C',
+            param: JSON.stringify({
+                C_ID: window._ChannelVary[window.cookie('_Channel')],
+                PRD_ID: window.queryString.productId,
+                TAB_ID: $(e.currentTarget).data('index') + 1,
+                PACKAGE_DETAIL: 2
+            })
+        }, true);
+    }
     let href = $tab.data('href');
     let href = $tab.data('href');
 
 
     window.location.href = href;
     window.location.href = href;
@@ -133,7 +145,7 @@ $buyNowBtn.on('touchstart', function() {
             op: 'YB_GDS_PACKAGE_BUY_NOW_C',
             op: 'YB_GDS_PACKAGE_BUY_NOW_C',
             param: JSON.stringify({
             param: JSON.stringify({
                 C_ID: window._ChannelVary[window.cookie('_Channel')],
                 C_ID: window._ChannelVary[window.cookie('_Channel')],
-                PRD_ID: window.queryString.id,
+                PRD_ID: window.queryString.productId,
                 PACKAGE_GOODS: yasGid.join(',')
                 PACKAGE_GOODS: yasGid.join(',')
             })
             })
         }, true);
         }, true);
@@ -146,6 +158,6 @@ $buyNowBtn.on('touchstart', function() {
             activity_id: bundleId
             activity_id: bundleId
         }), actCkOpthn);
         }), actCkOpthn);
 
 
-        window.location.href = '/cart/index/new/orderEnsure?cartType=bundle&activityType=bundle';
+        window.location.href = '/cart/index/new/orderEnsure?cartType=bundle&activityType=bundle&productId=' + window.queryString.productId;
     }
     }
 });
 });

@@ -55,8 +55,25 @@ let bundleObj = {
                 $(e.currentTarget).addClass('selected').siblings().removeClass('selected');
                 $(e.currentTarget).addClass('selected').siblings().removeClass('selected');
                 self.bundleIndex = index;
                 self.bundleIndex = index;
                 self.renderProduct();
                 self.renderProduct();
+                if (window._yas && window._yas.sendCustomInfo) {
+                    window._yas.sendCustomInfo({
+                        op: 'YB_GDS_PACKAGE_TAB_C',
+                        param: JSON.stringify({
+                            C_ID: window._ChannelVary[window.cookie('_Channel')],
+                            PRD_ID: $('#productId').val(),
+                            TAB_ID: index + 1,
+                            PACKAGE_DETAIL: 1
+                        })
+                    }, true);
+                }
             }
             }
         });
         });
+
+        $('.bundle-nav').on('click', (e) => {
+            let url = $(e.currentTarget).find('a').attr('href');
+
+            window.location.href = url;
+        });
     },
     },
     regProductSwiper() {
     regProductSwiper() {
         let self = this;
         let self = this;

@@ -10,6 +10,7 @@
     border-bottom: solid 1PX #ddd;
     border-bottom: solid 1PX #ddd;
     overflow: hidden;
     overflow: hidden;
     background-color: #fff;
     background-color: #fff;
+    box-sizing: content-box;
 
 
     &.any {
     &.any {
         padding: 0;
         padding: 0;

@@ -108,6 +108,7 @@
                 color: #b0b0b0;
                 color: #b0b0b0;
                 width: 30px !important;
                 width: 30px !important;
                 height: 40px;
                 height: 40px;
+                text-align: center;
             }
             }
 
 
             .plus-0 {
             .plus-0 {