Skip to content

W
wxapp
Commit 9a622e56 by LiuJunYi
Options

文件project.config.json文件冲突

parent c60cd8ab
Showing with 12 additions and 10 deletions
project.config.json
...@@ -37,11 +37,7 @@ ...@@ -37,11 +37,7 @@
"list": [] "list": []
}, },
"miniprogram": { "miniprogram": {
<<<<<<< HEAD "current": 6,
"current": 3,
=======
"current": 4,
>>>>>>> 133e2d7cbbbda20f7e1a885855a832728002329a
"list": [ "list": [
{ {
"id": 0, "id": 0,
...@@ -63,10 +59,6 @@ ...@@ -63,10 +59,6 @@
}, },
{ {
"id": -1, "id": -1,
<<<<<<< HEAD
"name": "vip",
"pathName": "pages/me/vip/index"
=======
"name": "搜索", "name": "搜索",
"pathName": "pages/search/index", "pathName": "pages/search/index",
"query": "" "query": ""
...@@ -76,7 +68,17 @@ ...@@ -76,7 +68,17 @@
"name": "授权", "name": "授权",
"pathName": "pages/auth/index", "pathName": "pages/auth/index",
"query": "" "query": ""
>>>>>>> 133e2d7cbbbda20f7e1a885855a832728002329a },
{
"id": -1,
"name": "个人信息",
"pathName": "pages/me/profile/index",
"query": ""
},
{
"id": -1,
"name": "vip",
"pathName": "pages/me/vip/index"
} }
] ]
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment