使用默认时间

@@ -98,15 +98,15 @@ Page({
       if(!(rev_time>=rdate[0] && rev_time<=rdate[1])){
       if(!(rev_time>=rdate[0] && rev_time<=rdate[1])){
         rev_time=rdate[0]
         rev_time=rdate[0]
       }
       }
+      await this.setDateStr(rev_time);
     }
     }
-    await this.setDateStr(rev_time);
     //判断hasUseDefDtime
     //判断hasUseDefDtime
     let hasUseDefDtime = true;
     let hasUseDefDtime = true;
     let mmii = util.unixtoTime(rev_time, 'HH:II');
     let mmii = util.unixtoTime(rev_time, 'HH:II');
     if (mmii > this.data.defDtime[this.data.form.time]) {
     if (mmii > this.data.defDtime[this.data.form.time]) {
       hasUseDefDtime = false;
       hasUseDefDtime = false;
     }
     }
-    //console.log('initLoad::setDateStr',util.unixtoTime(rev_time,'YYYY-MM-DD HH:II'),this.data.defDtime[this.data.form.time])
+    console.log('initLoad::setDateStr',util.unixtoTime(rev_time,'YYYY-MM-DD HH:II'),this.data.defDtime[this.data.form.time])
     await this.setDateStr(rev_time,hasUseDefDtime);
     await this.setDateStr(rev_time,hasUseDefDtime);
     this.sellerid = util.cache('enter_params')['seller_id'];
     this.sellerid = util.cache('enter_params')['seller_id'];
     let timePickerArray = await comm.getDayTimeSpace();
     let timePickerArray = await comm.getDayTimeSpace();
@@ -310,6 +310,12 @@ Page({
     //判断hasUseDefDtime
     //判断hasUseDefDtime
     if ((key == 'time' || key == 'date') && !sobj.timePickerMask) {
     if ((key == 'time' || key == 'date') && !sobj.timePickerMask) {
       sobj.hasUseDefDtime = true
       sobj.hasUseDefDtime = true
+      let xtime =new Date() / 1000
+      if(key == 'time'){
+        xtime=util.unixtoTime(new Date() / 1000, this.year+'-' + (this.data.dateStr[this.data.form.date].substr(0, 5)) + ' HH:II:SS');
+        xtime=util.timetouUnix(xtime)
+      }
+      this.setDateStr(xtime,sobj.hasUseDefDtime);
     }
     }
     if (this.data.form.date == 0) {//
     if (this.data.form.date == 0) {//
       let mmii = util.unixtoTime(new Date() / 1000, 'HH:II');
       let mmii = util.unixtoTime(new Date() / 1000, 'HH:II');
@@ -324,7 +330,7 @@ Page({
         this.getTables();
         this.getTables();
       }
       }
       if (key == 'date') {
       if (key == 'date') {
-        let xtime = util.unixtoTime(new Date() / 1000, 'YYYY-' + (this.data.dateStr[val].substr(0, 5)) + ' HH:II:SS');
+        let xtime = util.unixtoTime(new Date() / 1000, this.year+'-' + (this.data.dateStr[val].substr(0, 5)) + ' HH:II:SS');
         this.setDateStr(util.timetouUnix(xtime),sobj.hasUseDefDtime);
         this.setDateStr(util.timetouUnix(xtime),sobj.hasUseDefDtime);
       }
       }
     }
     }
@@ -524,7 +530,14 @@ Page({
       //buttonhide: true,
       //buttonhide: true,
     })
     })
     console.log('cktime',cktime,util.unixtoTime(cktime,'YYYY-MM-DD'))
     console.log('cktime',cktime,util.unixtoTime(cktime,'YYYY-MM-DD'))
-    this.setDateStr(cktime == day0 ? new Date() / 1000 : cktime)
+    if(cktime == day0){//今天
+      this.setDateStr( new Date() / 1000 )
+    }else{
+      let xtime=util.unixtoTime(new Date() / 1000, event.detail.date + ' HH:II:SS');
+      xtime=util.timetouUnix(xtime)
+      this.setDateStr(xtime,true)
+    }
+
     this.calendarClose();
     this.calendarClose();
     setTimeout(res=>{
     setTimeout(res=>{
       this.getTables();
       this.getTables();