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

货到付款提示



See merge request !739

@@ -35,7 +35,8 @@ let $invoice = $('.invoice'),
     isYohoCoinClick = $coinLi.data('yoho-coin-click') * 1, // 判断有货币是否可以单击
     addressTop = $('.address-wrap').outerHeight(),
     $message = $('#msg'),
-    $noPrintPrice = $('.no-print-price');
+    $noPrintPrice = $('.no-print-price'),
+    delivery = 0;
 
 require('common');
 
@@ -447,6 +448,17 @@ $subBlock.on('touchstart', 'li', function() {
     });
     let self = $(this);
 
+    if (self.find('i').data('payment-type') === 2 && delivery === 0) {
+        dialog.showDialog({
+            dialogText: '货到付款订单是否支持刷卡以当地快递公司为准',
+            hasFooter: {
+                centerBtnText: '我知道了'
+            }
+        });
+
+        delivery = 1;
+    }
+
     setTimeout(function() {
         self.parents('ul').hide();
     }, 300);

@@ -34,7 +34,8 @@ let $invoice = $('.invoice'),
     isYohoCoinClick = $coinLi.data('yoho-coin-click') * 1, // 判断有货币是否可以单击
     addressTop = $('.address-wrap').outerHeight(),
     $message = $('#msg'),
-    $noPrintPrice = $('.no-print-price');
+    $noPrintPrice = $('.no-print-price'),
+    delivery = 0;
 
 require('common');
 
@@ -425,6 +426,17 @@ $subBlock.on('touchstart', 'li', function() {
     });
     let self = $(this);
 
+    if (self.find('i').data('payment-type') === 2 && delivery === 0) {
+        dialog.showDialog({
+            dialogText: '货到付款订单是否支持刷卡以当地快递公司为准',
+            hasFooter: {
+                centerBtnText: '我知道了'
+            }
+        });
+
+        delivery = 1;
+    }
+
     setTimeout(function() {
         self.parents('ul').hide();
     }, 300);