Merge branch 'master' of http://123.56.79.57/xt/xcx-book

# By vking
# Via vking
* 'master' of http://123.56.79.57/xt/xcx-book:
  online

@@ -8,6 +8,7 @@
   color: #353535;
   color: #353535;
   width: 90%;
   width: 90%;
   padding: 30rpx 5%;
   padding: 30rpx 5%;
+  animation: discountShow 0.3s;
 }
 }
 .discount view{
 .discount view{
   background-size: 100% 100%;
   background-size: 100% 100%;
@@ -84,4 +85,14 @@
   height: 52rpx;
   height: 52rpx;
   line-height: 52rpx;
   line-height: 52rpx;
   width: 10rpx;
   width: 10rpx;
+}
+@keyframes discountShow
+{
+  from {height: 0;}
+  to {height: 870rpx;}
+}
+@keyframes discountHide
+{
+  from {height: 730rpx;}
+  to {height: 0rpx;}
 }
 }

@@ -26,7 +26,7 @@
                 <view class="icon">
                 <view class="icon">
                     <icon type="warn" size="47" color="#999999"/>
                     <icon type="warn" size="47" color="#999999"/>
                 </view>
                 </view>
-                <view class="title Medium">{{detail.cancel||'包间已订满'}}</view>
+                <view class="title Medium">{{detail.cancel.desc||'包间已订满'}}</view>
             </block>
             </block>
             <block wx:else="">
             <block wx:else="">
                 <view class="icon">
                 <view class="icon">

@@ -10,7 +10,7 @@
     </view>
     </view>
 </view>
 </view>
 <view hidden="{{activeTab!='detail'}}">
 <view hidden="{{activeTab!='detail'}}">
-    <view class="seller-banner" style="{{hasOnlineReserve?'margin-top: 80rpx;':''}}">
+    <view class="seller-banner" style="{{pagesHeight!='auto'?'position: fixed;':''}}{{hasOnlineReserve?'margin-top: 80rpx;':''}}">
         <swiper
         <swiper
                 indicator-dots="{{false}}" autoplay="{{false}}" circular="{{false}}" vertical="{{false}}"
                 indicator-dots="{{false}}" autoplay="{{false}}" circular="{{false}}" vertical="{{false}}"
                 interval="2000" duration="500"
                 interval="2000" duration="500"

@@ -348,7 +348,7 @@
 					"id": 39,
 					"id": 39,
 					"name": "pages/reserve/detail   在线订座  ",
 					"name": "pages/reserve/detail   在线订座  ",
 					"pathName": "pages/reserve/detail",
 					"pathName": "pages/reserve/detail",
-					"query": "id=1007&fromid=&activeTab=",
+					"query": "id=1&fromid=&activeTab=",
 					"scene": null
 					"scene": null
 				},
 				},
 				{
 				{