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

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

@@ -129,6 +129,11 @@ Page({
     }
     }
   },
   },
   reserve(){
   reserve(){
+    if(this.data.hasOnlineReserve){
+      return this.setData({
+        activeTab:'reserve'
+      })
+    }
     let seller_tel=this.data.seller.seller_tel
     let seller_tel=this.data.seller.seller_tel
     if(seller_tel.length<1) return util.toast('商家电话错误','none')
     if(seller_tel.length<1) return util.toast('商家电话错误','none')
     if(seller_tel.length==1){//只有一个电话
     if(seller_tel.length==1){//只有一个电话

@@ -369,7 +369,7 @@
         </view>
         </view>
         <view class="reserve">
         <view class="reserve">
             <formids class="flex-vc" bindclick="reserve" id="reserve-button">
             <formids class="flex-vc" bindclick="reserve" id="reserve-button">
-                <view class="text">电话预订</view>
+                <view class="text">{{hasOnlineReserve?'包间预订':'联系餐厅'}}</view>
             </formids>
             </formids>
         </view>
         </view>