fixbug 2020

@@ -78,6 +78,7 @@ Page({
    */
    */
   reserve_id: '',
   reserve_id: '',
   checkedTables:{},//已选中的桌子集合
   checkedTables:{},//已选中的桌子集合
+  year:util.unixtoTime(new Date() / 1000,'YYYY'),
   onLoad: async function (options) {
   onLoad: async function (options) {
     this.initLoad(options)
     this.initLoad(options)
     this.getCustomRemark();
     this.getCustomRemark();
@@ -214,6 +215,9 @@ Page({
     let key = util.attr(e, 'key');
     let key = util.attr(e, 'key');
     let val;
     let val;
     let sobj = {};
     let sobj = {};
+    if (key == 'date') {
+      this.year=util.unixtoTime(new Date() / 1000,'YYYY');
+    }
     if (e.type == 'input' || e.type == 'confirm') {
     if (e.type == 'input' || e.type == 'confirm') {
       val = util.val(e);
       val = util.val(e);
       if (key == 'phone') {
       if (key == 'phone') {
@@ -321,7 +325,7 @@ Page({
     }
     }
     console.log('getTables-tableid', tableid, tableid.length);
     console.log('getTables-tableid', tableid, tableid.length);
     try {
     try {
-      let rdate = await comm.getTimeSpace(this.data.dateStr[this.data.form.date], this.data.form.time);
+      let rdate = await comm.getTimeSpace(this.data.dateStr[this.data.form.date], this.data.form.time,null,null,this.year);
       console.log('rdate', this.data.dateStr[this.data.form.date], rdate);
       console.log('rdate', this.data.dateStr[this.data.form.date], rdate);
       App.Reserve.GetTableList({
       App.Reserve.GetTableList({
         sid: util.cache('enter_params')['seller_id'],
         sid: util.cache('enter_params')['seller_id'],
@@ -390,6 +394,7 @@ Page({
           tables: tables,
           tables: tables,
           tablesLength: tablesLength
           tablesLength: tablesLength
         })
         })
+        this.conditionInfo();
       })
       })
     } catch (e) {
     } catch (e) {
       this.setData({
       this.setData({
@@ -402,10 +407,10 @@ Page({
     try {
     try {
       let d_stimestr = this.data.timePickerArray[this.data.form.time][this.data.timePickerIndex[this.data.form.time]];
       let d_stimestr = this.data.timePickerArray[this.data.form.time][this.data.timePickerIndex[this.data.form.time]];
       let d_rdate = await comm.getTimeSpace(this.data.dateStr[this.data.form.date],
       let d_rdate = await comm.getTimeSpace(this.data.dateStr[this.data.form.date],
-        this.data.form.time, d_stimestr);
+        this.data.form.time, d_stimestr,null,this.year);
       let stimestr = this.data.timePickerArray[this.data.form.time][this.data.timePickerIndex[0]];
       let stimestr = this.data.timePickerArray[this.data.form.time][this.data.timePickerIndex[0]];
       let rdate = await comm.getTimeSpace(this.data.dateStr[this.data.form.date],
       let rdate = await comm.getTimeSpace(this.data.dateStr[this.data.form.date],
-        this.data.form.time, stimestr);
+        this.data.form.time, stimestr,null,this.year);
       console.log('stimestr', stimestr, this.data.form.time, this.data.timePickerIndex);
       console.log('stimestr', stimestr, this.data.form.time, this.data.timePickerIndex);
       console.log('rdate', rdate);
       console.log('rdate', rdate);
       this.setData({
       this.setData({
@@ -486,6 +491,8 @@ Page({
     console.log(event);
     console.log(event);
     //let cktime=util.timetouUnix(event.detail.year+'/'+event.detail.month+'/'+event.detail.day)
     //let cktime=util.timetouUnix(event.detail.year+'/'+event.detail.month+'/'+event.detail.day)
     let cktime = util.timetouUnix(event.detail.date)
     let cktime = util.timetouUnix(event.detail.date)
+    this.year=event.detail.date.substr(0, 4);
+    console.log('this.year',this.year);
     let day0 = parseInt(new Date(new Date().setHours(0, 0, 0, 0)) / 1000);
     let day0 = parseInt(new Date(new Date().setHours(0, 0, 0, 0)) / 1000);
     // if (cktime < day0) {
     // if (cktime < day0) {
     //   util.toast('请选择有效日期', 'none');
     //   util.toast('请选择有效日期', 'none');
@@ -515,7 +522,7 @@ Page({
     })
     })
   },
   },
   async  selectdesk(){
   async  selectdesk(){
-    let rdate = await comm.getTimeSpace(this.data.dateStr[this.data.form.date], this.data.form.time);
+    let rdate = await comm.getTimeSpace(this.data.dateStr[this.data.form.date], this.data.form.time,null,null,this.year);
     console.log(this.data.form)
     console.log(this.data.form)
     wx.navigateTo({
     wx.navigateTo({
       url: 'b_desk?rdate=' + rdate + '&tid=' + this.data.form.tabid
       url: 'b_desk?rdate=' + rdate + '&tid=' + this.data.form.tabid
@@ -676,6 +683,7 @@ Page({
       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);
       options.ddate=options.ddate.substr(0,10);
+      this.year=util.unixtoTime(options.ddate,'YYYY');
       //设置日期
       //设置日期
       let obj = await this.setDateStr(options.ddate);
       let obj = await this.setDateStr(options.ddate);
       //设置时间
       //设置时间

@@ -33,6 +33,7 @@ Page({
     [],
     [],
     [],
     [],
   ],
   ],
+  year:util.unixtoTime(new Date() / 1000,'YYYY'),
   /**
   /**
    * 生命周期函数--监听页面加载
    * 生命周期函数--监听页面加载
    */
    */
@@ -102,6 +103,7 @@ Page({
     console.log(this.data.calendarMask)
     console.log(this.data.calendarMask)
   },
   },
   dateChange(event){
   dateChange(event){
+    this.year=event.detail.date.substr(0, 4);
     let cktime=util.timetouUnix(event.detail.date)
     let cktime=util.timetouUnix(event.detail.date)
     let day0=parseInt(new Date(new Date().setHours(0, 0, 0, 0)) / 1000);
     let day0=parseInt(new Date(new Date().setHours(0, 0, 0, 0)) / 1000);
     // if(cktime<day0){
     // if(cktime<day0){
@@ -140,7 +142,7 @@ Page({
     }else{
     }else{
       time=this.data.time;
       time=this.data.time;
     }
     }
-    let rdate=await bookOrder.getTimeSpace(this.data.dateStr,time);
+    let rdate=await bookOrder.getTimeSpace(this.data.dateStr,time,null,null,this.year);
     formdata.rdate=rdate;
     formdata.rdate=rdate;
     formdata.status='1,2';
     formdata.status='1,2';
     obj.rdate=rdate;
     obj.rdate=rdate;