merge-bundle-to-cart

@@ -307,6 +307,7 @@ const modify = (req, res, next) => {
         newProductSku = req.body.new_product_sku || 0,
         newProductSku = req.body.new_product_sku || 0,
         buyNumber = req.body.buy_number || 0,
         buyNumber = req.body.buy_number || 0,
         activity_id = req.body.activity_id,
         activity_id = req.body.activity_id,
+        batch_no = req.body.batch_no,
         selected = req.body.selected;
         selected = req.body.selected;
 
 
     if (!oldProductSku || !newProductSku) {
     if (!oldProductSku || !newProductSku) {
@@ -323,7 +324,8 @@ const modify = (req, res, next) => {
         new_product_sku: newProductSku,
         new_product_sku: newProductSku,
         buy_number: buyNumber,
         buy_number: buyNumber,
         selected: selected,
         selected: selected,
-        activity_id: activity_id
+        activity_id: activity_id,
+        batch_no: batch_no
     }], shoppingKey).then(data => {
     }], shoppingKey).then(data => {
         data ? res.json(data) : res.status(400).json({
         data ? res.json(data) : res.status(400).json({
             message: '操作失败'
             message: '操作失败'

@@ -14,13 +14,10 @@ const domains = {
     liveApi: 'http://testapi.live.yohops.com:9999/',
     liveApi: 'http://testapi.live.yohops.com:9999/',
     singleApi: 'http://api-test3.yohops.com:9999/',
     singleApi: 'http://api-test3.yohops.com:9999/',
 
 
-    // api: 'http://api-test3.yohops.com:9999/',
-    // service: 'http://service-test3.yohops.com:9999/',
-    api: 'http://api.yoho.cn/',
-    service: 'http://service.yoho.cn/',
+    api: 'http://api-test3.yohops.com:9999/',
+    service: 'http://service-test3.yohops.com:9999/',
     global: 'http://api-global.yohobuy.com',
     global: 'http://api-global.yohobuy.com',
 
 
-
     // liveApi: 'http://api.live.yoho.cn/',
     // liveApi: 'http://api.live.yoho.cn/',
     // singleApi: 'http://single.yoho.cn/',
     // singleApi: 'http://single.yoho.cn/',
 
 

@@ -366,9 +366,12 @@ let goodObj = {
                     },
                     },
                     url;
                     url;
 
 
-                // 套餐需要 activity_id
+                // 套餐需要 activity_id batch_no
                 if (data.activity_id) {
                 if (data.activity_id) {
-                    Object.assign(goodData, {activity_id: data.activity_id});
+                    Object.assign(goodData, {
+                        activity_id: data.activity_id,
+                        batch_no: data.batch_no
+                    });
                 }
                 }
 
 
                 if (promotionId) {
                 if (promotionId) {
@@ -492,6 +495,7 @@ let goodObj = {
             promotionId;
             promotionId;
         let isSelected = $(e.delegateTarget).find('.chk.select').hasClass('checked');
         let isSelected = $(e.delegateTarget).find('.chk.select').hasClass('checked');
         let activityId = $(e.delegateTarget).data('activityid');
         let activityId = $(e.delegateTarget).data('activityid');
+        let batchNo = $(e.delegateTarget).data('poolbatchno');
 
 
         id = $(e.delegateTarget).data('id');
         id = $(e.delegateTarget).data('id');
         count = $(e.delegateTarget).find('.good-num').val();
         count = $(e.delegateTarget).find('.good-num').val();
@@ -517,7 +521,10 @@ let goodObj = {
 
 
                 // 套餐需要传 activityId
                 // 套餐需要传 activityId
                 if (activityId) {
                 if (activityId) {
-                    Object.assign(data, {activity_id: activityId});
+                    Object.assign(data, {
+                        activity_id: activityId,
+                        batch_no: batchNo
+                    });
                 }
                 }
                 self.showEditPannelWithSku(data, id, isSelected, canEditNum, promotionId, e);
                 self.showEditPannelWithSku(data, id, isSelected, canEditNum, promotionId, e);
             },
             },