most_pnum

@@ -35,7 +35,7 @@ Component({
 
             }
             item.rname_mask=item.rname.substr(0,3)+(item.sex==1?'先生':'女士')
-            item.order_time=util.unixtoTime(item.rdate,'HH:II')
+            item.order_time=util.unixtoTime(item.ddate,'HH:II')
             item.status_str=reserveStatus[item.status]||'';
             this.setData({vitem:item})
         },

@@ -229,14 +229,21 @@ Page({
       if(form.tid.length>0 && form.rname.length>0){
           sobj.buttonhide=false;
       }
-      if('date,time,pnum,pnum_str,tabid'.indexOf(key)>-1){
-          sobj.form.tid=[];
-          sobj.buttonhide=true;
-          this.getTables();
-      }
+      let displayTimes=false;
       if(key=='time'){
-        sobj.timePickerMask=true;
+        if(util.attr(e,'display')=='block'){
+          displayTimes=true;
+          sobj.timePickerMask=true;
+        }
       }
+      if('date,time,pnum,pnum_str,tabid'.indexOf(key)>-1){
+          if(!displayTimes){
+            sobj.form.tid=[];
+            sobj.buttonhide=true;
+            this.getTables();
+          }
+      }
+
       this.setData(sobj)
     },
     async getTables(){
@@ -298,10 +305,13 @@ Page({
     async formsubmit(){
         if(this.data.buttonhide) return;
         try {
-            let stimestr=this.data.timePickerArray[this.data.form.time][this.data.timePickerIndex[this.data.form.time]];
-            console.log('stimestr', stimestr,this.data.form.time,this.data.timePickerIndex);
+            let d_stimestr=this.data.timePickerArray[this.data.form.time][this.data.timePickerIndex[this.data.form.time]];
+            let d_rdate = await comm.getTimeSpace(this.data.dateStr[this.data.form.date],
+                this.data.form.time,d_stimestr);
+            let stimestr=this.data.timePickerArray[this.data.form.time][this.data.timePickerIndex[0]];
             let rdate = await comm.getTimeSpace(this.data.dateStr[this.data.form.date],
-                this.data.form.time,stimestr);
+              this.data.form.time,stimestr);
+            console.log('stimestr', stimestr,this.data.form.time,this.data.timePickerIndex);
             console.log('rdate', rdate);
             this.setData({
                 buttonhide: true,
@@ -325,12 +335,14 @@ Page({
                     form.note_name=note_name||'';
                 }catch (e){}
             }
+            form.ddate=d_rdate.substr(0,10);
             App.Reserve.SetReserveInfo(form).then(res => {
                 if(res.ret==200){
                     let _id=(res.data.id || res.data)
                     this.setData({
                       form:JSON.parse(JSON.stringify(formTpl)),
                       tables:[],
+                      timePickerIndex:[0,0,0],
                     })
                     this.initLoad();
                     App.Reserve.Detail({rid:_id,openid:''},'clear')
@@ -430,9 +442,9 @@ Page({
 
             console.log('initModify',res);
             //设置日期
-            let obj = await this.setDateStr(res.data.rdate);
+            let obj = await this.setDateStr(res.data.ddate);
             //设置时间
-            let nd=util.unixtoTime(res.data.rdate,'HH:II');
+            let nd=util.unixtoTime(res.data.ddate,'HH:II');
             let timePickerIndex=this.data.timePickerIndex
             console.log('initModify-',this.data.timePickerArray,obj.form.time,nd)
             this.data.timePickerArray[obj.form.time].forEach((dd,ii)=>{

@@ -45,19 +45,19 @@
                 <formids class="item {{form.time==0?'checked':''}}"
                       bindtap="selectedValue" data-key="time" data-value="0">
                     <view class="picker">
-                        早市 {{timePickerArray[0][timePickerIndex[0]]}}
+                        早市
                     </view>
                 </formids>
                 <formids class="item {{form.time==1?'checked':''}}"
                       bindtap="selectedValue" data-key="time" data-value="1">
                     <view class="picker">
-                        午市 {{timePickerArray[1][timePickerIndex[1]]}}
+                        午市
                     </view>
                 </formids>
                 <formids class="item {{form.time==2?'checked':''}}"
                       bindtap="selectedValue" data-key="time" data-value="2">
                     <view class="picker">
-                        晚市 {{timePickerArray[2][timePickerIndex[2]]}}
+                        晚市
                     </view>
                 </formids>
             </view>
@@ -188,6 +188,9 @@
                    bindblur="inputFocus"
                    data-key="cusdem"/>
         </view>
+        <view class="book-info-single" bindtap="selectedValue" data-key="time" data-value="{{form.time}}" data-display="block">
+            <view>到店时间 {{timePickerArray[form.time][timePickerIndex[form.time]]}}</view>
+        </view>
     </view>
     <view class="page-full submit">
         <view class="confirm-button white-font flex-vc font34r {{buttonhide==false ? 'confirm-button-active' : ''}}" bindtap="{{buttonhide==false ? 'formsubmit' : ''}}">确定</view>

@@ -109,7 +109,7 @@ Page({
     detailData:null,
     getDetail(id,force=false){
         App.Reserve.Detail({rid:id,openid:''},force).then(res=>{
-            res.data.rdateStr=util.unixtoTime(res.data.rdate,"MM月DD日 HH:II")
+            res.data.rdateStr=util.unixtoTime(res.data.ddate,"MM月DD日 HH:II")
             this.detailData=res.data;
             this.setData({
                 tables:res.data.tables,