Merge branch 'release/5.3.1' into 'gray'

套餐埋点修改 See merge request !83

Merge branch 'release/5.3.1' into 'gray'
套餐埋点修改 See merge request !83
郭成尧
Commit 5ca49ee06a57cf2d332429fb215d28e1f0789279 2 parents 12918c1b cab9f67a
Showing 5 changed files with 32 additions and 24 deletions
apps/product/controllers/new-detail.js
apps/product/models/new-detail.js
public/js/product/bundle.page.js
public/js/product/new-detail.page.js
public/js/product/shop/shop-base.js
--- a/apps/product/controllers/new-detail.js
View file @5ca49ee
+++ b/apps/product/controllers/new-detail.js
View file @5ca49ee
@@ -66,6 +66,7 @@ const newDetail = {
         let productId = req.query.productId;
         let skn = req.query.skn;
         let bundleType = req.query.bundleType;
+        let gid = req.query.gid;
         if ([brandId, productId].some(val => !val)) {
             return next();
@@ -75,7 +76,8 @@ const newDetail = {
             skn,
             brandId,
             productId,
-            bundleType
+            bundleType,
+            gid
         }).then(result => {
             if (_.isEmpty(result)) {
                 return next();
--- a/apps/product/models/new-detail.js
View file @5ca49ee
+++ b/apps/product/models/new-detail.js
View file @5ca49ee
@@ -217,14 +217,14 @@ const tool = {
      * @param skn
      * @returns {{}}
      */
-    processBundle(bundleData, skn) {
+    processBundle(bundleData, skn, gid) {
         // let discountPrice = (_.get(bundleData, 'bundleInfo.salesPrice', 0) -
         // _.get(bundleData, 'bundleInfo.discountPrice', 0));
         // let priceShow = _.split(discountPrice + '', '.')[0];
         return {
             title: '优惠套装',
-            href: helpers.urlFormat('/product/bundle/detail', {skn: skn}),
+            href: helpers.urlFormat('/product/bundle/detail', {skn: skn, gid: gid}),
             description: '立省¥' + _.get(bundleData, 'bundleInfo.subPrice', 0),
             productList: productProcess.processProductList(bundleData && bundleData.productList)
         };
@@ -292,6 +292,7 @@ const newDetail = {
         let brandId = params.brandId;
         let productId = params.productId;
         let skn = params.skn;
+        let gid = params.gid;
         let apiArray = [
             this.queryShopsByBrandId(brandId), // 0 品牌信息
@@ -329,7 +330,7 @@ const newDetail = {
             /* 套装 */
             if (bundleData && _.get(bundleData, 'bundleInfo.discountType', null) === 1) {
-                finalResult.bundleData = tool.processBundle(bundleData, skn);
+                finalResult.bundleData = tool.processBundle(bundleData, skn, gid);
             }
             /* 量贩 */
--- a/public/js/product/bundle.page.js
View file @5ca49ee
+++ b/public/js/product/bundle.page.js
View file @5ca49ee
@@ -27,26 +27,31 @@ $(function() {
 $selectBtn.on('touchend', function() {
     var self = $(this);
+    $.post('/product/detail/info', {
+        id: self.data('id'),
+        productSkn: self.data('skn')
+    }, function(data) {
+        chosePanelRender(data);
+        chosePanel.init(self.data('skn'));
+        chosePanel.show();
+    });
+});
+
+$('.goods-img').on('touchend', function() {
+    var packGood = $(this).parent().find('.select-btn');
+
     if (window._yas && window._yas.sendCustomInfo) {
         window._yas.sendCustomInfo({
             op: 'YB_GDS_PACKAGE_GOODS_C',
             param: JSON.stringify({
                 C_ID: window._ChannelVary[window.cookie('_Channel')],
-                PRD_ID: window.queryString.id,
-                PACKAGE_GOODS: self.data('id'),
-                PACKAGE_INDEX: self.data('index')
+                PRD_ID: window.queryString.gid,
+                PACKAGE_GOODS: packGood.data('id'),
+                PACKAGE_INDEX: packGood.data('index') + 1
             })
         }, true);
     }
-    $.post('/product/detail/info', {
-        id: self.data('id'),
-        productSkn: self.data('skn')
-    }, function(data) {
-        chosePanelRender(data);
-        chosePanel.init(self.data('skn'));
-        chosePanel.show();
-    });
 });
 /**
@@ -57,7 +62,7 @@ $buyNowBtn.on('click', function() {
         bundleId = $('#activityId').val(),
         gskn = $('span[id^="gskn"]'),
         gsknSelected = false,
-        yasGid = '';
+        yasGid = [];
     if (gskn.length < 1) {
         tip.show('非法请求！');
@@ -79,7 +84,7 @@ $buyNowBtn.on('click', function() {
             buy_number: 1
         });
-        yasGid += $(this).data('id') + ',';
+        yasGid.push($(this).data('id'));
     });
     if (window._yas && window._yas.sendCustomInfo) {
@@ -88,7 +93,7 @@ $buyNowBtn.on('click', function() {
             param: JSON.stringify({
                 C_ID: window._ChannelVary[window.cookie('_Channel')],
                 PRD_ID: window.queryString.id,
-                PACKAGE_GOODS: yasGid
+                PACKAGE_GOODS:  yasGid.join(',')
             })
         }, true);
     }
@@ -99,7 +104,6 @@ $buyNowBtn.on('click', function() {
             activity_id: bundleId
         }), actCkOpthn);
-        window.location.href =
-            '/cart/index/orderEnsure?cartType=bundle&activityType=bundle';
+        // window.location.href = '/cart/index/orderEnsure?cartType=bundle&activityType=bundle';
     }
 });
--- a/public/js/product/new-detail.page.js
View file @5ca49ee
+++ b/public/js/product/new-detail.page.js
View file @5ca49ee
@@ -295,7 +295,8 @@ setTimeout(() => {
             skn: skn,
             productId: productId,
             brandId: brandId,
-            bundleType: bundleType
+            bundleType: bundleType,
+            gid: goodsId
         }).done(function(info) {
             // step1: render dom
             renderFeedbackStore(info, $feedbackStore);
--- a/public/js/product/shop/shop-base.js
View file @5ca49ee
+++ b/public/js/product/shop/shop-base.js
View file @5ca49ee
@@ -433,7 +433,7 @@ function search(opt) {
                         if (window._yas && window._yas.sendCustomInfo) {
                             window._yas.sendCustomInfo({
-                                op: 'YB_BRAND_GOODS_LIST_C',
+                                op: 'YB_BRAND_GOODS_LIST_L',
                                 param: JSON.stringify(yasparm)
                             }, true);
                         }
@@ -463,7 +463,7 @@ function search(opt) {
                     setTimeout(function() {
                         if (window._yas && window._yas.sendCustomInfo) {
                             window._yas.sendCustomInfo({
-                                op: 'YB_BRAND_GOODS_LIST_C',
+                                op: 'YB_BRAND_GOODS_LIST_L',
                                 param: JSON.stringify(yasparm)
                             }, true);
                         }
@@ -503,7 +503,7 @@ function search(opt) {
                     setTimeout(function() {
                         if (window._yas && window._yas.sendCustomInfo) {
                             window._yas.sendCustomInfo({
-                                op: 'YB_BRAND_GOODS_LIST_C',
+                                op: 'YB_BRAND_GOODS_LIST_L',
                                 param: JSON.stringify(yasparm)
                             }, true);
                         }