xt / xcx-book · Commits

Go to a project

Commit 31d582440f00d6450bed7da8bf8359484001da51

Authored by wangfan
1 parent 491898f7
build: skipped

most_pnum

Inline Side-by-side
Showing 7 changed files with 31 additions and 7 deletions
@@ -49,8 +49,8 @@ Page({ @@ -49,8 +49,8 @@ Page({
49 { month: 'current', day: new Date().getDate(), color: 'white', background: '#AAD4F5' } 49 { month: 'current', day: new Date().getDate(), color: 'white', background: '#AAD4F5' }
50 ], 50 ],
51 timePickerArray:[ 51 timePickerArray:[
52 - ['6:00','6:30','7:00'],  
53 - ['10:00','10:30','11:00'], 52 + [],
  53 + [],
54 [], 54 [],
55 ], 55 ],
56 timePickerIndex:[0,0,0], 56 timePickerIndex:[0,0,0],
@@ -43,18 +43,21 @@ @@ -43,18 +43,21 @@
43 <view class="section "> 43 <view class="section ">
44 <view class="tab flex-ll"> 44 <view class="tab flex-ll">
45 <formids class="item {{form.time==0?'checked':''}} {{timeOpt[0]}}" 45 <formids class="item {{form.time==0?'checked':''}} {{timeOpt[0]}}"
  46 + wx:if="{{timePickerArray[0].length>0}}"
46 bindtap="selectedValue" data-key="time" data-value="0"> 47 bindtap="selectedValue" data-key="time" data-value="0">
47 <view class="picker"> 48 <view class="picker">
48 早市 49 早市
49 </view> 50 </view>
50 </formids> 51 </formids>
51 <formids class="item {{form.time==1?'checked':''}} {{timeOpt[1]}}" 52 <formids class="item {{form.time==1?'checked':''}} {{timeOpt[1]}}"
  53 + wx:if="{{timePickerArray[1].length>0}}"
52 bindtap="selectedValue" data-key="time" data-value="1"> 54 bindtap="selectedValue" data-key="time" data-value="1">
53 <view class="picker"> 55 <view class="picker">
54 午市 56 午市
55 </view> 57 </view>
56 </formids> 58 </formids>
57 <formids class="item {{form.time==2?'checked':''}} {{timeOpt[2]}}" 59 <formids class="item {{form.time==2?'checked':''}} {{timeOpt[2]}}"
  60 + wx:if="{{timePickerArray[2].length>0}}"
58 bindtap="selectedValue" data-key="time" data-value="2"> 61 bindtap="selectedValue" data-key="time" data-value="2">
59 <view class="picker"> 62 <view class="picker">
60 晚市 63 晚市
@@ -20,11 +20,16 @@ Page({ @@ -20,11 +20,16 @@ Page({
20 sort:'', 20 sort:'',
21 form:{ 21 form:{
22 time:-1, 22 time:-1,
23 - } 23 + },
  24 + timePickerArray:[
  25 + [],
  26 + [],
  27 + [],
  28 + ],
24 }, 29 },
25 sellerid:0, 30 sellerid:0,
26 indexOpt:null, 31 indexOpt:null,
27 - onLoad:function(opt){ 32 + onLoad:async function(opt){
28 let d=new Date()/1000; 33 let d=new Date()/1000;
29 let dateStr=util.unixtoTime(d,'MM-DD DAY'); 34 let dateStr=util.unixtoTime(d,'MM-DD DAY');
30 var radio=750/util.getsystem().windowWidth; 35 var radio=750/util.getsystem().windowWidth;
@@ -38,10 +43,12 @@ Page({ @@ -38,10 +43,12 @@ Page({
38 this.sellerid=util.cache('sellerid'); 43 this.sellerid=util.cache('sellerid');
39 } 44 }
40 //this.sellerid=opt.seller_id ? opt.seller_id : util.cache('sellerid'); 45 //this.sellerid=opt.seller_id ? opt.seller_id : util.cache('sellerid');
  46 + let timePickerArray= await bookOrder.getDayTimeSpace();
41 this.setData({ 47 this.setData({
42 sellerid:this.sellerid, 48 sellerid:this.sellerid,
43 listHeight:contentHeight-Math.ceil(210/radio), 49 listHeight:contentHeight-Math.ceil(210/radio),
44 dateStr:dateStr, 50 dateStr:dateStr,
  51 + timePickerArray: timePickerArray,
45 }) 52 })
46 //util.setBarTitle('预定本'); 53 //util.setBarTitle('预定本');
47 this.indexOpt=opt; 54 this.indexOpt=opt;
@@ -21,14 +21,17 @@ @@ -21,14 +21,17 @@
21 <view class="block section flex-vc"> 21 <view class="block section flex-vc">
22 <view class="tab flex-cc"> 22 <view class="tab flex-cc">
23 <formids class="item flex-vc {{form.time==0?'checked':''}}" 23 <formids class="item flex-vc {{form.time==0?'checked':''}}"
  24 + wx:if="{{timePickerArray[0].length>0}}"
24 bindtap="selectedValue" data-key="time" data-value="0"> 25 bindtap="selectedValue" data-key="time" data-value="0">
25 早市 26 早市
26 </formids> 27 </formids>
27 <formids class="item flex-cc {{form.time==1?'checked':''}}" 28 <formids class="item flex-cc {{form.time==1?'checked':''}}"
  29 + wx:if="{{timePickerArray[1].length>0}}"
28 bindtap="selectedValue" data-key="time" data-value="1"> 30 bindtap="selectedValue" data-key="time" data-value="1">
29 午市 31 午市
30 </formids> 32 </formids>
31 <formids class="item flex-cc {{form.time==2?'checked':''}}" 33 <formids class="item flex-cc {{form.time==2?'checked':''}}"
  34 + wx:if="{{timePickerArray[2].length>0}}"
32 bindtap="selectedValue" data-key="time" data-value="2"> 35 bindtap="selectedValue" data-key="time" data-value="2">
33 晚市 36 晚市
34 </formids> 37 </formids>
@@ -23,15 +23,21 @@ Page({ @@ -23,15 +23,21 @@ Page({
23 }, 23 },
24 regions:[], 24 regions:[],
25 sellerid:0, 25 sellerid:0,
  26 + timePickerArray:[
  27 + [],
  28 + [],
  29 + [],
  30 + ],
26 /** 31 /**
27 * 生命周期函数--监听页面加载 32 * 生命周期函数--监听页面加载
28 */ 33 */
29 - onLoad: function (options) { 34 + onLoad: async function (options) {
30 let d=new Date()/1000; 35 let d=new Date()/1000;
31 let dateStr=util.unixtoTime(d,'MM-DD DAY'); 36 let dateStr=util.unixtoTime(d,'MM-DD DAY');
32 - 37 + let timePickerArray= await bookOrder.getDayTimeSpace();
33 this.setData({ 38 this.setData({
34 - dateStr:dateStr 39 + dateStr:dateStr,
  40 + timePickerArray:timePickerArray,
35 }) 41 })
36 }, 42 },
37 43
@@ -10,14 +10,17 @@ @@ -10,14 +10,17 @@
10 <view class="block section flex-vc"> 10 <view class="block section flex-vc">
11 <view class="tab flex-cc"> 11 <view class="tab flex-cc">
12 <formids class="item {{time==0?'checked':''}} flex-cc" 12 <formids class="item {{time==0?'checked':''}} flex-cc"
  13 + wx:if="{{timePickerArray[0].length>0}}"
13 bindtap="selectedValue" data-key="time" data-value="0"> 14 bindtap="selectedValue" data-key="time" data-value="0">
14 早市 15 早市
15 </formids> 16 </formids>
16 <formids class="item {{time==1?'checked':''}} flex-cc" 17 <formids class="item {{time==1?'checked':''}} flex-cc"
  18 + wx:if="{{timePickerArray[1].length>0}}"
17 bindtap="selectedValue" data-key="time" data-value="1"> 19 bindtap="selectedValue" data-key="time" data-value="1">
18 午市 20 午市
19 </formids> 21 </formids>
20 <formids class="item {{time==2?'checked':''}} flex-cc" 22 <formids class="item {{time==2?'checked':''}} flex-cc"
  23 + wx:if="{{timePickerArray[2].length>0}}"
21 bindtap="selectedValue" data-key="time" data-value="2"> 24 bindtap="selectedValue" data-key="time" data-value="2">
22 晚市 25 晚市
23 </formids> 26 </formids>
@@ -86,9 +86,11 @@ module.exports ={ @@ -86,9 +86,11 @@ module.exports ={
86 sc = res.data; 86 sc = res.data;
87 } 87 }
88 if (sc.daily){ 88 if (sc.daily){
  89 + //sc.daily.morning=null;
89 let ti=['morning','noon','night']; 90 let ti=['morning','noon','night'];
90 let dts=[[],[],[]]; 91 let dts=[[],[],[]];
91 ti.forEach((tx,ii)=>{ 92 ti.forEach((tx,ii)=>{
  93 + if(!sc.daily[tx]) return;
92 let ts=sc.daily[tx].split('-'); 94 let ts=sc.daily[tx].split('-');
93 console.log('getDayTimeSpace',ts); 95 console.log('getDayTimeSpace',ts);
94 while (ts[0]<=ts[1]){ 96 while (ts[0]<=ts[1]){