fe / yohobuywap-node · Commits

Go to a project

Authored by 毕凯
Commit 922d7ee77bd836dc3f944fe50db2911732a8cd86 2 parents 5ca1072e a10787e2

Merge branch 'fetaure/delivery' into 'release/6.0' 

货到付款提示



See merge request !739
Inline Side-by-side
Showing 2 changed files with 26 additions and 2 deletions
@@ -35,7 +35,8 @@ let $invoice = $('.invoice'), @@ -35,7 +35,8 @@ let $invoice = $('.invoice'),
35 isYohoCoinClick = $coinLi.data('yoho-coin-click') * 1, // 判断有货币是否可以单击 35 isYohoCoinClick = $coinLi.data('yoho-coin-click') * 1, // 判断有货币是否可以单击
36 addressTop = $('.address-wrap').outerHeight(), 36 addressTop = $('.address-wrap').outerHeight(),
37 $message = $('#msg'), 37 $message = $('#msg'),
38 - $noPrintPrice = $('.no-print-price'); 38 + $noPrintPrice = $('.no-print-price'),
  39 + delivery = 0;
39 40
40 require('common'); 41 require('common');
41 42
@@ -447,6 +448,17 @@ $subBlock.on('touchstart', 'li', function() { @@ -447,6 +448,17 @@ $subBlock.on('touchstart', 'li', function() {
447 }); 448 });
448 let self = $(this); 449 let self = $(this);
449 450
  451 + if (self.find('i').data('payment-type') === 2 && delivery === 0) {
  452 + dialog.showDialog({
  453 + dialogText: '货到付款订单是否支持刷卡以当地快递公司为准',
  454 + hasFooter: {
  455 + centerBtnText: '我知道了'
  456 + }
  457 + });
  458 +
  459 + delivery = 1;
  460 + }
  461 +
450 setTimeout(function() { 462 setTimeout(function() {
451 self.parents('ul').hide(); 463 self.parents('ul').hide();
452 }, 300); 464 }, 300);
@@ -34,7 +34,8 @@ let $invoice = $('.invoice'), @@ -34,7 +34,8 @@ let $invoice = $('.invoice'),
34 isYohoCoinClick = $coinLi.data('yoho-coin-click') * 1, // 判断有货币是否可以单击 34 isYohoCoinClick = $coinLi.data('yoho-coin-click') * 1, // 判断有货币是否可以单击
35 addressTop = $('.address-wrap').outerHeight(), 35 addressTop = $('.address-wrap').outerHeight(),
36 $message = $('#msg'), 36 $message = $('#msg'),
37 - $noPrintPrice = $('.no-print-price'); 37 + $noPrintPrice = $('.no-print-price'),
  38 + delivery = 0;
38 39
39 require('common'); 40 require('common');
40 41
@@ -425,6 +426,17 @@ $subBlock.on('touchstart', 'li', function() { @@ -425,6 +426,17 @@ $subBlock.on('touchstart', 'li', function() {
425 }); 426 });
426 let self = $(this); 427 let self = $(this);
427 428
  429 + if (self.find('i').data('payment-type') === 2 && delivery === 0) {
  430 + dialog.showDialog({
  431 + dialogText: '货到付款订单是否支持刷卡以当地快递公司为准',
  432 + hasFooter: {
  433 + centerBtnText: '我知道了'
  434 + }
  435 + });
  436 +
  437 + delivery = 1;
  438 + }
  439 +
428 setTimeout(function() { 440 setTimeout(function() {
429 self.parents('ul').hide(); 441 self.parents('ul').hide();
430 }, 300); 442 }, 300);