master-rewrite-addnew

@@ -57,9 +57,10 @@ Component({
       this.calendarClose()
       this.calendarClose()
     },
     },
     trigger(){
     trigger(){
+      if(this.dur_list.length<1) return;
       this.triggerEvent('event',{
       this.triggerEvent('event',{
         time:this.dur_list[this.dur_list_checked].time,
         time:this.dur_list[this.dur_list_checked].time,
-        ddate_solt:this.ddate_solt,
+        ddate_solt:parseInt(this.ddate_solt)+1,
         timeDur:this.dur_list[0].time+'-'+this.dur_list[this.dur_list.length-1].time
         timeDur:this.dur_list[0].time+'-'+this.dur_list[this.dur_list.length-1].time
       })
       })
     },
     },

@@ -34,7 +34,7 @@ Component({
         this.date=event.date
         this.date=event.date
         this.dateIndex=event.dateIndex
         this.dateIndex=event.dateIndex
         this.dur_time=event.dur_time
         this.dur_time=event.dur_time
-        this.type=this.type
+        this.type=event.type
         this.initSolt()//初始化solt
         this.initSolt()//初始化solt
       })
       })
     },
     },
@@ -77,10 +77,14 @@ Component({
       let TODAY=datetime[0]
       let TODAY=datetime[0]
       let HHII=datetime[1]
       let HHII=datetime[1]
       this.ddate_solt=-1
       this.ddate_solt=-1
+      let ddate_solt_bak=-1;
       timeSort.forEach((en_name,ti)=>{
       timeSort.forEach((en_name,ti)=>{
         let dur=daily[en_name];
         let dur=daily[en_name];
         let min='',max='',hasShow=false,hasDisabled=false,hasChecked=false
         let min='',max='',hasShow=false,hasDisabled=false,hasChecked=false
         if(dur){
         if(dur){
+          if(ddate_solt_bak==-1){
+            ddate_solt_bak=ti
+          }
           hasShow=true
           hasShow=true
           dur=dur.split('-');
           dur=dur.split('-');
           min=dur[0];
           min=dur[0];
@@ -104,6 +108,11 @@ Component({
           defTime:timeConfig[en_name].defTime
           defTime:timeConfig[en_name].defTime
         });
         });
       })
       })
+      if(this.ddate_solt==-1 && this.dateIndex!=0){
+        //不是今天，过了时间，选中第一时段
+        this.ddate_solt=ddate_solt_bak
+        config[ddate_solt_bak].hasChecked=true
+      }
       this.config=config;
       this.config=config;
       console.log('add-time-dur.initUserTime',this.ddate_solt,this.config)
       console.log('add-time-dur.initUserTime',this.ddate_solt,this.config)
       this.setData({
       this.setData({
@@ -125,7 +134,7 @@ Component({
       this.trigger();
       this.trigger();
     },
     },
     initTimeSpaceIndex(){//对选中时段进行展开
     initTimeSpaceIndex(){//对选中时段进行展开
-      if(this.ddate_solt<0) return;
+      if(this.ddate_solt<0) return {list:[],listIndex:-1};
       let min=this.config[this.ddate_solt].min
       let min=this.config[this.ddate_solt].min
       let max=this.config[this.ddate_solt].max
       let max=this.config[this.ddate_solt].max
       let defTime=this.config[this.ddate_solt].defTime
       let defTime=this.config[this.ddate_solt].defTime

@@ -407,7 +407,7 @@ Page({
       } catch (e) {}
       } catch (e) {}
 
 
       form.ddate = this.time;
       form.ddate = this.time;
-      form.ddate_solt=parseInt(this.ddate_solt)+1
+      form.ddate_solt=this.ddate_solt
       form.is_set_ddate=1
       form.is_set_ddate=1
       App.Reserve.SetReserveInfo(form).then(res => {
       App.Reserve.SetReserveInfo(form).then(res => {
         if (res.ret == 200) {
         if (res.ret == 200) {

@@ -70,7 +70,7 @@
                    bindconfirm="selectedValue"
                    bindconfirm="selectedValue"
                    data-key="phone"
                    data-key="phone"
                    value="{{form.phone}}" style="color:{{reminder ? '#E14553' : '#353535'}};width:{{reminder ? 400 : 680}}rpx;" cursor-spacing="260"/>
                    value="{{form.phone}}" style="color:{{reminder ? '#E14553' : '#353535'}};width:{{reminder ? 400 : 680}}rpx;" cursor-spacing="260"/>
-            <view bindtap="selectedValue" data-key="time" data-value="{{form.time}}" data-display="block" style="color:#199095">
+            <view style="color:#199095;min-width: 150rpx; text-align: right">
                 <add-time-dur-items
                 <add-time-dur-items
                         bindevent="addTimeDurItemsEvent"
                         bindevent="addTimeDurItemsEvent"
                         style="font-size: 34rpx;height: 100rpx;line-height: 100rpx;">
                         style="font-size: 34rpx;height: 100rpx;line-height: 100rpx;">

@@ -530,7 +530,7 @@
 					"id": 64,
 					"id": 64,
 					"name": "pack-book/pages/book/b_addnew 桌位进入",
 					"name": "pack-book/pages/book/b_addnew 桌位进入",
 					"pathName": "pack-book/pages/book/b_addnew",
 					"pathName": "pack-book/pages/book/b_addnew",
-					"query": "id=52064",
+					"query": "hasQuick=1&tid=487&tname=%E5%A4%A7%E5%8E%85%E4%B8%80&pnum=4&ddate=1578132000-1578150000",
 					"scene": null
 					"scene": null
 				},
 				},
 				{
 				{
@@ -567,6 +567,13 @@
 					"pathName": "pages/me/history",
 					"pathName": "pages/me/history",
 					"query": "",
 					"query": "",
 					"scene": null
 					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "无参数 pack-book/pages/book/b_addnew",
+					"pathName": "pack-book/pages/book/b_addnew",
+					"query": "",
+					"scene": null
 				}
 				}
 			]
 			]
 		}
 		}