cxw-010203

3 years ago · 4feaed57ee
parent 2f935b117d
commit 4feaed57ee
1 changed files with 1 additions and 5 deletions
--- a/app.json
+++ b/app.json
@ -3,12 +3,9 @@
    "pages/index/index",
    "pages/bar/index",
    "pages/insight/index",
-<<<<<<< HEAD
-=======
    "pages/brandSearch/index",
    "pages/varComm/index",
    "pages/mine/index",
->>>>>>> 275ac3229537c1c42647ab6a5f402be5c1ea5aee
    "pages/logs/logs"
  ],
  "window": {
@ -48,8 +45,7 @@
        "selectedIconPath": "icons/mineActive.png",
        "text": "我的"
      }
-    ],
-    "custom": true
+    ]
  },
  "sitemapLocation": "sitemap.json",
  "usingComponents": {