Merge remote-tracking branch 'remotes/origin/master' into online-reserve

# Conflicts:
#	project.config.json

 <!--pages/customer/detail_owner.wxml-->
 <!--pages/customer/detail_owner.wxml-->
 <nav hasHome backgroundColor="rgba(0,0,0,0)" color="#ffffff"></nav>
 <nav hasHome backgroundColor="rgba(0,0,0,0)" color="#ffffff"></nav>
-<view class="page">
+<view class="pages">
     <view class="flex-vc" style="position: relative;">
     <view class="flex-vc" style="position: relative;">
         <view class="invit-logo">
         <view class="invit-logo">
             <image src="http://qn.colorcun.com/custom/lite-yd/image/invit-logo.png"></image>
             <image src="http://qn.colorcun.com/custom/lite-yd/image/invit-logo.png"></image>

 /* pages/customer/detail_customer.wxss */
 /* pages/customer/detail_customer.wxss */
-.page{
+.pages{
   color:#FFFFFF;
   color:#FFFFFF;
   background: url("http://qn.colorcun.com/custom/lite-yd/image/invit-bg.png") #353334;
   background: url("http://qn.colorcun.com/custom/lite-yd/image/invit-bg.png") #353334;
   background-size: 100%;
   background-size: 100%;
@@ -40,6 +40,7 @@ image{
 }
 }
 .seller{
 .seller{
   margin-top: 40rpx;
   margin-top: 40rpx;
+  width: 100%;
 }
 }
 .seller .title{
 .seller .title{
   font-size: 28rpx;
   font-size: 28rpx;

@@ -31,7 +31,7 @@
 			"list": []
 			"list": []
 		},
 		},
 		"miniprogram": {
 		"miniprogram": {
-			"current": 38,
+			"current": 6,
 			"list": [
 			"list": [
 				{
 				{
 					"id": 0,
 					"id": 0,
@@ -321,13 +321,6 @@
 						"shareName": "8DEbIRpK4pa9mH_QY2vU4ZUKYPuI97WoQ4BQoFej-Q8@cr4dev",
 						"shareName": "8DEbIRpK4pa9mH_QY2vU4ZUKYPuI97WoQ4BQoFej-Q8@cr4dev",
 						"shareKey": "PZhnqMlY2TnRuHhATyGeSamVmBQUDXXr_WtjRSddeeFK17UAiOP-HNOdhxiEN7PFub5S1DjAeUl0IXOdW-VDqg~~"
 						"shareKey": "PZhnqMlY2TnRuHhATyGeSamVmBQUDXXr_WtjRSddeeFK17UAiOP-HNOdhxiEN7PFub5S1DjAeUl0IXOdW-VDqg~~"
 					}
 					}
-				},
-				{
-					"id": -1,
-					"name": "pages/reserve/search   在线订座",
-					"pathName": "pages/reserve/search",
-					"query": "",
-					"scene": null
 				}
 				}
 			]
 			]
 		}
 		}