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

@@ -152,4 +152,7 @@ Page({
   editorReserve(){
   editorReserve(){
     wx.navigateBack()
     wx.navigateBack()
   },
   },
+  getphoneNumber(e){
+    console.log('getphoneNumber',e);
+  },
 })
 })

@@ -50,8 +50,8 @@
                        placeholder-class="input-pl"/>
                        placeholder-class="input-pl"/>
                 <view class="flex-rr">
                 <view class="flex-rr">
                     <!-- 一键获取 -->
                     <!-- 一键获取 -->
-					<phone>
-						<view class="smooth white-font get-phone flex-cc" style="font-size:28rpx;">一键获取</view>
+					<phone bindgetphoneNumber="getphoneNumber">
+						<view class="smooth white-font get-phone flex-vc" style="font-size:28rpx;">一键获取</view>
 					</phone>
 					</phone>
                 </view>
                 </view>
             </view>
             </view>

@@ -80,5 +80,6 @@
 .get-phone{
 .get-phone{
 	width:160rpx;
 	width:160rpx;
 	height:50rpx;
 	height:50rpx;
+    line-height: 50rpx;
 	background: #C0A369;
 	background: #C0A369;
 }
 }

@@ -45,7 +45,7 @@
 			"list": []
 			"list": []
 		},
 		},
 		"miniprogram": {
 		"miniprogram": {
-			"current": 56,
+			"current": 39,
 			"list": [
 			"list": [
 				{
 				{
 					"id": 0,
 					"id": 0,
@@ -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=1&fromid=",
+					"query": "id=1&fromid=&activeTab=reserve",
 					"scene": null
 					"scene": null
 				},
 				},
 				{
 				{