xt / xcx-book · Commits

Go to a project

Commit 805984630f6754d6320a79f374ad79708a0d91fa

Authored by wangfan
1 parent 3856ad1d
build: skipped

录入调整

Inline Side-by-side
Showing 3 changed files with 131 additions and 47 deletions
@@ -7,7 +7,8 @@ const formTpl={ @@ -7,7 +7,8 @@ const formTpl={
7 rid:'', 7 rid:'',
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 tabid:0, 12 tabid:0,
12 13
13 rname:'', 14 rname:'',
@@ -77,12 +78,22 @@ Page({ @@ -77,12 +78,22 @@ Page({
77 * 78 *
78 */ 79 */
79 async setDateStr(d=new Date()/1000){ 80 async setDateStr(d=new Date()/1000){
  81 + let ns=new Date()/1000;
80 let dateStr=[ 82 let dateStr=[
81 - util.unixtoTime(d,'MM-DD `DAY/周WW`'),  
82 - util.unixtoTime(parseInt(d)+86400,'MM-DD `DAY/周WW`'), 83 + util.unixtoTime(ns,'MM-DD `DAY/周WW`'),
  84 + util.unixtoTime(parseInt(ns)+86400,'MM-DD `DAY/周WW`'),
83 ]; 85 ];
  86 + //let dateStr=this.data.dateStr;
  87 + let nowStr=util.unixtoTime(d,'MM-DD `DAY/周WW`')
84 let form=this.data.form; 88 let form=this.data.form;
85 - form.time=await comm.getTimeSpaceIndex(d); 89 + //form.time=await comm.getTimeSpaceIndex(d);
  90 + let ind=dateStr._indexOf(nowStr);
  91 + if(ind>-1){
  92 + form.date=ind
  93 + }else{
  94 + dateStr.push(nowStr.substr(0,5));
  95 + form.date=2;
  96 + }
86 let obj={ 97 let obj={
87 dateStr:dateStr, 98 dateStr:dateStr,
88 form:form, 99 form:form,
@@ -205,7 +216,7 @@ Page({ @@ -205,7 +216,7 @@ Page({
205 if(form.tid.length>0 && form.rname.length>0){ 216 if(form.tid.length>0 && form.rname.length>0){
206 sobj.buttonhide=false; 217 sobj.buttonhide=false;
207 } 218 }
208 - if('date,time,pnum_str,tabid'.indexOf(key)>-1){ 219 + if('date,time,pnum,pnum_str,tabid'.indexOf(key)>-1){
209 sobj.form.tid=[]; 220 sobj.form.tid=[];
210 sobj.buttonhide=true; 221 sobj.buttonhide=true;
211 this.getTables(); 222 this.getTables();
@@ -225,7 +236,8 @@ Page({ @@ -225,7 +236,8 @@ Page({
225 console.log('rdate',this.data.dateStr[this.data.form.date],rdate); 236 console.log('rdate',this.data.dateStr[this.data.form.date],rdate);
226 App.Reserve.GetTableList({ 237 App.Reserve.GetTableList({
227 sid:this.sellerid, 238 sid:this.sellerid,
228 - pnum_str:form.pnum_str, 239 + //pnum_str:form.pnum_str,
  240 + pnum:form.pnum,
229 rdate:rdate, 241 rdate:rdate,
230 tid:form.tabid, 242 tid:form.tabid,
231 rid:this.reserve_id, 243 rid:this.reserve_id,
@@ -355,7 +367,9 @@ Page({ @@ -355,7 +367,9 @@ Page({
355 let rdate=await comm.getTimeSpace(this.data.dateStr[this.data.form.date],this.data.form.time); 367 let rdate=await comm.getTimeSpace(this.data.dateStr[this.data.form.date],this.data.form.time);
356 console.log(this.data.form) 368 console.log(this.data.form)
357 wx.navigateTo({ 369 wx.navigateTo({
358 - url:'b_desk?rdate='+rdate+'&tid='+this.data.form.tabid+'&pnum_str='+this.data.form.pnum_str 370 + url:'b_desk?rdate='+rdate+'&tid='+this.data.form.tabid
  371 + //+'&pnum_str='+this.data.form.pnum_str
  372 + +'&pnum='+this.data.form.pnum
359 +'&checked_tids='+this.data.form.tid 373 +'&checked_tids='+this.data.form.tid
360 +'&rid='+this.reserve_id 374 +'&rid='+this.reserve_id
361 }) 375 })
@@ -404,7 +418,8 @@ Page({ @@ -404,7 +418,8 @@ Page({
404 }) 418 })
405 419
406 console.log('initModify-timePickerIndex',timePickerIndex); 420 console.log('initModify-timePickerIndex',timePickerIndex);
407 - obj.form.pnum_str=res.data.pnum_str; 421 + //obj.form.pnum_str=res.data.pnum_str;
  422 + obj.form.pnum=res.data.pnum||6;
408 obj.form.rname=res.data.rname; 423 obj.form.rname=res.data.rname;
409 obj.form.phone=res.data.phone; 424 obj.form.phone=res.data.phone;
410 obj.form.sex=res.data.sex; 425 obj.form.sex=res.data.sex;
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
2 <nav>录入订座信息</nav> 2 <nav>录入订座信息</nav>
3 <view class="page"> 3 <view class="page">
4 <view class="base-info"> 4 <view class="base-info">
  5 + <!--
5 <view class="section flex-lr date"> 6 <view class="section flex-lr date">
6 <view class="flex-rr" style="width:100%;"> 7 <view class="flex-rr" style="width:100%;">
7 <item class="date-item {{form.date==0?'checked':''}}" 8 <item class="date-item {{form.date==0?'checked':''}}"
@@ -19,9 +20,29 @@ @@ -19,9 +20,29 @@
19 <view></view> 20 <view></view>
20 </view> 21 </view>
21 </view> 22 </view>
22 - <view class="section flex-ll">  
23 - <view class="tab">  
24 - <item class="item {{form.time==0?'checked':''}}" 23 + -->
  24 + <view class="section">
  25 + <view class="tab flex-ll">
  26 + <view class="item {{form.date==0?'checked':''}}"
  27 + bindtap="selectedValue" data-key="date" data-value="0">
  28 + {{dateStr[0]}}
  29 + </view>
  30 + <view class="item {{form.date==1?'checked':''}}"
  31 + bindtap="selectedValue" data-key="date" data-value="1">
  32 + {{dateStr[1]}}
  33 + </view>
  34 + <view class="item {{form.date==2?'checked':''}} flex-lr"
  35 + bindtap="selectedValue" data-key="date" data-value="2" bindtap="calendarShow">
  36 + <view style="width: 80%">{{dateStr[2]||'其他'}}</view>
  37 + <image
  38 + src="/pages/image/date{{dateStr[2]?'.selected':''}}.png"
  39 + style="min-width: 36rpx;width: 36rpx;height: 36rpx; margin-right: 22rpx;"></image>
  40 + </view>
  41 + </view>
  42 + </view>
  43 + <view class="section ">
  44 + <view class="tab flex-ll">
  45 + <view class="item {{form.time==0?'checked':''}}"
25 bindtap="selectedValue" data-key="time" data-value="0"> 46 bindtap="selectedValue" data-key="time" data-value="0">
26 <picker bindchange="bindTimePickerChange" 47 <picker bindchange="bindTimePickerChange"
27 data-time-index="0" 48 data-time-index="0"
@@ -31,8 +52,8 @@ @@ -31,8 +52,8 @@
31 早市 {{timePickerArray[0][timePickerIndex[0]]}} 52 早市 {{timePickerArray[0][timePickerIndex[0]]}}
32 </view> 53 </view>
33 </picker> 54 </picker>
34 - </item>  
35 - <item class="item {{form.time==1?'checked':''}}" 55 + </view>
  56 + <view class="item {{form.time==1?'checked':''}}"
36 bindtap="selectedValue" data-key="time" data-value="1"> 57 bindtap="selectedValue" data-key="time" data-value="1">
37 <picker bindchange="bindTimePickerChange" 58 <picker bindchange="bindTimePickerChange"
38 data-time-index="1" 59 data-time-index="1"
@@ -42,8 +63,8 @@ @@ -42,8 +63,8 @@
42 午市 {{timePickerArray[1][timePickerIndex[1]]}} 63 午市 {{timePickerArray[1][timePickerIndex[1]]}}
43 </view> 64 </view>
44 </picker> 65 </picker>
45 - </item>  
46 - <item class="item {{form.time==2?'checked':''}}" 66 + </view>
  67 + <view class="item {{form.time==2?'checked':''}}"
47 bindtap="selectedValue" data-key="time" data-value="2"> 68 bindtap="selectedValue" data-key="time" data-value="2">
48 <picker bindchange="bindTimePickerChange" 69 <picker bindchange="bindTimePickerChange"
49 data-time-index="2" 70 data-time-index="2"
@@ -53,41 +74,70 @@ @@ -53,41 +74,70 @@
53 晚市 {{timePickerArray[2][timePickerIndex[2]]}} 74 晚市 {{timePickerArray[2][timePickerIndex[2]]}}
54 </view> 75 </view>
55 </picker> 76 </picker>
56 - </item> 77 + </view>
  78 + </view>
  79 + </view>
  80 + <view class="section">
  81 + <view class="tab flex-lr">
  82 + <view class="tab flex-ll">
  83 + <view class="item-pnum {{form.pnum==item?'checked':''}}" wx:for="{{[6,7,8,9,10]}}" wx:key="pnum.key"
  84 + bindtap="selectedValue" data-key="pnum" data-value="{{item}}">
  85 + {{item}}
  86 + </view>
  87 + </view>
  88 + <view class="tab" style="margin-left: 20rpx;">
  89 + <view class="item {{form.pnum<6 || form.pnum>10?'checked':''}} flex-lr"
  90 + bindtap="selectedValue" data-key="pnum" data-value="{{form.pnum}}">
  91 + <view style="width: 80%">
  92 + <input
  93 + bindinput="selectedValue" bindconfirm="selectedValue"
  94 + data-key="pnum" value="{{form.pnum<6 || form.pnum>10?form.pnum:''}}"
  95 + placeholder-class="placeholder-class-pnum"
  96 + maxlength="3"
  97 + placeholder="{{form.pnum<6 || form.pnum>10?form.pnum:''}} 更多"/>
  98 +
  99 + </view>
  100 + <image
  101 + src="/pages/image/pnum{{form.pnum<6 || form.pnum>10?'.selected':''}}.png"
  102 + style="min-width: 36rpx;width: 36rpx;height: 36rpx; margin-right: 22rpx;"></image>
  103 + </view>
  104 + </view>
57 </view> 105 </view>
58 </view> 106 </view>
59 - <view class="section flex-ll">  
60 - <view class="tab">  
61 - <item class="item {{form.pnum_str=='1-4'?'checked':''}}" 107 + <!--
  108 + <view class="section ">
  109 + <view class="tab flex-ll">
  110 + <view class="item {{form.pnum_str=='1-4'?'checked':''}}"
62 bindtap="selectedValue" data-key="pnum_str" data-value="1-4"> 111 bindtap="selectedValue" data-key="pnum_str" data-value="1-4">
63 4人以下 112 4人以下
64 - </item>  
65 - <item class="item {{form.pnum_str=='5-9'?'checked':''}}" 113 + </view>
  114 + <view class="item {{form.pnum_str=='5-9'?'checked':''}}"
66 bindtap="selectedValue" data-key="pnum_str" data-value="5-9"> 115 bindtap="selectedValue" data-key="pnum_str" data-value="5-9">
67 5～9人 116 5～9人
68 - </item>  
69 - <item class="item {{form.pnum_str=='10-99'?'checked':''}}" 117 + </view>
  118 + <view class="item {{form.pnum_str=='10-99'?'checked':''}}"
70 bindtap="selectedValue" data-key="pnum_str" data-value="10-99"> 119 bindtap="selectedValue" data-key="pnum_str" data-value="10-99">
71 10人以上 120 10人以上
72 - </item> 121 + </view>
73 </view> 122 </view>
74 </view> 123 </view>
75 - <view class="section flex-ll">  
76 - <view class="tab">  
77 - <item class="item {{form.tabid=='2'?'checked':''}}" 124 + <view class="section ">
  125 + <view class="tab flex-ll">
  126 + <view class="item {{form.tabid=='2'?'checked':''}}"
78 bindtap="selectedValue" data-key="tabid" data-value="2"> 127 bindtap="selectedValue" data-key="tabid" data-value="2">
79 包间 128 包间
80 - </item>  
81 - <item class="item {{form.tabid=='1'?'checked':''}}" 129 + </view>
  130 + <view class="item {{form.tabid=='1'?'checked':''}}"
82 bindtap="selectedValue" data-key="tabid" data-value="1"> 131 bindtap="selectedValue" data-key="tabid" data-value="1">
83 散座 132 散座
84 - </item> 133 + </view>
85 </view> 134 </view>
86 </view> 135 </view>
  136 + -->
87 </view> 137 </view>
88 138
89 <view class="page-full tables"> 139 <view class="page-full tables">
90 - <view class="page"> 140 + <view class="page" style="margin-top: 0">
91 <view class="title flex-lr"> 141 <view class="title flex-lr">
92 <view>可订桌位<text wx:if="{{tables.length>0}}"> ({{tablesLength}})</text></view> 142 <view>可订桌位<text wx:if="{{tables.length>0}}"> ({{tablesLength}})</text></view>
93 <view class="flex-rr advice-more" bindtap="selectdesk" wx:if="{{tablesLength>1}}"> 143 <view class="flex-rr advice-more" bindtap="selectdesk" wx:if="{{tablesLength>1}}">
@@ -97,12 +147,12 @@ @@ -97,12 +147,12 @@
97 </view> 147 </view>
98 <view class="advice-desk-detail flex-rr" wx:if="{{tables.length>0}}"> 148 <view class="advice-desk-detail flex-rr" wx:if="{{tables.length>0}}">
99 <block wx:for="{{tablesed||tables}}" wx:key="tables.key"> 149 <block wx:for="{{tablesed||tables}}" wx:key="tables.key">
100 - <view class="order-desk-info" 150 + <view class="order-desk-info {{item.isselect?'desk-checked':''}}"
101 bindtap="selectedValue" 151 bindtap="selectedValue"
102 data-value="{{index}}" 152 data-value="{{index}}"
103 data-key="tid"> 153 data-key="tid">
104 <block wx:if="{{item.tid==2}}"> 154 <block wx:if="{{item.tid==2}}">
105 - <view class="flex-vc order-desk-detail" style="margin-top: 24rpx;"> 155 + <view class="flex-vc order-desk-detail" style="height:100%;">
106 <view class="font28r black-font smooth">{{item.name}}</view> 156 <view class="font28r black-font smooth">{{item.name}}</view>
107 <view class="font26r black-font" style="margin-top:6rpx;">{{item.table_pnum}}人</view> 157 <view class="font26r black-font" style="margin-top:6rpx;">{{item.table_pnum}}人</view>
108 </view> 158 </view>
1 /* pages/book/b_addnew.wxss */ 1 /* pages/book/b_addnew.wxss */
2 .page{ 2 .page{
3 width: 90%; 3 width: 90%;
4 - margin: 0 5%; 4 + margin: 40rpx 5% 0;
5 } 5 }
6 .base-info{ 6 .base-info{
7 7
8 } 8 }
9 .section{ 9 .section{
10 - height: 92rpx;  
11 - line-height: 92rpx; 10 + height: 110rpx;
  11 + line-height: 110rpx;
12 12
13 } 13 }
14 .section .label{ 14 .section .label{
@@ -56,17 +56,29 @@ @@ -56,17 +56,29 @@
56 .section .tab .item{ 56 .section .tab .item{
57 height: 50rpx; 57 height: 50rpx;
58 line-height: 50rpx; 58 line-height: 50rpx;
59 - width: 180rpx !important;  
60 - min-width: 180rpx !important; 59 + width: 210rpx !important;
  60 + min-width: 210rpx !important;
61 border-radius: 10rpx; 61 border-radius: 10rpx;
62 border: 2rpx solid #199095; 62 border: 2rpx solid #199095;
63 - margin-right: 60rpx; 63 + margin-right: 20rpx;
  64 + text-align: center;
  65 +}
  66 +.section .tab .item-pnum{
  67 + height: 50rpx;
  68 + line-height: 50rpx;
  69 + width: 60rpx !important;
  70 + min-width: 60rpx !important;
  71 + border-radius: 10rpx;
  72 + border: 2rpx solid #199095;
  73 + margin-right: 32rpx;
64 text-align: center; 74 text-align: center;
65 - display: inline-block;  
66 } 75 }
67 .section .tab .item:last-child{ 76 .section .tab .item:last-child{
68 margin-right: 0; 77 margin-right: 0;
69 } 78 }
  79 +.section .tab .item-pnum:last-child{
  80 + margin-right: 0;
  81 +}
70 .section .tab .checked{ 82 .section .tab .checked{
71 background-color:#199095; 83 background-color:#199095;
72 color: #FEFEFE; 84 color: #FEFEFE;
@@ -98,13 +110,16 @@ @@ -98,13 +110,16 @@
98 width:160rpx; 110 width:160rpx;
99 min-width: 160rpx; 111 min-width: 160rpx;
100 height:160rpx; 112 height:160rpx;
101 - background:#EBF8F8;  
102 - border:1px solid #199095; 113 + background:#A9E3E6;
  114 + border:1px solid #A9E3E6;
103 border-radius:10rpx; 115 border-radius:10rpx;
104 position:relative; 116 position:relative;
105 overflow:hidden; 117 overflow:hidden;
106 margin-left:22rpx; 118 margin-left:22rpx;
107 } 119 }
  120 +.desk-checked{
  121 + border:1px solid #199095;
  122 +}
108 .advice-desk-detail .order-desk-info:first-child{ 123 .advice-desk-detail .order-desk-info:first-child{
109 margin-left:0; 124 margin-left:0;
110 } 125 }
@@ -114,14 +129,15 @@ @@ -114,14 +129,15 @@
114 right: -2rpx; 129 right: -2rpx;
115 } 130 }
116 .order-desk-type{ 131 .order-desk-type{
117 - width:100%;  
118 - height:42rpx;  
119 - line-height: 42rpx;  
120 - background:#199095; 132 + height:30rpx;
  133 + line-height: 30rpx;
  134 + background:#61A5D1;
121 position:absolute; 135 position:absolute;
122 left:0; 136 left:0;
123 - bottom:0; 137 + top:0;
124 font-size: 26rpx; 138 font-size: 26rpx;
  139 + padding: 0 12rpx 4rpx 8rpx;
  140 + border-radius: 0 16rpx 16rpx 0;
125 } 141 }
126 .advice-more{ 142 .advice-more{
127 padding:20rpx 0; 143 padding:20rpx 0;
@@ -220,4 +236,7 @@ @@ -220,4 +236,7 @@
220 .calendar-board { 236 .calendar-board {
221 background-color: #dddcff; 237 background-color: #dddcff;
222 color: white; 238 color: white;
  239 +}
  240 +.placeholder-class-pnum{
  241 + color:#199095;
223 } 242 }