Merge remote-tracking branch 'origin/master'

dist/js_twice/business/orderIn.js

@@ -720,7 +720,15 @@ var orderInPage = {
                     }else{
                         bv = $("input[name='store_billing_time']").val();
                     }
-                    max = (Date.parse(bv) / 1000) + 15 * 24 * 3600;
+                    //2019-01-25 20:05 晶晶新增需求
+                    var todayStamp = Date.parse(new Date()) / 1000;
+                    var limitStamp = Date.parse(new Date("2019-02-22 00:00")) / 1000;
+                    var plusDay = 15;
+                    if(todayStamp - limitStamp < 0){
+                        plusDay = 30;
+                    }
+                    max = (Date.parse(bv) / 1000) + plusDay * 24 * 3600;
+                    // max = (Date.parse(bv) / 1000) + 15 * 24 * 3600;
                     maxF = that.formatDate(max).replace("/","-").replace("/","-");
                 }else if(scene == 'edit'){
                     bv = cur.attr("data-value");