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')) { @@ -336,7 +336,7 @@ if (!orderInfo('address_id')) {
336 orderInfo('address_id', $addressWrap.data('id')); 336 orderInfo('address_id', $addressWrap.data('id'));
337 } 337 }
338 338
339 -$('.delivery-id').on('touchend', 'li', function() { 339 +$('.delivery-id').on('touchend', 'li', function(event) {
340 orderInfo('delivery_way', $(this).data('id')); 340 orderInfo('delivery_way', $(this).data('id'));
341 341
342 // 实付金额发生变化，使用有货币为0 342 // 实付金额发生变化，使用有货币为0
@@ -344,6 +344,7 @@ $('.delivery-id').on('touchend', 'li', function() { @@ -344,6 +344,7 @@ $('.delivery-id').on('touchend', 'li', function() {
344 $('.coin').find('.checkbox').removeClass('icon-cb-radio').addClass('icon-radio'); 344 $('.coin').find('.checkbox').removeClass('icon-cb-radio').addClass('icon-radio');
345 345
346 orderCompute(); 346 orderCompute();
  347 + event.stopPropagation();
347 }); 348 });
348 349
349 $('.payment-type').on('touchend', 'li', function() { 350 $('.payment-type').on('touchend', 'li', function() {
@@ -316,7 +316,7 @@ if (!orderInfo('addressId')) { @@ -316,7 +316,7 @@ if (!orderInfo('addressId')) {
316 orderInfo('addressId', $addressWrap.data('id')); 316 orderInfo('addressId', $addressWrap.data('id'));
317 } 317 }
318 318
319 -$('.delivery-id').on('touchend', 'li', function() { 319 +$('.delivery-id').on('touchend', 'li', function(event) {
320 orderInfo('deliveryId', $(this).data('id')); 320 orderInfo('deliveryId', $(this).data('id'));
321 321
322 // 实付金额发生变化，使用有货币为0 322 // 实付金额发生变化，使用有货币为0
@@ -324,6 +324,7 @@ $('.delivery-id').on('touchend', 'li', function() { @@ -324,6 +324,7 @@ $('.delivery-id').on('touchend', 'li', function() {
324 $('.coin').find('.checkbox').removeClass('icon-cb-radio').addClass('icon-radio'); 324 $('.coin').find('.checkbox').removeClass('icon-cb-radio').addClass('icon-radio');
325 325
326 orderCompute(); 326 orderCompute();
  327 + event.stopPropagation();
327 }); 328 });
328 329
329 $('.payment-type').on('touchend', 'li', function() { 330 $('.payment-type').on('touchend', 'li', function() {