'order-mai-dian'

@@ -290,6 +290,18 @@ function submitOrder() {
             tip.show('系统繁忙,请稍后再试!');
             tip.show('系统繁忙,请稍后再试!');
             return;
             return;
         }
         }
+
+        /* tar add 161116 */
+        if (res.unionCookie) {
+            if (window._yas && window._yas.sendCustomInfo) {
+                window._yas.sendCustomInfo({
+                    param: JSON.stringify({
+                        unionCookie: res.unionCookie
+                    })
+                }, true);
+            }
+        }
+
         if (res.code === 200) {
         if (res.code === 200) {
             if (payType === 2) {
             if (payType === 2) {
 
 
@@ -299,7 +311,7 @@ function submitOrder() {
                 url = '/home/orders/pay?order_code=' + res.data.order_code;
                 url = '/home/orders/pay?order_code=' + res.data.order_code;
             }
             }
             window.setCookie('order-info', '');
             window.setCookie('order-info', '');
-            window.location.href = url;
+            // window.location.href = url;
         } else if (res.message) {
         } else if (res.message) {
             tip.show(res.message);
             tip.show(res.message);
         }
         }

@@ -639,6 +639,7 @@ class IndexController extends AbstractAction
             /* 判断是否是友盟过来的用户 */
             /* 判断是否是友盟过来的用户 */
             $userAgent = null;
             $userAgent = null;
             $unionKey = '';
             $unionKey = '';
+            $unionInfo = array();
             if (!empty($_COOKIE['mkt_code']) || !empty($_COOKIE['_QYH_UNION'])) {
             if (!empty($_COOKIE['mkt_code']) || !empty($_COOKIE['_QYH_UNION'])) {
 
 
                 /* tar modified 161108 添加新的联盟数据处理逻辑，兼容原有联盟数据处理，
                 /* tar modified 161108 添加新的联盟数据处理逻辑，兼容原有联盟数据处理，
@@ -663,6 +664,10 @@ class IndexController extends AbstractAction
             }
             }
             $result = CartModel::orderSub($uid, $addressId, $cartType, $deliveryTime, $deliveryWay, $invoices, $paymentId, $paymentType, $remark, $couponCode, $yohoCoin, $skuList, $unionKey, $userAgent);
             $result = CartModel::orderSub($uid, $addressId, $cartType, $deliveryTime, $deliveryWay, $invoices, $paymentId, $paymentType, $remark, $couponCode, $yohoCoin, $skuList, $unionKey, $userAgent);
 
 
+            if ($unionInfo && !empty($unionInfo['unionCookie'])) {
+                $result['unionCookie'] = $unionInfo['unionCookie'];
+            }
+
             // 记录下单异常的数据
             // 记录下单异常的数据
             if (empty($result)) {
             if (empty($result)) {
                 $message = 'uid:' . $uid . ',addressId:' . $addressId . ',cartType:' . $cartType . ',deliveryTime:' . $deliveryTime
                 $message = 'uid:' . $uid . ',addressId:' . $addressId . ',cartType:' . $cartType . ',deliveryTime:' . $deliveryTime