Merge branch 'zjl_order_msg_20180402' into 'master'

调整判断 See merge request !28

Merge branch 'zjl_order_msg_20180402' into 'master'
调整判断 See merge request !28
2b0e372f · 朱继来 · 711d4fd2 · d4f917ad · 2b0e372f
Commit 2b0e372f authored Apr 17, 2018 by 朱继来
Showing with 10 additions and 8 deletions
public/js/order.js
--- a/public/js/order.js
+++ b/public/js/order.js
@@ -1216,15 +1216,17 @@
                        return false;
                    }

-                    var reg = /\d/;
-                    if (!reg.test(payTimeOther)) {
-                        layer.msg('格式错误');
-                        return false;
-                    }
+                    if (payTimeOther) {
+                        var reg = /\d/;
+                        if (!reg.test(payTimeOther)) {
+                            layer.msg('格式错误');
+                            return false;
+                        }

-                    if (payTimeOther < 0 || payTimeOther > 30) {
-                        layer.msg('自定义时间限制在1-30天');
-                        return false;
+                        if (payTimeOther < 0 || payTimeOther > 30) {
+                            layer.msg('自定义时间限制在1-30天');
+                            return false;
+                        }
                    }

                    var currencySign = currency == 1 ? '￥' : '$';