Merge remote-tracking branch 'remotes/origin/master' into master-reserev-fenli

@@ -86,7 +86,7 @@
     "navigationBarTextStyle": "white"
   },
   "networkTimeout": {
-    "request": 5000,
+    "request": 10000,
     "downloadFile": 10000
   },
   "tabBar": {

@@ -95,21 +95,21 @@ Page({
     let rev_time=parseInt(nt)
     if(options.hasQuick==1){
       let rdate=options.ddate.split('-')
-      if(rev_time<rdate[0] || rev_time>rdate[1]){
+      if(!(rev_time>=rdate[0] && rev_time<=rdate[1])){
         rev_time=rdate[0]
       }
+      await this.setDateStr(rev_time);
     }
-    await this.setDateStr(rev_time);
-    this.sellerid = util.cache('enter_params')['seller_id'];
-    let timePickerArray = await comm.getDayTimeSpace();
     //判断hasUseDefDtime
     let hasUseDefDtime = true;
     let mmii = util.unixtoTime(rev_time, 'HH:II');
-    console.log('initLoad',mmii,this.data.defDtime[this.data.form.time],this.data.defDtime)
-    console.log('initLoad',mmii > this.data.defDtime[this.data.form.time])
     if (mmii > this.data.defDtime[this.data.form.time]) {
       hasUseDefDtime = false;
     }
+    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);
+    this.sellerid = util.cache('enter_params')['seller_id'];
+    let timePickerArray = await comm.getDayTimeSpace();
     this.setData({
       timePickerArray: timePickerArray,
       speciallist: speciallist,
@@ -128,7 +128,12 @@ Page({
    * @param d
    *
    */
-  async setDateStr(d = new Date() / 1000){
+  async setDateStr(d = new Date() / 1000,hasUseDefDtime=false){
+    if(hasUseDefDtime){//
+      let timestr=util.unixtoTime(d,'YYYY-MM-DD '+this.data.defDtime[this.data.form.time])
+      d=util.timetouUnix(timestr)
+    }
+    console.log('setDateStr',util.unixtoTime(d,'YYYY-MM-DD HH:II'),hasUseDefDtime)
     this.year=util.unixtoTime(d,'YYYY');
     let ns = new Date() / 1000;
     let dateStr = [
@@ -141,8 +146,14 @@ Page({
 
     let timeObj = await comm.getTimeSpaceIndexData(d);
     //form.time=await comm.getTimeSpaceIndex(d);
-    form.time = timeObj.timeIndex;
+    //如果小于默认时间，使用默认时间
+    let mmii = util.unixtoTime(d,'HH:II')
+    if (mmii < this.data.defDtime[timeObj.timeIndex]) {
+      let str=util.unixtoTime(d, 'YYYY-MM-DD '+this.data.defDtime[timeObj.timeIndex]+':00')
+      timeObj = await comm.getTimeSpaceIndexData(util.timetouUnix(str));
+    }
 
+    form.time = timeObj.timeIndex;
     let ind = dateStr._indexOf(nowStr);
     if (ind > -1) {
       form.date = ind
@@ -158,6 +169,7 @@ Page({
       timePickerIndex: timePickerIndex,
       timeOpt: timeObj.timeOpt,
     };
+
     this.setData(obj)
     return obj;
 
@@ -220,7 +232,7 @@ Page({
   onShareAppMessage: function () {
 
   },
-  selectedValue(e){
+  async selectedValueAsync(e){
     console.log(e);
     let key = util.attr(e, 'key');
     let val;
@@ -302,6 +314,30 @@ Page({
         sobj.timePickerMask = true;
       }
     }
+    //判断hasUseDefDtime
+    if ((key == 'time' || key == 'date') && !sobj.timePickerMask) {
+      sobj.hasUseDefDtime = true
+      let ntime = parseInt(new Date() / 1000)
+      let xtime =ntime
+      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)
+        //if 当前时间在区间内 hasUseDefDtime 为 false
+        let d_rdate = await comm.getTimeSpace(this.data.dateStr[this.data.form.date],
+          this.data.form.time, null,null,this.year);
+        d_rdate=d_rdate.split('-');
+        if(d_rdate[0] <= ntime && ntime<=d_rdate[1]){
+          sobj.hasUseDefDtime=false
+        }
+      }
+      this.setDateStr(xtime,sobj.hasUseDefDtime);
+    }
+    if (this.data.form.date == 0) {//
+      let mmii = util.unixtoTime(new Date() / 1000, 'HH:II');
+      if (mmii > this.data.defDtime[key == 'time' ? val : this.data.form.time]) {
+        sobj.hasUseDefDtime = false;
+      }
+    }
     if ('date,time,pnum,pnum_str,tabid'.indexOf(key) > -1) {
       if (!displayTimes) {
         //sobj.form.tid = []; //切换日期时间清空桌位
@@ -309,13 +345,105 @@ Page({
         this.getTables();
       }
       if (key == 'date') {
-        let xtime = util.unixtoTime(new Date() / 1000, 'YYYY-' + (this.data.dateStr[val].substr(0, 5)) + ' HH:II:SS');
-        this.setDateStr(util.timetouUnix(xtime));
+        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.setData(sobj)
+  },
+  selectedValue(e){
+    console.log(e);
+    let key = util.attr(e, 'key');
+    let val;
+    let sobj = {};
+    if (key == 'date') {
+      this.year=util.unixtoTime(new Date() / 1000,'YYYY');
+    }
+    if (e.type == 'input' || e.type == 'confirm') {
+      val = util.val(e);
+      if (key == 'phone') {
+        var that = this;
+        if (e.detail.value != '' && e.detail.value.length >= 3) {
+          App.Reserve.GetReserveUser(
+            {
+              keywords: e.detail.value,
+              sid: this.sellerid
+            }
+          ).then(function (json) {
+            if (json.ret == 200 && json.data.length > 0) {
+              that.setData({
+                searchlist: json.data
+              })
+            } else {
+              that.setData({
+                searchlist: null
+              })
+            }
+          })
+        } else {
+          this.setData({
+            searchlist: null
+          })
+        }
+      }
+      if (key == 'pnum') {
+        sobj.pnumInputFocus = true;
+      }
+    } else {
+      val = util.attr(e, 'value');
+    }
+    if (key == 'time') {
+      if (this.data.timeOpt[val]) return;
+    }
+    if ((key == 'time' && this.data.form.time == val) || (key == 'date' && this.data.form.date == val)) {
+      if (util.attr(e, 'display') != 'block') {
+        return;
+      }
+    }
+    let form = this.data.form;
+
+    if (key == 'tid') {
+      let ts = this.data.tables;
+      if (ts[val].isselect) {
+        ts[val].isselect = false;
+        form.tid.remove(ts[val].id);
+        delete this.checkedTables[ts[val].id]
+      } else {
+        ts[val].isselect = true;
+        form.tid.push(ts[val].id);
+        this.checkedTables[ts[val].id]=ts[val].name
+      }
+      sobj.tables = ts;
+    } else {
+      form[key] = val;
+    }
+    console.log('ts', sobj.tables,this.checkedTables);
+    //console.log(e.type,key,val,form);
+    sobj.form = form;
+    sobj.buttonhide = this.data.buttonhide;
+    if (form.tid.length > 0 && form.rname.length > 0) {
+      sobj.buttonhide = false;
+    }else{
+      sobj.buttonhide = true;
+    }
+    let displayTimes = false;
+    if (key == 'time') {
+      if (util.attr(e, 'display') == 'block') {
+        displayTimes = true;
+        sobj.timePickerMask = true;
       }
     }
     //判断hasUseDefDtime
     if ((key == 'time' || key == 'date') && !sobj.timePickerMask) {
       sobj.hasUseDefDtime = true
+      let ntime = parseInt(new Date() / 1000)
+      let xtime =ntime
+      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) {//
       let mmii = util.unixtoTime(new Date() / 1000, 'HH:II');
@@ -323,6 +451,18 @@ Page({
         sobj.hasUseDefDtime = false;
       }
     }
+    if ('date,time,pnum,pnum_str,tabid'.indexOf(key) > -1) {
+      if (!displayTimes) {
+        //sobj.form.tid = []; //切换日期时间清空桌位
+        //sobj.buttonhide = true;
+        this.getTables();
+      }
+      if (key == 'date') {
+        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.setData(sobj)
   },
   async getTables(){
@@ -518,7 +658,14 @@ Page({
       //buttonhide: true,
     })
     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();
     setTimeout(res=>{
       this.getTables();
@@ -695,6 +842,7 @@ Page({
       this.year=util.unixtoTime(options.ddate.substr(0,10),'YYYY');
       let form=this.data.form
       form.tid=[options.tid]
+
       this.setData({
         form: form,
       })

@@ -44,17 +44,17 @@
             <view class="tab flex-ll">
                 <formids class="item {{form.time==0?'checked':''}} {{timeOpt[0]}}"
                         wx:if="{{timePickerArray[0].length>0}}"
-                      bindtap="selectedValue" data-key="time" data-value="0">
+                      bindtap="selectedValueAsync" data-key="time" data-value="0">
                     <view class="picker">早市</view>
                 </formids>
                 <formids class="item {{form.time==1?'checked':''}}  {{timeOpt[1]}}"
                          wx:if="{{timePickerArray[1].length>0}}"
-                      bindtap="selectedValue" data-key="time" data-value="1">
+                      bindtap="selectedValueAsync" data-key="time" data-value="1">
                     <view class="picker">午市</view>
                 </formids>
                 <formids class="item {{form.time==2?'checked':''}}  {{timeOpt[2]}}"
                          wx:if="{{timePickerArray[2].length>0}}"
-                      bindtap="selectedValue" data-key="time" data-value="2">
+                      bindtap="selectedValueAsync" data-key="time" data-value="2">
                     <view class="picker">晚市</view>
                 </formids>
             </view>