Commit 0cc13525289f7646033dde44cf9144cd3ec940d9

Authored by wangfan
1 parent bac3659e

默认到店时间

@@ -68,6 +68,8 @@ Page({ @@ -68,6 +68,8 @@ Page({
68 calendar:{ 68 calendar:{
69 nextNum:0, 69 nextNum:0,
70 }, 70 },
  71 + defDtime:['','12:00','18:30'],
  72 + hasUseDefDtime:true,
71 }, 73 },
72 /** 74 /**
73 * 生命周期函数--监听页面加载 75 * 生命周期函数--监听页面加载
@@ -87,9 +89,17 @@ Page({ @@ -87,9 +89,17 @@ Page({
87 await this.setDateStr(); 89 await this.setDateStr();
88 this.sellerid=util.cache('sellerid'); 90 this.sellerid=util.cache('sellerid');
89 let timePickerArray= await comm.getDayTimeSpace(); 91 let timePickerArray= await comm.getDayTimeSpace();
  92 + //判断hasUseDefDtime
  93 + let hasUseDefDtime=true;
  94 + let mmii=util.unixtoTime(new Date()/1000,'HH:II');
  95 + if(mmii>this.data.defDtime[this.data.form.time]){
  96 + hasUseDefDtime=false;
  97 + }
  98 +
90 this.setData({ 99 this.setData({
91 timePickerArray: timePickerArray, 100 timePickerArray: timePickerArray,
92 - speciallist:speciallist 101 + speciallist:speciallist,
  102 + hasUseDefDtime:hasUseDefDtime,
93 }) 103 })
94 if(this.reserve_id>0){ 104 if(this.reserve_id>0){
95 this.initModify(this.reserve_id); 105 this.initModify(this.reserve_id);
@@ -273,7 +283,14 @@ Page({ @@ -273,7 +283,14 @@ Page({
273 this.setDateStr(util.timetouUnix(xtime)); 283 this.setDateStr(util.timetouUnix(xtime));
274 } 284 }
275 } 285 }
276 - 286 + //判断hasUseDefDtime
  287 + sobj.hasUseDefDtime=true;
  288 + if(this.data.form.date==0){//
  289 + let mmii=util.unixtoTime(new Date()/1000,'HH:II');
  290 + if(mmii>this.data.defDtime[key=='time'?val:this.data.form.time]){
  291 + sobj.hasUseDefDtime=false;
  292 + }
  293 + }
277 this.setData(sobj) 294 this.setData(sobj)
278 }, 295 },
279 async getTables(){ 296 async getTables(){
@@ -368,6 +385,10 @@ Page({ @@ -368,6 +385,10 @@ Page({
368 }catch (e){} 385 }catch (e){}
369 } 386 }
370 form.ddate=d_rdate.substr(0,10); 387 form.ddate=d_rdate.substr(0,10);
  388 + if(this.data.hasUseDefDtime && this.data.form.time>0){//转为默认时间
  389 + let ddateStr=util.unixtoTime(form.ddate,"YYYY-MM-DD "+this.data.defDtime[this.data.form.time]+":00");
  390 + form.ddate=util.timetouUnix(ddateStr);
  391 + }
371 App.Reserve.SetReserveInfo(form).then(res => { 392 App.Reserve.SetReserveInfo(form).then(res => {
372 if(res.ret==200){ 393 if(res.ret==200){
373 let _id=(res.data.id || res.data) 394 let _id=(res.data.id || res.data)
@@ -464,6 +485,7 @@ Page({ @@ -464,6 +485,7 @@ Page({
464 console.log(e,timeIndex,util.attr(e,'val')); 485 console.log(e,timeIndex,util.attr(e,'val'));
465 this.setData({ 486 this.setData({
466 timePickerIndex:timePickerIndex, 487 timePickerIndex:timePickerIndex,
  488 + hasUseDefDtime:false,
467 }) 489 })
468 }, 490 },
469 /** 491 /**
@@ -184,7 +184,8 @@ @@ -184,7 +184,8 @@
184 </view> 184 </view>
185 </view> 185 </view>
186 <view class="book-info-single" bindtap="selectedValue" data-key="time" data-value="{{form.time}}" data-display="block"> 186 <view class="book-info-single" bindtap="selectedValue" data-key="time" data-value="{{form.time}}" data-display="block">
187 - <view style="font-size: 34rpx;height: 100rpx;line-height: 100rpx;">{{timePickerArray[form.time][timePickerIndex[form.time]]}}</view> 187 + <view style="font-size: 34rpx;height: 100rpx;line-height: 100rpx;" wx:if="{{hasUseDefDtime && form.time>0}}">{{defDtime[form.time]}}</view>
  188 + <view style="font-size: 34rpx;height: 100rpx;line-height: 100rpx;" wx:else="">{{timePickerArray[form.time][timePickerIndex[form.time]]}}</view>
188 </view> 189 </view>
189 190
190 <view class="book-info-single"> 191 <view class="book-info-single">