xt / xcx-book · Commits

Go to a project

Commit 3e0ec6f396a299f353f875a589449715794618fa

Authored by wangfan
1 parent faa156eb
build: skipped

most_pnum

Inline Side-by-side
Showing 4 changed files with 31 additions and 16 deletions
@@ -35,7 +35,7 @@ Component({ @@ -35,7 +35,7 @@ Component({
35 35
36 } 36 }
37 item.rname_mask=item.rname.substr(0,3)+(item.sex==1?'先生':'女士') 37 item.rname_mask=item.rname.substr(0,3)+(item.sex==1?'先生':'女士')
38 - item.order_time=util.unixtoTime(item.rdate,'HH:II') 38 + item.order_time=util.unixtoTime(item.ddate,'HH:II')
39 item.status_str=reserveStatus[item.status]||''; 39 item.status_str=reserveStatus[item.status]||'';
40 this.setData({vitem:item}) 40 this.setData({vitem:item})
41 }, 41 },
@@ -229,14 +229,21 @@ Page({ @@ -229,14 +229,21 @@ Page({
229 if(form.tid.length>0 && form.rname.length>0){ 229 if(form.tid.length>0 && form.rname.length>0){
230 sobj.buttonhide=false; 230 sobj.buttonhide=false;
231 } 231 }
232 - if('date,time,pnum,pnum_str,tabid'.indexOf(key)>-1){  
233 - sobj.form.tid=[];  
234 - sobj.buttonhide=true;  
235 - this.getTables();  
236 - } 232 + let displayTimes=false;
237 if(key=='time'){ 233 if(key=='time'){
238 - sobj.timePickerMask=true; 234 + if(util.attr(e,'display')=='block'){
  235 + displayTimes=true;
  236 + sobj.timePickerMask=true;
  237 + }
239 } 238 }
  239 + if('date,time,pnum,pnum_str,tabid'.indexOf(key)>-1){
  240 + if(!displayTimes){
  241 + sobj.form.tid=[];
  242 + sobj.buttonhide=true;
  243 + this.getTables();
  244 + }
  245 + }
  246 +
240 this.setData(sobj) 247 this.setData(sobj)
241 }, 248 },
242 async getTables(){ 249 async getTables(){
@@ -298,10 +305,13 @@ Page({ @@ -298,10 +305,13 @@ Page({
298 async formsubmit(){ 305 async formsubmit(){
299 if(this.data.buttonhide) return; 306 if(this.data.buttonhide) return;
300 try { 307 try {
301 - let stimestr=this.data.timePickerArray[this.data.form.time][this.data.timePickerIndex[this.data.form.time]];  
302 - console.log('stimestr', stimestr,this.data.form.time,this.data.timePickerIndex); 308 + let d_stimestr=this.data.timePickerArray[this.data.form.time][this.data.timePickerIndex[this.data.form.time]];
  309 + let d_rdate = await comm.getTimeSpace(this.data.dateStr[this.data.form.date],
  310 + this.data.form.time,d_stimestr);
  311 + let stimestr=this.data.timePickerArray[this.data.form.time][this.data.timePickerIndex[0]];
303 let rdate = await comm.getTimeSpace(this.data.dateStr[this.data.form.date], 312 let rdate = await comm.getTimeSpace(this.data.dateStr[this.data.form.date],
304 - this.data.form.time,stimestr); 313 + this.data.form.time,stimestr);
  314 + console.log('stimestr', stimestr,this.data.form.time,this.data.timePickerIndex);
305 console.log('rdate', rdate); 315 console.log('rdate', rdate);
306 this.setData({ 316 this.setData({
307 buttonhide: true, 317 buttonhide: true,
@@ -325,12 +335,14 @@ Page({ @@ -325,12 +335,14 @@ Page({
325 form.note_name=note_name||''; 335 form.note_name=note_name||'';
326 }catch (e){} 336 }catch (e){}
327 } 337 }
  338 + form.ddate=d_rdate.substr(0,10);
328 App.Reserve.SetReserveInfo(form).then(res => { 339 App.Reserve.SetReserveInfo(form).then(res => {
329 if(res.ret==200){ 340 if(res.ret==200){
330 let _id=(res.data.id || res.data) 341 let _id=(res.data.id || res.data)
331 this.setData({ 342 this.setData({
332 form:JSON.parse(JSON.stringify(formTpl)), 343 form:JSON.parse(JSON.stringify(formTpl)),
333 tables:[], 344 tables:[],
  345 + timePickerIndex:[0,0,0],
334 }) 346 })
335 this.initLoad(); 347 this.initLoad();
336 App.Reserve.Detail({rid:_id,openid:''},'clear') 348 App.Reserve.Detail({rid:_id,openid:''},'clear')
@@ -430,9 +442,9 @@ Page({ @@ -430,9 +442,9 @@ Page({
430 442
431 console.log('initModify',res); 443 console.log('initModify',res);
432 //设置日期 444 //设置日期
433 - let obj = await this.setDateStr(res.data.rdate); 445 + let obj = await this.setDateStr(res.data.ddate);
434 //设置时间 446 //设置时间
435 - let nd=util.unixtoTime(res.data.rdate,'HH:II'); 447 + let nd=util.unixtoTime(res.data.ddate,'HH:II');
436 let timePickerIndex=this.data.timePickerIndex 448 let timePickerIndex=this.data.timePickerIndex
437 console.log('initModify-',this.data.timePickerArray,obj.form.time,nd) 449 console.log('initModify-',this.data.timePickerArray,obj.form.time,nd)
438 this.data.timePickerArray[obj.form.time].forEach((dd,ii)=>{ 450 this.data.timePickerArray[obj.form.time].forEach((dd,ii)=>{
@@ -45,19 +45,19 @@ @@ -45,19 +45,19 @@
45 <formids class="item {{form.time==0?'checked':''}}" 45 <formids 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 <view class="picker"> 47 <view class="picker">
48 - 早市 {{timePickerArray[0][timePickerIndex[0]]}} 48 + 早市
49 </view> 49 </view>
50 </formids> 50 </formids>
51 <formids class="item {{form.time==1?'checked':''}}" 51 <formids class="item {{form.time==1?'checked':''}}"
52 bindtap="selectedValue" data-key="time" data-value="1"> 52 bindtap="selectedValue" data-key="time" data-value="1">
53 <view class="picker"> 53 <view class="picker">
54 - 午市 {{timePickerArray[1][timePickerIndex[1]]}} 54 + 午市
55 </view> 55 </view>
56 </formids> 56 </formids>
57 <formids class="item {{form.time==2?'checked':''}}" 57 <formids class="item {{form.time==2?'checked':''}}"
58 bindtap="selectedValue" data-key="time" data-value="2"> 58 bindtap="selectedValue" data-key="time" data-value="2">
59 <view class="picker"> 59 <view class="picker">
60 - 晚市 {{timePickerArray[2][timePickerIndex[2]]}} 60 + 晚市
61 </view> 61 </view>
62 </formids> 62 </formids>
63 </view> 63 </view>
@@ -188,6 +188,9 @@ @@ -188,6 +188,9 @@
188 bindblur="inputFocus" 188 bindblur="inputFocus"
189 data-key="cusdem"/> 189 data-key="cusdem"/>
190 </view> 190 </view>
  191 + <view class="book-info-single" bindtap="selectedValue" data-key="time" data-value="{{form.time}}" data-display="block">
  192 + <view>到店时间 {{timePickerArray[form.time][timePickerIndex[form.time]]}}</view>
  193 + </view>
191 </view> 194 </view>
192 <view class="page-full submit"> 195 <view class="page-full submit">
193 <view class="confirm-button white-font flex-vc font34r {{buttonhide==false ? 'confirm-button-active' : ''}}" bindtap="{{buttonhide==false ? 'formsubmit' : ''}}">确定</view> 196 <view class="confirm-button white-font flex-vc font34r {{buttonhide==false ? 'confirm-button-active' : ''}}" bindtap="{{buttonhide==false ? 'formsubmit' : ''}}">确定</view>
@@ -109,7 +109,7 @@ Page({ @@ -109,7 +109,7 @@ Page({
109 detailData:null, 109 detailData:null,
110 getDetail(id,force=false){ 110 getDetail(id,force=false){
111 App.Reserve.Detail({rid:id,openid:''},force).then(res=>{ 111 App.Reserve.Detail({rid:id,openid:''},force).then(res=>{
112 - res.data.rdateStr=util.unixtoTime(res.data.rdate,"MM月DD日 HH:II") 112 + res.data.rdateStr=util.unixtoTime(res.data.ddate,"MM月DD日 HH:II")
113 this.detailData=res.data; 113 this.detailData=res.data;
114 this.setData({ 114 this.setData({
115 tables:res.data.tables, 115 tables:res.data.tables,