使用默认时间

@@ -103,7 +103,6 @@ Page({
     if (mmii > this.data.defDtime[this.data.form.time]) {
     if (mmii > this.data.defDtime[this.data.form.time]) {
       hasUseDefDtime = false;
       hasUseDefDtime = false;
     }
     }
-
     this.setData({
     this.setData({
       timePickerArray: timePickerArray,
       timePickerArray: timePickerArray,
       speciallist: speciallist,
       speciallist: speciallist,
@@ -686,12 +685,29 @@ Page({
     try {
     try {
       console.log('initQuick', options);
       console.log('initQuick', options);
       this.checkedTables[options.tid]=options.tname
       this.checkedTables[options.tid]=options.tname
-      options.ddate=options.ddate.substr(0,10);
-      this.year=util.unixtoTime(options.ddate,'YYYY');
+      //options.ddate=options.ddate.substr(0,10);
+      options.ddate=options.ddate.split('-')
+      let stime=parseInt(options.ddate[0])
+      let etime=parseInt(options.ddate[1])
+      let hasUseDefDtime=true
+      let hasInSETime=false //当前时间在预订时段内
+      this.year=util.unixtoTime(stime,'YYYY');
+      //设置时间
+      let xt=parseInt(new Date()/1000)
+      console.log('initQuickinitQuick',stime ,xt,etime)
+      if(xt>stime && xt<etime){
+        options.ddate=xt
+        hasInSETime=true
+      }else{
+        options.ddate=stime
+      }
       //设置日期
       //设置日期
       let obj = await this.setDateStr(options.ddate);
       let obj = await this.setDateStr(options.ddate);
-      //设置时间
-      let nd = util.unixtoTime(new Date()/1000, 'HH:II');
+
+      let nd = util.unixtoTime(options.ddate, 'HH:II');
+      if (nd > this.data.defDtime[this.data.form.time] && hasInSETime) {
+        hasUseDefDtime = false;
+      }
       let timePickerIndex = this.data.timePickerIndex
       let timePickerIndex = this.data.timePickerIndex
       console.log('initQuick-', this.data.timePickerArray, obj.form.time, nd)
       console.log('initQuick-', this.data.timePickerArray, obj.form.time, nd)
       this.data.timePickerArray[obj.form.time].some((dd, ii) => {
       this.data.timePickerArray[obj.form.time].some((dd, ii) => {
@@ -701,8 +717,8 @@ Page({
           return true;
           return true;
         }
         }
       })
       })
-
       console.log('initQuick-timePickerIndex', timePickerIndex);
       console.log('initQuick-timePickerIndex', timePickerIndex);
+
       obj.form.pnum = options.pnum || 6;
       obj.form.pnum = options.pnum || 6;
       obj.form.rname = "";
       obj.form.rname = "";
       obj.form.phone = "";
       obj.form.phone = "";
@@ -713,7 +729,7 @@ Page({
       this.setData({
       this.setData({
         timePickerIndex: timePickerIndex,
         timePickerIndex: timePickerIndex,
         form: obj.form,
         form: obj.form,
-        //hasUseDefDtime: false,
+        hasUseDefDtime: hasUseDefDtime,
       })
       })
       setTimeout(() => {
       setTimeout(() => {
         this.getTables();
         this.getTables();