xt / xcx-book · Commits

Go to a project

Commit 48fc6b966fbfc00bd392f6e4fcd3552618c9bf76

Authored by wangfan
1 parent 80598463
build: skipped

录入调整

Inline Side-by-side
Showing 9 changed files with 79 additions and 32 deletions
@@ -8,7 +8,7 @@ const formTpl={ @@ -8,7 +8,7 @@ const formTpl={
8 date:0, 8 date:0,
9 time:0, 9 time:0,
10 //pnum_str:'1-4', 10 //pnum_str:'1-4',
11 - pnum:60, 11 + pnum:6,
12 tabid:0, 12 tabid:0,
13 13
14 rname:'', 14 rname:'',
@@ -55,6 +55,8 @@ Page({ @@ -55,6 +55,8 @@ Page({
55 ], 55 ],
56 timePickerIndex:[0,0,0], 56 timePickerIndex:[0,0,0],
57 tablesLength:0, 57 tablesLength:0,
  58 +
  59 + timePickerMask:false,
58 }, 60 },
59 /** 61 /**
60 * 生命周期函数--监听页面加载 62 * 生命周期函数--监听页面加载
@@ -221,6 +223,9 @@ Page({ @@ -221,6 +223,9 @@ Page({
221 sobj.buttonhide=true; 223 sobj.buttonhide=true;
222 this.getTables(); 224 this.getTables();
223 } 225 }
  226 + if(key=='time'){
  227 + sobj.timePickerMask=true;
  228 + }
224 this.setData(sobj) 229 this.setData(sobj)
225 }, 230 },
226 async getTables(){ 231 async getTables(){
@@ -360,7 +365,8 @@ Page({ @@ -360,7 +365,8 @@ Page({
360 }, 365 },
361 calendarClose(){ 366 calendarClose(){
362 this.setData({ 367 this.setData({
363 - calendarMask:false 368 + calendarMask:false,
  369 + timePickerMask:false,
364 }) 370 })
365 }, 371 },
366 async selectdesk(){ 372 async selectdesk(){
@@ -388,9 +394,11 @@ Page({ @@ -388,9 +394,11 @@ Page({
388 */ 394 */
389 bindTimePickerChange(e){ 395 bindTimePickerChange(e){
390 let timeIndex=util.attr(e,'timeIndex'); 396 let timeIndex=util.attr(e,'timeIndex');
391 - console.log(e,timeIndex); 397 +
392 let timePickerIndex=this.data.timePickerIndex; 398 let timePickerIndex=this.data.timePickerIndex;
393 - timePickerIndex[timeIndex]=util.val(e); 399 + //timePickerIndex[timeIndex]=util.val(e);
  400 + timePickerIndex[timeIndex]=util.attr(e,'val');
  401 + console.log(e,timeIndex,util.attr(e,'val'));
394 this.setData({ 402 this.setData({
395 timePickerIndex:timePickerIndex, 403 timePickerIndex:timePickerIndex,
396 }) 404 })
@@ -44,36 +44,21 @@ @@ -44,36 +44,21 @@
44 <view class="tab flex-ll"> 44 <view class="tab flex-ll">
45 <view class="item {{form.time==0?'checked':''}}" 45 <view class="item {{form.time==0?'checked':''}}"
46 bindtap="selectedValue" data-key="time" data-value="0"> 46 bindtap="selectedValue" data-key="time" data-value="0">
47 - <picker bindchange="bindTimePickerChange"  
48 - data-time-index="0"  
49 - value="{{timePickerIndex[0]}}"  
50 - range="{{timePickerArray[0]}}">  
51 - <view class="picker">  
52 - 早市 {{timePickerArray[0][timePickerIndex[0]]}}  
53 - </view>  
54 - </picker> 47 + <view class="picker">
  48 + 早市 {{timePickerArray[0][timePickerIndex[0]]}}
  49 + </view>
55 </view> 50 </view>
56 <view class="item {{form.time==1?'checked':''}}" 51 <view class="item {{form.time==1?'checked':''}}"
57 bindtap="selectedValue" data-key="time" data-value="1"> 52 bindtap="selectedValue" data-key="time" data-value="1">
58 - <picker bindchange="bindTimePickerChange"  
59 - data-time-index="1"  
60 - value="{{timePickerIndex[1]}}"  
61 - range="{{timePickerArray[1]}}">  
62 - <view class="picker">  
63 - 午市 {{timePickerArray[1][timePickerIndex[1]]}}  
64 - </view>  
65 - </picker> 53 + <view class="picker">
  54 + 午市 {{timePickerArray[1][timePickerIndex[1]]}}
  55 + </view>
66 </view> 56 </view>
67 <view class="item {{form.time==2?'checked':''}}" 57 <view class="item {{form.time==2?'checked':''}}"
68 bindtap="selectedValue" data-key="time" data-value="2"> 58 bindtap="selectedValue" data-key="time" data-value="2">
69 - <picker bindchange="bindTimePickerChange"  
70 - data-time-index="2"  
71 - value="{{timePickerIndex[2]}}"  
72 - range="{{timePickerArray[2]}}">  
73 - <view class="picker">  
74 - 晚市 {{timePickerArray[2][timePickerIndex[2]]}}  
75 - </view>  
76 - </picker> 59 + <view class="picker">
  60 + 晚市 {{timePickerArray[2][timePickerIndex[2]]}}
  61 + </view>
77 </view> 62 </view>
78 </view> 63 </view>
79 </view> 64 </view>
@@ -229,4 +214,24 @@ @@ -229,4 +214,24 @@
229 header-style="calendar-header" 214 header-style="calendar-header"
230 board-style="calendar-board"></calendar> 215 board-style="calendar-board"></calendar>
231 </view> 216 </view>
  217 +</view>
  218 +<view class="calendar-mask" bindtap="calendarClose"
  219 + style="height:100%;" wx:if="{{timePickerMask}}">
  220 + <view class="timePicker">
  221 + <view class="flex-rr">
  222 + <image class="close" src="/pages/image/add-act.png" bindtap="calendarClose"></image>
  223 + </view>
  224 + <view class="flex-cc" style="margin-bottom: 56rpx; font-size: 30rpx;">
  225 + <view bindtap="calendarClose">{{form.time==1?'午市':form.time==2?'晚市':'早市'}}</view>
  226 + </view>
  227 + <view class="flex-ll" style="flex-wrap:wrap">
  228 + <view class="time-item {{timePickerIndex[form.time]==index?'checked':''}}"
  229 + style="{{(index+1)%3==0?'margin-right:0;':''}}"
  230 + wx:for="{{timePickerArray[form.time]}}" wx:key=""
  231 + bindtap="bindTimePickerChange"
  232 + data-time-index="{{form.time}}"
  233 + data-val="{{index}}"
  234 + >{{item}}</view>
  235 + </view>
  236 + </view>
232 </view> 237 </view>
@@ -239,4 +239,38 @@ @@ -239,4 +239,38 @@
239 } 239 }
240 .placeholder-class-pnum{ 240 .placeholder-class-pnum{
241 color:#199095; 241 color:#199095;
  242 +}
  243 +
  244 +.timePicker{
  245 + width: 80%;
  246 + overflow: hidden;
  247 + position: absolute;
  248 + bottom: 0;
  249 + border-top: 2rpx solid #ccc;
  250 + background-color: #FEFEFE;
  251 + padding: 20rpx 10% 80rpx;
  252 +}
  253 +.timePicker .time-item{
  254 + width: 150rpx;
  255 + height: 60rpx;
  256 + line-height: 60rpx;
  257 + font-size: 40rpx;
  258 + font-weight: bold;
  259 + color:#199095;
  260 + border: 2rpx solid #199095;
  261 + border-radius: 10rpx;
  262 + text-align: center;
  263 + margin-right: 66rpx;
  264 + margin-bottom: 60rpx;
  265 +}
  266 +.timePicker .time-item.checked{
  267 + background-color: #199095;
  268 + color:#fefefe;
  269 +}
  270 +.timePicker .close{
  271 + width: 50rpx;
  272 + height: 50rpx;
  273 + transform:rotate(45deg);
  274 + margin-top: -10rpx;
  275 + margin-right: -10%;
242 } 276 }
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 </view> 7 </view>
8 <view class="flex-lr order-detail"> 8 <view class="flex-lr order-detail">
9 <view class="gray-deep-font font30r">用餐人数</view> 9 <view class="gray-deep-font font30r">用餐人数</view>
10 - <view class="black-font font34r">{{bookInfo.pnum_str}}人</view> 10 + <view class="black-font font34r">{{bookInfo.pnum_str||bookInfo.pnum}}人</view>
11 </view> 11 </view>
12 <view class="flex-lr order-detail"> 12 <view class="flex-lr order-detail">
13 <view class="gray-deep-font font30r">预定座位</view> 13 <view class="gray-deep-font font30r">预定座位</view>
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 "list": [] 30 "list": []
31 }, 31 },
32 "miniprogram": { 32 "miniprogram": {
33 - "current": 6, 33 + "current": 17,
34 "list": [ 34 "list": [
35 { 35 {
36 "id": 0, 36 "id": 0,
@@ -164,10 +164,10 @@ @@ -164,10 +164,10 @@
164 "query": "id=25" 164 "query": "id=25"
165 }, 165 },
166 { 166 {
167 - "id": -1, 167 + "id": 17,
168 "name": "预定本-编辑预定信息", 168 "name": "预定本-编辑预定信息",
169 "pathName": "pages/book/b_addnew", 169 "pathName": "pages/book/b_addnew",
170 - "query": "id=51", 170 + "query": "id=152",
171 "scene": "1001" 171 "scene": "1001"
172 }, 172 },
173 { 173 {