fe / yohobuywap-node · Commits

Go to a project

Authored by 毕凯
Commit b0d26174878432fe29918f2bd6b774c861b1c1e3 2 parents e03bcba7 515031b1

Merge remote-tracking branch 'origin/feature/refund' into gray

Inline Side-by-side
Showing 2 changed files with 4 additions and 2 deletions
... ... @@ -336,7 +336,7 @@ if (!orderInfo('address_id')) {
orderInfo('address_id', $addressWrap.data('id'));
}
$('.delivery-id').on('touchend', 'li', function() {
$('.delivery-id').on('touchend', 'li', function(event) {
orderInfo('delivery_way', $(this).data('id'));
// 实付金额发生变化，使用有货币为0
... ... @@ -344,6 +344,7 @@ $('.delivery-id').on('touchend', 'li', function() {
$('.coin').find('.checkbox').removeClass('icon-cb-radio').addClass('icon-radio');
orderCompute();
event.stopPropagation();
});
$('.payment-type').on('touchend', 'li', function() {
... ...
... ... @@ -316,7 +316,7 @@ if (!orderInfo('addressId')) {
orderInfo('addressId', $addressWrap.data('id'));
}
$('.delivery-id').on('touchend', 'li', function() {
$('.delivery-id').on('touchend', 'li', function(event) {
orderInfo('deliveryId', $(this).data('id'));
// 实付金额发生变化，使用有货币为0
... ... @@ -324,6 +324,7 @@ $('.delivery-id').on('touchend', 'li', function() {
$('.coin').find('.checkbox').removeClass('icon-cb-radio').addClass('icon-radio');
orderCompute();
event.stopPropagation();
});
$('.payment-type').on('touchend', 'li', function() {
... ...