online

@@ -81,8 +81,7 @@ Component({
 			App.Customer.GetHouseFullDateTimes(parmdata).then((json)=>{
 				console.log(json)
 				if(json.ret==200){
-					let houseFull=JSON.parse(json.data);
-					this.getdurlist(houseFull);
+					this.getdurlist(json.data);
 				}
 			})
 		},

@@ -71,6 +71,7 @@ Page({
         this.setData({
           seller:seller,
           hasOnlineReserve:seller.is_online_reserve==1||true,
+          activeTab:options.activeTab||'detail',
         })
       }
     })
@@ -258,6 +259,13 @@ Page({
     console.log(e);
     this.reserve.pnum=e.detail.people;
     if(e.detail.action=='click'){
+
+    }
+  },
+  selecttime(e){
+    console.log(e);
+    this.reserve.time=e.detail.time;
+    if(e.detail.action=='click'){
       this.reserve.sid=this.options.id
       this.reserve.ddate=util.timetouUnix(this.reserve.date+' '+this.reserve.time+':00')
       wx.navigateTo({
@@ -265,4 +273,7 @@ Page({
       })
     }
   },
+  selectdate(e){
+    console.log(e);
+  }
 })
\ No newline at end of file

@@ -13,6 +13,7 @@
     "discount":"/components/reserve/discount",
     "share":"/components/reserve/share/share",
     "people":"/components/reserve/people/people",
-    "dur":"/components/reserve/dur/dur"
+    "dur":"/components/reserve/dur/dur",
+    "calendar":"/components/reserve/calendar/calendar"
   }
 }
\ No newline at end of file

@@ -9,7 +9,7 @@
         <view class="tabs-item-text {{activeTab=='reserve'?'active':''}}">包间预订</view>
     </view>
 </view>
-<block wx:if="{{activeTab=='detail'}}">
+<view hidden="{{activeTab!='detail'}}" wx:if="{{seller.id}}">
     <view class="seller-banner" style="{{hasOnlineReserve?'margin-top: 80rpx;':''}}">
         <swiper
                 indicator-dots="{{false}}" autoplay="{{false}}" circular="{{false}}" vertical="{{false}}"
@@ -193,9 +193,11 @@
     <getpos bindpos="onpos" id="getpos"></getpos>
     <discount id="discount" seller="{{seller}}" bindhide="discountHide" bindshow="discountShow"></discount>
     <share id="share" seller_id="{{seller.id}}"></share>
-</block>
-<block wx:if="{{activeTab=='reserve'}}">
+</view>
+<view hidden="{{activeTab!='reserve'}}" wx:if="{{seller.id}}">
     <view class="olreserve">
+        <calendar seller="{{seller}}" bindselectdate="selectdate"></calendar>
 		<people seller="{{seller}}" bindselectpeople="selectpeople"></people>
+        <dur seller="{{seller}}" bindselecttime="selecttime"></dur>
     </view>
-</block>
\ No newline at end of file
+</view>
\ No newline at end of file

@@ -463,13 +463,13 @@
 					"query": "sid=1&ddate=1234567890&pnum=10",
 					"scene": null
 				},
-                {
-                  "id": 56,
-                  "name": "测试组件",
-                  "pathName": "pages/reserve/detail",
-                  "query": "id=154",
-                  "scene": null
-                },
+				{
+					"id": 56,
+					"name": "测试组件",
+					"pathName": "pages/reserve/detail",
+					"query": "id=154&activeTab=reserve",
+					"scene": null
+				},
 				{
 					"id": 57,
 					"name": "pages/customer/detail_owner",