Authored by 郭成尧

Merge branch 'release/5.3' into gray

... ... @@ -174,7 +174,7 @@ $invoice.on('touchend', '.checkbox', function() {
})
}, true);
}
}, 200)
}, 200);
});
... ... @@ -311,7 +311,9 @@ function submitOrder(times) {
times: times || 1
}
}).then(function(res) {
var url;
var url,
PRD_SKN = [],
PRD_SKU = [];
if (!res) {
tip.show('系统繁忙,请稍后再试!');
... ... @@ -319,8 +321,6 @@ function submitOrder(times) {
}
if (res.code === 200) {
var PRD_SKN = [],
PRD_SKU = [];
if (payType === 2) {
... ... @@ -330,9 +330,6 @@ function submitOrder(times) {
url = '/home/orders/pay?order_code=' + res.data.order_code;
}
var PRD_SKN = [],
PRD_SKU = [];
$('.order-good').each(function() {
PRD_SKN.push($(this).data('id'));
PRD_SKU.push($(this).data('skn'));
... ... @@ -354,8 +351,7 @@ function submitOrder(times) {
})
}, true);
}
}, 200)
}, 300)
window.setCookie('order-info', '');
window.location.href = url;
... ... @@ -507,7 +503,7 @@ $subBlock.on('touchstart', 'li', function() {
$('.bill a').on('touchstart', function() {
if (isTickets) {
ticketsConfirm();
return ;
return;
}
orderInfo('paymentTypeId', $('.delivery-id .icon-cb-radio').data('id'));
... ... @@ -531,7 +527,7 @@ if (orderInfo('address') && orderInfo('address').is_support === 'N') {
}
//电子票下单
function ticketsConfirm () {
function ticketsConfirm() {
if(!$ticketsMobile.val()) {
tip.show('手机号必填');
... ...
... ... @@ -215,7 +215,7 @@ $('.box').on('touchstart', function() {
if (window._yas && window._yas.sendCustomInfo) {
window._yas.sendCustomInfo({
op: 'YB_SC_PAYMENT',
op: 'YB_SC_PAYMENT_TOPAY_CLICK',
param: JSON.stringify({
C_ID: window._ChannelVary[cookie('_Channel')],
ORDER_CODE: $('.order-code').val(),
... ...