Merge branch 'release/5.2' of git.yoho.cn:fe/yohobuywap-node into release/5.2

@@ -329,14 +329,23 @@ $('.close').on('click', function() {
     $('.dialog').addClass('hidden');
     $('.mask').addClass('hidden');
     $('#dialog .content').html(' ');
+    $('body').css({
+        overflow: 'auto'
+    });
 });
 $('.coupon-description span').on('click', function() {
     $('#message').removeClass('hidden');
     $('.mask').removeClass('hidden');
+    $('body').css({
+        overflow: 'hidden'
+    });
 });
 $('.description').on('click', function() {
     $('#message').removeClass('hidden');
     $('.mask').removeClass('hidden');
+    $('body').css({
+        overflow: 'hidden'
+    });
 });
 
 $('.use-coupon-btn').on('click', function() {

@@ -409,6 +409,11 @@ $('.dispatch').on('touchend', 'h3', function() {
 });
 
 $subBlock.on('touchstart', 'li', function() {
+    // 送货时间提示语li，不响应事件
+    if ($(this).hasClass('dispatch-time-info')) {
+        return true;
+    }
+
     $.each($(this).parents('ul').find('i'), function() {
         $(this).parents('ul').find('i').removeClass('icon-cb-radio').addClass('icon-radio');
     });

@@ -102,7 +102,7 @@ $btnNext.on('touchstart', function() {
                 if (data.code === 200) {
                     location.href = data.data;
                 } else {
-                    data.refreshCaptcha && refreshCaptcha();
+                    refreshCaptcha();
 
                     showErrTip(data.message);
                     requested = false;
@@ -110,6 +110,7 @@ $btnNext.on('touchstart', function() {
             },
             error: function() {
                 showErrTip('出错了，请重试');
+                refreshCaptcha();
                 requested = false;
             }
         });

@@ -187,7 +187,7 @@
     .dialog {
         width: 84%;
         height: 410px;
-        position: absolute;
+        position: fixed;
         background: #fff;
         border-radius: 0.6rem;
         left: 8%;
@@ -232,7 +232,7 @@
     .activity-message {
         width: 100%;
         height: 410px;
-        overflow: scroll;
+        overflow: auto;
     }
 
     .activity-message h3 {

@@ -188,7 +188,7 @@
                 li.dispatch-time-info {
                     line-height: 30px;
                     padding: 20px 30px 20px 40px;
-                    font-size: 21px;
+                    font-size: 25px;
                 }
             }
         }

@@ -31,7 +31,7 @@ function yohoCoinCompute(orderCompute) {
     }
 
     if (yohoCoinData.totalYohoCoinNum < 100) {
-        yohoCoinData.yohoCoinMsg = '共{yohoCoinData.totalYohoCoinNum}有货币，满{orderCompute.yoho_coin_pay_rule.num_limit}可用';
+        yohoCoinData.yohoCoinMsg = `共${yohoCoinData.totalYohoCoinNum}有货币，满${orderCompute.yoho_coin_pay_rule.num_limit}可用`;
     } else if (yohoCoinData.useYohoCoin > 0 || yohoCoinData.yohoCoin > 0) {
         yohoCoinData.yohoCoinMsg = '可抵¥' + (yohoCoinData.useYohoCoin > 0 ? yohoCoinData.useYohoCoin : yohoCoinData.yohoCoin);
         yohoCoinData.yohoCoinClick = 1;
@@ -127,11 +127,11 @@ function tranformPayment(data, orderInfo) {
         times[defaultKey].isSelected = true;
 
         if (cookieTimeId) {
-            let selectTime = times.find(time => time.delivery_time_id === cookieTimeId);
+            let selectTime = times.find(time => time.id === cookieTimeId);
 
             if (selectTime) {
-                selectTime.isSelected = true;
                 times[defaultKey].isSelected = false;
+                selectTime.isSelected = true;
             }
         }