Merge branch 'feature/orderDelivery' into 'release/6.1'

货到付款提示框恢复



See merge request !913

@@ -384,7 +384,10 @@ $subBlock.on('touchstart', 'li', function() {
     });
     let self = $(this);
 
-    if (self.find('span').data('message') && delivery === 0) {
+    // 点击货到付款弹出提示语
+    if (self.find('span').data('message') && delivery === 0 &&
+        parseInt(self.find('i').data('payment-type'), 10) === 2) {
+
         dialog.showDialog({
             hasHeader: '温馨提示',
             dialogText: self.find('span').data('message'),

@@ -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;
 
 const orderEnsure = new OrderEnsure(order);
 
@@ -416,6 +417,21 @@ $subBlock.on('touchstart', 'li', function() {
     });
     let self = $(this);
 
+    // 点击货到付款弹出提示语
+    if (self.find('span').data('message') && delivery === 0 &&
+        parseInt(self.find('i').data('payment-type'), 10) === 2) {
+
+        dialog.showDialog({
+            hasHeader: '温馨提示',
+            dialogText: self.find('span').data('message'),
+            hasFooter: {
+                centerBtnText: '我知道了'
+            }
+        });
+
+        delivery = 1;
+    }
+
     setTimeout(function() {
         self.parents('ul').hide();
     }, 300);