|
@@ -36,20 +36,31 @@
|
|
"scene": null
|
|
"scene": null
|
|
},
|
|
},
|
|
{
|
|
{
|
|
|
|
+<<<<<<< HEAD
|
|
"name": "订单详细",
|
|
"name": "订单详细",
|
|
"pathName": "pages/detail order/detail order",
|
|
"pathName": "pages/detail order/detail order",
|
|
|
|
+=======
|
|
|
|
+ "name": "",
|
|
|
|
+ "pathName": "pages/addProduct/addProduct",
|
|
|
|
+>>>>>>> 697a3afe5b100889fee65ba54e01e026871db79d
|
|
"query": "",
|
|
"query": "",
|
|
"launchMode": "default",
|
|
"launchMode": "default",
|
|
"scene": null
|
|
"scene": null
|
|
},
|
|
},
|
|
{
|
|
{
|
|
|
|
+<<<<<<< HEAD
|
|
"name": "详细",
|
|
"name": "详细",
|
|
"pathName": "pages/delails/details",
|
|
"pathName": "pages/delails/details",
|
|
|
|
+=======
|
|
|
|
+ "name": "",
|
|
|
|
+ "pathName": "pages/revise",
|
|
|
|
+>>>>>>> 697a3afe5b100889fee65ba54e01e026871db79d
|
|
"query": "",
|
|
"query": "",
|
|
"launchMode": "default",
|
|
"launchMode": "default",
|
|
"scene": null
|
|
"scene": null
|
|
},
|
|
},
|
|
{
|
|
{
|
|
|
|
+<<<<<<< HEAD
|
|
"name": "订单送达",
|
|
"name": "订单送达",
|
|
"pathName": "pages/detail arrived/detail arrived",
|
|
"pathName": "pages/detail arrived/detail arrived",
|
|
"query": "",
|
|
"query": "",
|
|
@@ -66,6 +77,10 @@
|
|
{
|
|
{
|
|
"name": "商品管理",
|
|
"name": "商品管理",
|
|
"pathName": "pages/management/management",
|
|
"pathName": "pages/management/management",
|
|
|
|
+=======
|
|
|
|
+ "name": "",
|
|
|
|
+ "pathName": "pages/revise/revise",
|
|
|
|
+>>>>>>> 697a3afe5b100889fee65ba54e01e026871db79d
|
|
"query": "",
|
|
"query": "",
|
|
"launchMode": "default",
|
|
"launchMode": "default",
|
|
"scene": null
|
|
"scene": null
|