Merge branch 'feature/bundleToCart' into release/5.6

@@ -2,7 +2,7 @@
  * @Author: Targaryen
  * @Author: Targaryen
  * @Date: 2017-04-06 16:51:52
  * @Date: 2017-04-06 16:51:52
  * @Last Modified by: Targaryen
  * @Last Modified by: Targaryen
- * @Last Modified time: 2017-04-13 15:45:30
+ * @Last Modified time: 2017-04-13 20:22:24
  */
  */
 
 
 const $ = require('yoho-jquery');
 const $ = require('yoho-jquery');
@@ -15,8 +15,6 @@ let bundle = {
         let self = this;
         let self = this;
 
 
         let $bundle = $('.bundle'); // 限定作用域
         let $bundle = $('.bundle'); // 限定作用域
-        let activityId = $bundle.data('activityid');
-        let batchNo = $bundle.data('poolbatchno');
 
 
         self.handle = handle;
         self.handle = handle;
 
 
@@ -31,8 +29,8 @@ let bundle = {
             });
             });
 
 
             self.decrBundle({
             self.decrBundle({
-                activity_id: activityId,
-                batch_no: batchNo,
+                activity_id: $(e.delegateTarget).data('activityid'),
+                batch_no: $(e.delegateTarget).data('poolbatchno'),
                 sku_ids: skuIdsArray.join(',')
                 sku_ids: skuIdsArray.join(',')
             }, e);
             }, e);
         });
         });
@@ -48,8 +46,8 @@ let bundle = {
             });
             });
 
 
             self.incrBundle({
             self.incrBundle({
-                activity_id: activityId,
-                batch_no: batchNo,
+                activity_id: $(e.delegateTarget).data('activityid'),
+                batch_no: $(e.delegateTarget).data('poolbatchno'),
                 sku_ids: skuIdsArray.join(',')
                 sku_ids: skuIdsArray.join(',')
             }, e);
             }, e);
         });
         });

@@ -169,6 +169,7 @@ const formatValidPool = (pool) => {
     let poolTemp = {
     let poolTemp = {
         poolBuyNumber: pool.pool_buy_number,
         poolBuyNumber: pool.pool_buy_number,
         poolId: pool.pool_id,
         poolId: pool.pool_id,
+        poolBatchNo: pool.pool_batch_no, // 套餐批次
         poolStorageNumber: pool.pool_storage_number,
         poolStorageNumber: pool.pool_storage_number,
         poolTitle: pool.pool_title,
         poolTitle: pool.pool_title,
         selected: pool.selected,
         selected: pool.selected,