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={
date:0,
time:0,
//pnum_str:'1-4',
pnum:60,
pnum:6,
tabid:0,
rname:'',
... ... @@ -55,6 +55,8 @@ Page({
],
timePickerIndex:[0,0,0],
tablesLength:0,
timePickerMask:false,
},
/**
* 生命周期函数--监听页面加载
... ... @@ -221,6 +223,9 @@ Page({
sobj.buttonhide=true;
this.getTables();
}
if(key=='time'){
sobj.timePickerMask=true;
}
this.setData(sobj)
},
async getTables(){
... ... @@ -360,7 +365,8 @@ Page({
},
calendarClose(){
this.setData({
calendarMask:false
calendarMask:false,
timePickerMask:false,
})
},
async selectdesk(){
... ... @@ -388,9 +394,11 @@ Page({
*/
bindTimePickerChange(e){
let timeIndex=util.attr(e,'timeIndex');
console.log(e,timeIndex);
let timePickerIndex=this.data.timePickerIndex;
timePickerIndex[timeIndex]=util.val(e);
//timePickerIndex[timeIndex]=util.val(e);
timePickerIndex[timeIndex]=util.attr(e,'val');
console.log(e,timeIndex,util.attr(e,'val'));
this.setData({
timePickerIndex:timePickerIndex,
})
... ...
... ... @@ -44,36 +44,21 @@
<view class="tab flex-ll">
<view class="item {{form.time==0?'checked':''}}"
bindtap="selectedValue" data-key="time" data-value="0">
<picker bindchange="bindTimePickerChange"
data-time-index="0"
value="{{timePickerIndex[0]}}"
range="{{timePickerArray[0]}}">
<view class="picker">
早市 {{timePickerArray[0][timePickerIndex[0]]}}
</view>
</picker>
<view class="picker">
早市 {{timePickerArray[0][timePickerIndex[0]]}}
</view>
</view>
<view class="item {{form.time==1?'checked':''}}"
bindtap="selectedValue" data-key="time" data-value="1">
<picker bindchange="bindTimePickerChange"
data-time-index="1"
value="{{timePickerIndex[1]}}"
range="{{timePickerArray[1]}}">
<view class="picker">
午市 {{timePickerArray[1][timePickerIndex[1]]}}
</view>
</picker>
<view class="picker">
午市 {{timePickerArray[1][timePickerIndex[1]]}}
</view>
</view>
<view class="item {{form.time==2?'checked':''}}"
bindtap="selectedValue" data-key="time" data-value="2">
<picker bindchange="bindTimePickerChange"
data-time-index="2"
value="{{timePickerIndex[2]}}"
range="{{timePickerArray[2]}}">
<view class="picker">
晚市 {{timePickerArray[2][timePickerIndex[2]]}}
</view>
</picker>
<view class="picker">
晚市 {{timePickerArray[2][timePickerIndex[2]]}}
</view>
</view>
</view>
</view>
... ... @@ -229,4 +214,24 @@
header-style="calendar-header"
board-style="calendar-board"></calendar>
</view>
</view>
<view class="calendar-mask" bindtap="calendarClose"
style="height:100%;" wx:if="{{timePickerMask}}">
<view class="timePicker">
<view class="flex-rr">
<image class="close" src="/pages/image/add-act.png" bindtap="calendarClose"></image>
</view>
<view class="flex-cc" style="margin-bottom: 56rpx; font-size: 30rpx;">
<view bindtap="calendarClose">{{form.time==1?'午市':form.time==2?'晚市':'早市'}}</view>
</view>
<view class="flex-ll" style="flex-wrap:wrap">
<view class="time-item {{timePickerIndex[form.time]==index?'checked':''}}"
style="{{(index+1)%3==0?'margin-right:0;':''}}"
wx:for="{{timePickerArray[form.time]}}" wx:key=""
bindtap="bindTimePickerChange"
data-time-index="{{form.time}}"
data-val="{{index}}"
>{{item}}</view>
</view>
</view>
</view>
\ No newline at end of file
... ...
... ... @@ -239,4 +239,38 @@
}
.placeholder-class-pnum{
color:#199095;
}
.timePicker{
width: 80%;
overflow: hidden;
position: absolute;
bottom: 0;
border-top: 2rpx solid #ccc;
background-color: #FEFEFE;
padding: 20rpx 10% 80rpx;
}
.timePicker .time-item{
width: 150rpx;
height: 60rpx;
line-height: 60rpx;
font-size: 40rpx;
font-weight: bold;
color:#199095;
border: 2rpx solid #199095;
border-radius: 10rpx;
text-align: center;
margin-right: 66rpx;
margin-bottom: 60rpx;
}
.timePicker .time-item.checked{
background-color: #199095;
color:#fefefe;
}
.timePicker .close{
width: 50rpx;
height: 50rpx;
transform:rotate(45deg);
margin-top: -10rpx;
margin-right: -10%;
}
\ No newline at end of file
... ...
... ... @@ -7,7 +7,7 @@
</view>
<view class="flex-lr order-detail">
<view class="gray-deep-font font30r">用餐人数</view>
<view class="black-font font34r">{{bookInfo.pnum_str}}人</view>
<view class="black-font font34r">{{bookInfo.pnum_str||bookInfo.pnum}}人</view>
</view>
<view class="flex-lr order-detail">
<view class="gray-deep-font font30r">预定座位</view>
... ...
... ... @@ -30,7 +30,7 @@
"list": []
},
"miniprogram": {
"current": 6,
"current": 17,
"list": [
{
"id": 0,
... ... @@ -164,10 +164,10 @@
"query": "id=25"
},
{
"id": -1,
"id": 17,
"name": "预定本-编辑预定信息",
"pathName": "pages/book/b_addnew",
"query": "id=51",
"query": "id=152",
"scene": "1001"
},
{
... ...