online

@@ -24,11 +24,11 @@ Component({
 		this.triggerEvent('selecttime',{time:this.data.time,action:'defalut'})
 		this.triggerEvent('selecttime',{time:this.data.time,action:'defalut'})
 	},
 	},
 	observers: {
 	observers: {
-		'date': function(date) {
-		  this.setData({
-			date: date
-		  })
-		}
+		// 'date': function(date) {
+		//   this.setData({
+		// 	date: date
+		//   })
+		// }
     },
     },
 	methods:{
 	methods:{
 		selecttime(e){
 		selecttime(e){

 {
 {
   "component": true,
   "component": true,
-  "usingComponents": {}
+  "usingComponents": {
+    "formids": "/components/formids/formids"
+  }
 }
 }

 <!--components/seller-card/seller-card.wxml-->
 <!--components/seller-card/seller-card.wxml-->
 <view class="card {{hasOnlineReserve?'online':''}}">
 <view class="card {{hasOnlineReserve?'online':''}}">
-    <view class="seller flex-lr">
-        <view class="flex-ll">
-            <view class="avatar" wx:if="{{seller.seller_image}}">
-                <image src="{{seller.seller_image}}"></image>
+    <formids url="/pages/reserve/detail?id={{seller.id}}">
+        <view class="seller flex-lr">
+            <view class="flex-ll">
+                <view class="avatar" wx:if="{{seller.seller_image}}">
+                    <image src="{{seller.seller_image}}"></image>
+                </view>
+                <view class="card-class name Medium">{{seller.sellername}}</view>
+            </view>
+            <view wx:if="{{hasShowStatus}}" style="font-size: 30rpx;">
+                {{showStatusStr}}
+            </view>
+            <view class="more" wx:else="">
+                <image src="http://qn.colorcun.com/custom/lite-yd/image/click.png"></image>
             </view>
             </view>
-            <view class="card-class name Medium">{{seller.sellername}}</view>
-        </view>
-        <view wx:if="{{hasShowStatus}}" style="font-size: 30rpx;">
-            {{showStatusStr}}
-        </view>
-        <view class="more" wx:else="">
-            <image src="http://qn.colorcun.com/custom/lite-yd/image/click.png"></image>
         </view>
         </view>
-    </view>
+    </formids>
     <view class="context flex-lr">
     <view class="context flex-lr">
         <view class="left info Medium">
         <view class="left info Medium">
             <view class="label">时间</view>
             <view class="label">时间</view>

@@ -24,6 +24,12 @@ Page({
   onLoad: function (options) {
   onLoad: function (options) {
     console.log('onLoad', options)
     console.log('onLoad', options)
     this.options=options
     this.options=options
+    if(options.activeTab && options.activeTab!='detail'){
+      this.setData({
+        activeTab:options.activeTab||'detail',
+      })
+    }
+
     App.Customer.IsCollectionSeller({
     App.Customer.IsCollectionSeller({
       sid:options.id,
       sid:options.id,
       openid:getApp().openid
       openid:getApp().openid
@@ -71,7 +77,6 @@ Page({
         this.setData({
         this.setData({
           seller:seller,
           seller:seller,
           hasOnlineReserve:seller.is_online_reserve==1||true,
           hasOnlineReserve:seller.is_online_reserve==1||true,
-          activeTab:options.activeTab||'detail',
         })
         })
       }
       }
     })
     })

@@ -198,6 +198,7 @@
     <view class="olreserve">
     <view class="olreserve">
         <calendar seller="{{seller}}" bindselectdate="selectdate"></calendar>
         <calendar seller="{{seller}}" bindselectdate="selectdate"></calendar>
 		<people seller="{{seller}}" bindselectpeople="selectpeople"></people>
 		<people seller="{{seller}}" bindselectpeople="selectpeople"></people>
+        <view class="reserve-time Semibold">可订时间</view>
         <dur seller="{{seller}}" date="{{reserveDate}}" bindselecttime="selecttime"></dur>
         <dur seller="{{seller}}" date="{{reserveDate}}" bindselecttime="selecttime"></dur>
     </view>
     </view>
 </view>
 </view>

@@ -507,3 +507,7 @@
 .olreserve{
 .olreserve{
   margin-top: 80rpx;
   margin-top: 80rpx;
 }
 }
+.reserve-time{
+  padding: 44rpx 0 38rpx 30rpx;
+  font-size: 32rpx;
+}