Commit f8784d0f11bf9d0dddde91c14b01d0cc8106cc4e

Authored by wangfan
1 parent 7e2ff8a0

most_pnum

... ... @@ -94,7 +94,11 @@ Page({
//let dateStr=this.data.dateStr;
let nowStr=util.unixtoTime(d,'MM-DD `DAY/周WW`')
let form=this.data.form;
form.time=await comm.getTimeSpaceIndex(d);
let timeObj = await comm.getTimeSpaceIndexData(d);
//form.time=await comm.getTimeSpaceIndex(d);
form.time=timeObj.timeIndex;
let ind=dateStr._indexOf(nowStr);
if(ind>-1){
form.date=ind
... ... @@ -102,9 +106,13 @@ Page({
dateStr.push(nowStr.substr(0,5));
form.date=2;
}
let timePickerIndex=this.data.timePickerIndex;
timePickerIndex[timeObj.timeIndex]=timeObj.timeMatchIndex;
let obj={
dateStr:dateStr,
form:form,
dateStr:dateStr,
form:form,
timePickerIndex:timePickerIndex,
timeOpt:timeObj.timeOpt,
};
this.setData(obj)
return obj;
... ... @@ -206,7 +214,9 @@ Page({
}else{
val=util.attr(e,'value');
}
if(key=='time'){
if(this.data.timeOpt[val]) return;
}
let form=this.data.form;
if(key=='tid'){
... ... @@ -242,6 +252,10 @@ Page({
sobj.buttonhide=true;
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));
}
}
this.setData(sobj)
... ...
... ... @@ -42,19 +42,19 @@
</view>
<view class="section ">
<view class="tab flex-ll">
<formids class="item {{form.time==0?'checked':''}}"
<formids class="item {{form.time==0?'checked':''}} {{timeOpt[0]}}"
bindtap="selectedValue" data-key="time" data-value="0">
<view class="picker">
早市
</view>
</formids>
<formids class="item {{form.time==1?'checked':''}}"
<formids class="item {{form.time==1?'checked':''}} {{timeOpt[1]}}"
bindtap="selectedValue" data-key="time" data-value="1">
<view class="picker">
午市
</view>
</formids>
<formids class="item {{form.time==2?'checked':''}}"
<formids class="item {{form.time==2?'checked':''}} {{timeOpt[2]}}"
bindtap="selectedValue" data-key="time" data-value="2">
<view class="picker">
晚市
... ...
... ... @@ -91,6 +91,11 @@
color: #FEFEFE;
border: 2rpx solid #199095;
}
.section .tab .disabled{
background-color:#999999;
color: #efefef;
border: 2rpx solid #999999;
}
/**
可定桌位
... ...
... ... @@ -24,7 +24,7 @@
<view class="button-view flex-vc {{form.price>0?'active':''}}">
<view class="page flex-lr" style="padding-top: 0;">
<view class="tip" wx:if="{{form.price>0}}">{{form.price}}元</view>
<view class="tip" wx:else="">短信剩余{{sms.lasr_num}}条,不充值将无法给顾客发送预定通知</view>
<view class="tip" wx:else="">剩余{{sms.lasr_num}}条短信,请及时充值以保证正常使用</view>
<view class="button Medium" bindtap="buy">购买</view>
</view>
</view>
... ...
... ... @@ -84,7 +84,7 @@ export default {
//查询短信剩余及套餐
'App.Reserve.SmsInfo':{
cachetime:300,
cachetime:60,
},
//生成支付签名接口
... ...
... ... @@ -137,6 +137,42 @@ module.exports ={
console.log(e);
}
return 0;
},
//获得时间戳在早中晚的索引等
async getTimeSpaceIndexData(d=new Date()/1000,sc=null){
let day0 = new Date(new Date().setHours(0, 0, 0, 0)) / 1000 ;
let day1 = day0 + 86400;
let isDay=false;//是否今天
if(d<day1 && d>day0){
isDay=true;
}
let times=await this.getDayTimeSpace();
let nd=util.unixtoTime(d,'HH:II')
let obj={
timeIndex:0,
timeMatchIndex:0,
timeOpt:['','','']
};
for(let i=0;i<times.length;i++) {
let flag = false;
for (let j = 0; j < times[i].length; j++) {
//console.log('times', nd, times[i][j], i, j);
if (nd < times[i][j]) {
obj.timeIndex = i;
obj.timeMatchIndex = j;
flag = true;
break;
}
}
if (flag) {
break;
}
if (isDay) {
obj.timeOpt[i] = 'disabled';
}
}
//console.log('times',obj);
return obj;
}
}
... ...