Commit 31d582440f00d6450bed7da8bf8359484001da51

Authored by wangfan
1 parent 491898f7

most_pnum

... ... @@ -49,8 +49,8 @@ Page({
{ month: 'current', day: new Date().getDate(), color: 'white', background: '#AAD4F5' }
],
timePickerArray:[
['6:00','6:30','7:00'],
['10:00','10:30','11:00'],
[],
[],
[],
],
timePickerIndex:[0,0,0],
... ...
... ... @@ -43,18 +43,21 @@
<view class="section ">
<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">
<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">
<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">
<view class="picker">
晚市
... ...
... ... @@ -20,11 +20,16 @@ Page({
sort:'',
form:{
time:-1,
}
},
timePickerArray:[
[],
[],
[],
],
},
sellerid:0,
indexOpt:null,
onLoad:function(opt){
onLoad:async function(opt){
let d=new Date()/1000;
let dateStr=util.unixtoTime(d,'MM-DD DAY');
var radio=750/util.getsystem().windowWidth;
... ... @@ -38,10 +43,12 @@ Page({
this.sellerid=util.cache('sellerid');
}
//this.sellerid=opt.seller_id ? opt.seller_id : util.cache('sellerid');
let timePickerArray= await bookOrder.getDayTimeSpace();
this.setData({
sellerid:this.sellerid,
listHeight:contentHeight-Math.ceil(210/radio),
dateStr:dateStr,
timePickerArray: timePickerArray,
})
//util.setBarTitle('预定本');
this.indexOpt=opt;
... ...
... ... @@ -21,14 +21,17 @@
<view class="block section flex-vc">
<view class="tab flex-cc">
<formids class="item flex-vc {{form.time==0?'checked':''}}"
wx:if="{{timePickerArray[0].length>0}}"
bindtap="selectedValue" data-key="time" data-value="0">
早市
</formids>
<formids class="item flex-cc {{form.time==1?'checked':''}}"
wx:if="{{timePickerArray[1].length>0}}"
bindtap="selectedValue" data-key="time" data-value="1">
午市
</formids>
<formids class="item flex-cc {{form.time==2?'checked':''}}"
wx:if="{{timePickerArray[2].length>0}}"
bindtap="selectedValue" data-key="time" data-value="2">
晚市
</formids>
... ...
... ... @@ -23,15 +23,21 @@ Page({
},
regions:[],
sellerid:0,
timePickerArray:[
[],
[],
[],
],
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
onLoad: async function (options) {
let d=new Date()/1000;
let dateStr=util.unixtoTime(d,'MM-DD DAY');
let timePickerArray= await bookOrder.getDayTimeSpace();
this.setData({
dateStr:dateStr
dateStr:dateStr,
timePickerArray:timePickerArray,
})
},
... ...
... ... @@ -10,14 +10,17 @@
<view class="block section flex-vc">
<view class="tab flex-cc">
<formids class="item {{time==0?'checked':''}} flex-cc"
wx:if="{{timePickerArray[0].length>0}}"
bindtap="selectedValue" data-key="time" data-value="0">
早市
</formids>
<formids class="item {{time==1?'checked':''}} flex-cc"
wx:if="{{timePickerArray[1].length>0}}"
bindtap="selectedValue" data-key="time" data-value="1">
午市
</formids>
<formids class="item {{time==2?'checked':''}} flex-cc"
wx:if="{{timePickerArray[2].length>0}}"
bindtap="selectedValue" data-key="time" data-value="2">
晚市
</formids>
... ...
... ... @@ -86,9 +86,11 @@ module.exports ={
sc = res.data;
}
if (sc.daily){
//sc.daily.morning=null;
let ti=['morning','noon','night'];
let dts=[[],[],[]];
ti.forEach((tx,ii)=>{
if(!sc.daily[tx]) return;
let ts=sc.daily[tx].split('-');
console.log('getDayTimeSpace',ts);
while (ts[0]<=ts[1]){
... ...