'maidian-ok'

@@ -303,21 +303,19 @@ function submitOrder() {
             /* tar add 161116 */
             /* tar add 161116 */
             if (window._yas && window._yas.sendCustomInfo) {
             if (window._yas && window._yas.sendCustomInfo) {
                 window._yas.sendCustomInfo({
                 window._yas.sendCustomInfo({
+                    op: 'YB_SC_TOPAY_CLICK',
                     param: JSON.stringify({
                     param: JSON.stringify({
-                        op: 'YB_SC_TOPAY_CLICK',
-                        param: JSON.stringify({
-                            C_ID: window._ChannelVary[cookie('_Channel')],
-                            ORDER_CODE: res.data.order_code,
-                            PRD_NUM: $('#goods-num').val(),
-                            ORDER_AMOUNT: res.data.order_amount,
-                            UNIONCOOKIE: res.data.unionCookie,
-                        })
+                        C_ID: window._ChannelVary[cookie('_Channel')],
+                        ORDER_CODE: res.data.order_code,
+                        PRD_NUM: $('#goods-num').val(),
+                        ORDER_AMOUNT: res.data.order_amount,
+                        UNIONCOOKIE: res.data.unionCookie || '',
                     })
                     })
                 }, true);
                 }, true);
             }
             }
 
 
             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);
         }
         }

@@ -664,9 +664,7 @@ 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'];
-            }
+            $result['unionCookie'] = isset($unionInfo['unionCookie']) ? $unionInfo['unionCookie'] : '';
 
 
             // 记录下单异常的数据
             // 记录下单异常的数据
             if (empty($result)) {
             if (empty($result)) {