Merge branch 'refs/heads/develop'

@@ -298,8 +298,10 @@ const modifyProductNum = (req, res, next) => {
     let cartDelList = helper.getCartDelList(req, res);
     let cartDelList = helper.getCartDelList(req, res);
     let batchNo = req.body.batch_no || null;
     let batchNo = req.body.batch_no || null;
     let activityId = req.body.activity_id || null;
     let activityId = req.body.activity_id || null;
+    let poolType = (+req.body.pool_type) || null;
 
 
-    if (activityId) {
+    if (activityId && batchNo && poolType === 3) {
+        // 套餐商品计算
         return req.ctx(service).bundleNumData({
         return req.ctx(service).bundleNumData({
             uid: uid,
             uid: uid,
             batch_no: batchNo,
             batch_no: batchNo,

 {
 {
   "name": "yohobuy-node",
   "name": "yohobuy-node",
-  "version": "6.9.16",
+  "version": "6.9.18",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {

@@ -482,7 +482,8 @@ Cart = {
         capi.cartItemNumChg($.extend(countJSON, {
         capi.cartItemNumChg($.extend(countJSON, {
             sku: $item.data('id'),
             sku: $item.data('id'),
             batch_no: $item.data('batch-no'),
             batch_no: $item.data('batch-no'),
-            activity_id: $item.data('pool-id')
+            activity_id: $item.data('pool-id'),
+            pool_type: $item.data('pool-type')
         }));
         }));
 
 
         if (!$btn.hasClass('cart-item-checked') && !$btn.hasClass('presale')) {
         if (!$btn.hasClass('cart-item-checked') && !$btn.hasClass('presale')) {

@@ -83,6 +83,7 @@ ColorPanelAction = {
         var promotionId = $item.data('promotionid');
         var promotionId = $item.data('promotionid');
         var poolId = $item.data('pool-id');
         var poolId = $item.data('pool-id');
         var batchNo = $item.data('batch-no');
         var batchNo = $item.data('batch-no');
+        var poolType = $item.data('pool-type');
 
 
         // 没有重新选择颜色-尺码，则不用重新请求显示
         // 没有重新选择颜色-尺码，则不用重新请求显示
         if (!oldSku || !newSku || oldSku === newSku) {
         if (!oldSku || !newSku || oldSku === newSku) {
@@ -103,7 +104,7 @@ ColorPanelAction = {
         };
         };
 
 
         // 套餐编辑尺码
         // 套餐编辑尺码
-        if (poolId) {
+        if (poolId && +poolType === 3) {
             $.extend(swapData, {
             $.extend(swapData, {
                 activity_id: poolId,
                 activity_id: poolId,
                 batch_no: batchNo
                 batch_no: batchNo