Skip to content

7
7-Eleven
Commit 4d43e236 by 谢中龙
Options

手动merge

parent 66328e43
Showing with 0 additions and 11 deletions
src/project.config.json
...@@ -39,11 +39,7 @@ ...@@ -39,11 +39,7 @@
"list": [] "list": []
}, },
"miniprogram": { "miniprogram": {
<<<<<<< HEAD
"current": 48, "current": 48,
=======
"current": 47,
>>>>>>> c83b62caec0d0a537ed00897a92dbece954243d9
"list": [ "list": [
{ {
"id": -1, "id": -1,
...@@ -347,7 +343,6 @@ ...@@ -347,7 +343,6 @@
"scene": null "scene": null
}, },
{ {
<<<<<<< HEAD
"id": -1, "id": -1,
"name": "导购首页", "name": "导购首页",
"pathName": "shoppingGuid/page/pages/home/home", "pathName": "shoppingGuid/page/pages/home/home",
...@@ -369,11 +364,6 @@ ...@@ -369,11 +364,6 @@
"id": -1, "id": -1,
"name": "福利", "name": "福利",
"pathName": "shoppingGuid/page/pages/welfare/welfare", "pathName": "shoppingGuid/page/pages/welfare/welfare",
"query": ""
=======
"id": 45,
"name": "导购",
"pathName": "pages/shopping/home/home",
"query": "", "query": "",
"scene": null "scene": null
}, },
...@@ -390,7 +380,6 @@ ...@@ -390,7 +380,6 @@
"pathName": "pages/shopping/kpi/kpi", "pathName": "pages/shopping/kpi/kpi",
"query": "", "query": "",
"scene": null "scene": null
>>>>>>> c83b62caec0d0a537ed00897a92dbece954243d9
} }
] ]
} }
......
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