Authored by 郭成尧

'maidian-ok'

@@ -303,21 +303,19 @@ function submitOrder() { @@ -303,21 +303,19 @@ function submitOrder() {
303 /* tar add 161116 */ 303 /* tar add 161116 */
304 if (window._yas && window._yas.sendCustomInfo) { 304 if (window._yas && window._yas.sendCustomInfo) {
305 window._yas.sendCustomInfo({ 305 window._yas.sendCustomInfo({
306 - param: JSON.stringify({  
307 op: 'YB_SC_TOPAY_CLICK', 306 op: 'YB_SC_TOPAY_CLICK',
308 param: JSON.stringify({ 307 param: JSON.stringify({
309 C_ID: window._ChannelVary[cookie('_Channel')], 308 C_ID: window._ChannelVary[cookie('_Channel')],
310 ORDER_CODE: res.data.order_code, 309 ORDER_CODE: res.data.order_code,
311 PRD_NUM: $('#goods-num').val(), 310 PRD_NUM: $('#goods-num').val(),
312 ORDER_AMOUNT: res.data.order_amount, 311 ORDER_AMOUNT: res.data.order_amount,
313 - UNIONCOOKIE: res.data.unionCookie,  
314 - }) 312 + UNIONCOOKIE: res.data.unionCookie || '',
315 }) 313 })
316 }, true); 314 }, true);
317 } 315 }
318 316
319 window.setCookie('order-info', ''); 317 window.setCookie('order-info', '');
320 - window.location.href = url; 318 + // window.location.href = url;
321 } else if (res.message) { 319 } else if (res.message) {
322 tip.show(res.message); 320 tip.show(res.message);
323 } 321 }
@@ -664,9 +664,7 @@ class IndexController extends AbstractAction @@ -664,9 +664,7 @@ class IndexController extends AbstractAction
664 } 664 }
665 $result = CartModel::orderSub($uid, $addressId, $cartType, $deliveryTime, $deliveryWay, $invoices, $paymentId, $paymentType, $remark, $couponCode, $yohoCoin, $skuList, $unionKey, $userAgent); 665 $result = CartModel::orderSub($uid, $addressId, $cartType, $deliveryTime, $deliveryWay, $invoices, $paymentId, $paymentType, $remark, $couponCode, $yohoCoin, $skuList, $unionKey, $userAgent);
666 666
667 - if ($unionInfo && !empty($unionInfo['unionCookie'])) {  
668 - $result['unionCookie'] = $unionInfo['unionCookie'];  
669 - } 667 + $result['unionCookie'] = isset($unionInfo['unionCookie']) ? $unionInfo['unionCookie'] : '';
670 668
671 // 记录下单异常的数据 669 // 记录下单异常的数据
672 if (empty($result)) { 670 if (empty($result)) {