easy-payment-ok

@@ -270,7 +270,7 @@ class CartData
         // 购买套装和量贩商品时数据处理
         if (!empty($activityInfo)) {
             $param['activity_id'] = $activityInfo['activity_id'];
-            $param['product_sku_list'] = $activityInfo['product_sku_list'];
+            $param['product_sku_list'] = json_encode($activityInfo['product_sku_list']);
         }
 
         $param['client_secret'] = Sign::getSign($param);

@@ -324,7 +324,11 @@ function submitOrder() {
             }
 
             window.setCookie('order-info', '');
-            window.setCookie('bundle-info', '');
+            window.setCookie('activity-info', '', {
+                expires: 'Session',
+                path: '/',
+                domain: '.m.yohobuy.com'
+            });
             window.location.href = url;
         } else if (res.message) {
             tip.show(res.message);

@@ -347,7 +347,7 @@ class IndexController extends AbstractAction
         $isAjax = $this->isAjax();
 
         if ($this->get('activityType', null) === 'bundle') {
-            $activityInfo = $this->getCookie('activity-info', null);
+            $activityInfo = json_decode($this->getCookie('activity-info', null), true);
 
             /* TODO TAR 161205 $orderInfo 需留意要不要在 COOKIE 中存新字段，以防止影响现有购物流程 */
             $order = CartModel::cartPay($uid, 'bundle', $orderInfo, null, null, null, null,
@@ -701,7 +701,7 @@ class IndexController extends AbstractAction
 
             /* tar modified 161206 套餐 */
             if ($this->post('activityType', null) === 'bundle') {
-                $activityInfo = $this->getCookie('activity-info', null);
+                $activityInfo = json_decode($this->getCookie('activity-info', null), true);
                 $result = CartModel::orderSub($uid, $addressId, 'bundle', $deliveryTime, $deliveryWay, $invoices, $paymentId, $paymentType, $remark, $couponCode, $yohoCoin, null, $unionKey, $userAgent, $activityInfo);
             } else {
                 $result = CartModel::orderSub($uid, $addressId, $cartType, $deliveryTime, $deliveryWay, $invoices, $paymentId, $paymentType, $remark, $couponCode, $yohoCoin, $skuList, $unionKey, $userAgent);