Merge branch 'zjl_order_msg_20180402' into 'master'

调整判断

See merge request !28

public/js/order.js

@@ -1216,6 +1216,7 @@
                         return false;
                     }
 
+                    if (payTimeOther) {
                         var reg = /\d/;
                         if (!reg.test(payTimeOther)) {
                             layer.msg('格式错误');
@@ -1226,6 +1227,7 @@
                             layer.msg('自定义时间限制在1-30天');
                             return false;
                         }
+                    }
 
                     var currencySign = currency == 1 ? '￥' : '$';
                     var goods_amount = currencySign+$('input[name=goods_amount]').val();