last

app.json

@@ -7,17 +7,10 @@
     "pages/shop/shop",
     "pages/message/message",
     "pages/total/total",
-<<<<<<< HEAD
-    "pages/detail arrived/detail arrived",
-    "pages/detail refund/detail refund",
-    "pages/detail order/detail order",
-    "pages/delails/details",
-    "pages/management/management"
-=======
     "pages/addProduct/addProduct",
-    "pages/revise/revise"
->>>>>>> 697a3afe5b100889fee65ba54e01e026871db79d
-  ],
+    "pages/revise/revise",
+    "pages/management/management"
+    ],
   "window": {
     "backgroundTextStyle": "light",
     "navigationBarBackgroundColor": "#fff",

project.private.config.json

@@ -1,26 +1,8 @@
 {
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "projectname": "delivery-business",
-  "setting": {
-    "compileHotReLoad": true
-  },
   "condition": {
     "miniprogram": {
       "list": [
-        {
-          "name": "登录页面",
-          "pathName": "pages/logon/logon",
-          "query": "logon",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "商家端",
-          "pathName": "pages/order/order",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
         {
           "name": "账单统计",
           "pathName": "pages/total/total",
@@ -36,40 +18,8 @@
           "scene": null
         },
         {
-<<<<<<< HEAD
-          "name": "订单详细",
-          "pathName": "pages/detail order/detail order",
-=======
-          "name": "",
-          "pathName": "pages/addProduct/addProduct",
->>>>>>> 697a3afe5b100889fee65ba54e01e026871db79d
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-<<<<<<< HEAD
-          "name": "详细",
-          "pathName": "pages/delails/details",
-=======
-          "name": "",
-          "pathName": "pages/revise",
->>>>>>> 697a3afe5b100889fee65ba54e01e026871db79d
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-<<<<<<< HEAD
-          "name": "订单送达",
-          "pathName": "pages/detail arrived/detail arrived",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "订单退款",
-          "pathName": "pages/detail refund/detail refund",
+          "name": "订单",
+          "pathName": "pages/order/order",
           "query": "",
           "launchMode": "default",
           "scene": null
@@ -77,10 +27,6 @@
         {
           "name": "商品管理",
           "pathName": "pages/management/management",
-=======
-          "name": "",
-          "pathName": "pages/revise/revise",
->>>>>>> 697a3afe5b100889fee65ba54e01e026871db79d
           "query": "",
           "launchMode": "default",
           "scene": null