Commit 08806cb7d93ab147d1f6b36c4686db4dbe490354

Authored by wangfan
2 parents 9bbe4dcb f25b4d8a

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

# Conflicts:
#	project.config.json
Showing 1 changed file with 13 additions and 6 deletions
... ... @@ -9,7 +9,7 @@
"nodeModules": true
},
"compileType": "miniprogram",
"libVersion": "2.6.1",
"libVersion": "2.4.2",
"appid": "wxd3dc4206c76f14fc",
"projectname": "xcx-book",
"isGameTourist": false,
... ... @@ -31,7 +31,7 @@
"list": []
},
"miniprogram": {
"current": 39,
"current": 38,
"list": [
{
"id": 0,
... ... @@ -272,11 +272,11 @@
"scene": "1011"
},
{
"id": 32,
"name": "pages/reserve/search 在线预定",
"pathName": "pages/reserve/search",
"id": -1,
"name": "pages/reserve/index",
"pathName": "pages/reserve/index",
"query": "",
"scene": 1001
"scene": "1001"
},
{
"id": -1,
... ... @@ -336,6 +336,13 @@
"query": "id=154",
"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,
"name": "我的收藏 pages/me/follow",
... ...