Commit 097258a8295e84e0d8ac849844d05fb76afb3673

Authored by wangfan
1 parent a932e1ce

v2 time

@@ -46,6 +46,13 @@ Page({ @@ -46,6 +46,13 @@ Page({
46 { month: 'current', day: new Date().getDate(), color: 'white', background: '#AAD4F5' }, 46 { month: 'current', day: new Date().getDate(), color: 'white', background: '#AAD4F5' },
47 { month: 'current', day: new Date().getDate(), color: 'white', background: '#AAD4F5' } 47 { month: 'current', day: new Date().getDate(), color: 'white', background: '#AAD4F5' }
48 ], 48 ],
  49 +
  50 + timePickerArray:[
  51 + ['6:00','6:30','7:00'],
  52 + ['10:00','10:30','11:00'],
  53 + [],
  54 + ],
  55 + timePickerIndex:[0,0,0],
49 }, 56 },
50 tablesAll:[], 57 tablesAll:[],
51 /** 58 /**
@@ -55,6 +62,7 @@ Page({ @@ -55,6 +62,7 @@ Page({
55 this.setDateStr(); 62 this.setDateStr();
56 this.sellerid=util.cache('sellerid'); 63 this.sellerid=util.cache('sellerid');
57 this.getTables() 64 this.getTables()
  65 + comm.getDayTimeSpace();
58 }, 66 },
59 /** 67 /**
60 * 68 *
@@ -266,4 +274,16 @@ Page({ @@ -266,4 +274,16 @@ Page({
266 calendarMask:false 274 calendarMask:false
267 }) 275 })
268 }, 276 },
  277 + /**
  278 + * 选中时间区域
  279 + */
  280 + bindTimePickerChange(e){
  281 + let timeIndex=util.attr(e,'timeIndex');
  282 + console.log(e,timeIndex);
  283 + let timePickerIndex=this.data.timePickerIndex;
  284 + timePickerIndex[timeIndex]=util.val(e);
  285 + this.setData({
  286 + timePickerIndex:timePickerIndex,
  287 + })
  288 + },
269 }) 289 })
@@ -23,15 +23,36 @@ @@ -23,15 +23,36 @@
23 <view class="tab"> 23 <view class="tab">
24 <item class="item {{form.time==0?'checked':''}}" 24 <item class="item {{form.time==0?'checked':''}}"
25 bindtap="selectedValue" data-key="time" data-value="0"> 25 bindtap="selectedValue" data-key="time" data-value="0">
26 - 早市 26 + <picker bindchange="bindTimePickerChange"
  27 + data-time-index="0"
  28 + value="{{timePickerIndex[0]}}"
  29 + range="{{timePickerArray[0]}}">
  30 + <view class="picker">
  31 + 早市 {{timePickerArray[0][timePickerIndex[0]]}}
  32 + </view>
  33 + </picker>
27 </item> 34 </item>
28 <item class="item {{form.time==1?'checked':''}}" 35 <item class="item {{form.time==1?'checked':''}}"
29 bindtap="selectedValue" data-key="time" data-value="1"> 36 bindtap="selectedValue" data-key="time" data-value="1">
30 - 午市 37 + <picker bindchange="bindTimePickerChange"
  38 + data-time-index="1"
  39 + value="{{timePickerIndex[1]}}"
  40 + range="{{timePickerArray[1]}}">
  41 + <view class="picker">
  42 + 午市 {{timePickerArray[1][timePickerIndex[1]]}}
  43 + </view>
  44 + </picker>
31 </item> 45 </item>
32 <item class="item {{form.time==2?'checked':''}}" 46 <item class="item {{form.time==2?'checked':''}}"
33 bindtap="selectedValue" data-key="time" data-value="2"> 47 bindtap="selectedValue" data-key="time" data-value="2">
34 - 晚市 48 + <picker bindchange="bindTimePickerChange"
  49 + data-time-index="2"
  50 + value="{{timePickerIndex[2]}}"
  51 + range="{{timePickerArray[2]}}">
  52 + <view class="picker">
  53 + 晚市 {{timePickerArray[2][timePickerIndex[2]]}}
  54 + </view>
  55 + </picker>
35 </item> 56 </item>
36 </view> 57 </view>
37 </view> 58 </view>
@@ -56,14 +56,17 @@ @@ -56,14 +56,17 @@
56 .section .tab .item{ 56 .section .tab .item{
57 height: 50rpx; 57 height: 50rpx;
58 line-height: 50rpx; 58 line-height: 50rpx;
59 - width: 150rpx !important;  
60 - min-width: 150rpx !important; 59 + width: 180rpx !important;
  60 + min-width: 180rpx !important;
61 border-radius: 10rpx; 61 border-radius: 10rpx;
62 border: 2rpx solid #199095; 62 border: 2rpx solid #199095;
63 - margin-right: 62rpx; 63 + margin-right: 60rpx;
64 text-align: center; 64 text-align: center;
65 display: inline-block; 65 display: inline-block;
66 } 66 }
  67 +.section .tab .item:last-child{
  68 + margin-right: 0;
  69 +}
67 .section .tab .checked{ 70 .section .tab .checked{
68 background-color:#199095; 71 background-color:#199095;
69 color: #FEFEFE; 72 color: #FEFEFE;
@@ -67,7 +67,32 @@ module.exports ={ @@ -67,7 +67,32 @@ module.exports ={
67 return util.timetouUnix(stime)+'-'+util.timetouUnix(etime); 67 return util.timetouUnix(stime)+'-'+util.timetouUnix(etime);
68 } 68 }
69 }catch (e){ 69 }catch (e){
70 - console(e); 70 + console.log(e);
  71 + }
  72 + return false;
  73 + },
  74 + //获得早中晚时间分组,
  75 + async getDayTimeSpace(step=30,sc=null){
  76 + try {
  77 + let d=new Date()/1000;
  78 + if(!sc){
  79 + let res = await App.Reserve.SellerInfo(util.cache('enter_params'));
  80 + sc = res.data;
  81 + }
  82 + if (sc.daily){
  83 + let ti=['morning','noon','night'];
  84 + let dts=[[],[],[]];
  85 + ti.forEach((tx,ii)=>{
  86 + let ts=sc.daily[tx].split('-');
  87 + console.log(ts);
  88 + // while (ts[0]<ts[1]){
  89 + // dts[ii].push(ts[0]);
  90 + //
  91 + // }
  92 + })
  93 + }
  94 + }catch (e){
  95 + console.log(e);
71 } 96 }
72 return false; 97 return false;
73 } 98 }