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

# Conflicts:
#	project.config.json

@@ -9,7 +9,7 @@
 		"nodeModules": true
 		"nodeModules": true
 	},
 	},
 	"compileType": "miniprogram",
 	"compileType": "miniprogram",
-	"libVersion": "2.6.1",
+	"libVersion": "2.4.2",
 	"appid": "wxd3dc4206c76f14fc",
 	"appid": "wxd3dc4206c76f14fc",
 	"projectname": "xcx-book",
 	"projectname": "xcx-book",
 	"isGameTourist": false,
 	"isGameTourist": false,
@@ -31,7 +31,7 @@
 			"list": []
 			"list": []
 		},
 		},
 		"miniprogram": {
 		"miniprogram": {
-			"current": 39,
+			"current": 38,
 			"list": [
 			"list": [
 				{
 				{
 					"id": 0,
 					"id": 0,
@@ -272,11 +272,11 @@
 					"scene": "1011"
 					"scene": "1011"
 				},
 				},
 				{
 				{
-					"id": 32,
-					"name": "pages/reserve/search 在线预定",
-					"pathName": "pages/reserve/search",
+					"id": -1,
+					"name": "pages/reserve/index",
+					"pathName": "pages/reserve/index",
 					"query": "",
 					"query": "",
-					"scene": 1001
+					"scene": "1001"
 				},
 				},
 				{
 				{
 					"id": -1,
 					"id": -1,
@@ -336,6 +336,13 @@
 					"query": "id=154",
 					"query": "id=154",
 					"scene": null
 					"scene": null
 				},
 				},
+                {
+                  "id": 40,
+                  "name": "邀请Ren   pages/customer/index ",
+                  "pathName": "pages/customer/detail_owner_invitation",
+                  "query": "id=3672&fromid=test&hasInvitation=1&hasSellerShare=1",
+                  "scene": null
+                },
 				{
 				{
 					"id": -1,
 					"id": -1,
 					"name": "我的收藏 pages/me/follow",
 					"name": "我的收藏 pages/me/follow",