1.18整合

unpackage/dist/dev/mp-weixin/app.json

@@ -1,6 +1,7 @@
 {
   "pages": [
     "pages/index/index",
+    "pages/map/map",
     "pages/plandetail/plandetail",
     "pages/Inspectionresult/Inspectionresult",
     "pages/membermanagemen/membermanagemen",
@@ -15,6 +16,7 @@
     "pages/hiddendanger/view",
     "pages/hiddendanger/rectification",
     "pages/hiddendanger/acceptance",
+    "pages/hiddendanger/assignment",
     "pages/closeout/application",
     "pages/closeout/editor",
     "pages/equipmentregistration/equipmentregistration",
@@ -25,7 +27,13 @@
     "pages/personalcenter/notification",
     "pages/personalcenter/settings",
     "pages/personalcenter/account",
-    "pages/personalcenter/edit"
+    "pages/personalcenter/edit",
+    "pages/login/login",
+    "pages/login/reg",
+    "pages/login/enterprise",
+    "pages/login/success",
+    "pages/login/forget",
+    "pages/login/agreement"
   ],
   "window": {
     "navigationBarTextStyle": "white",
@@ -33,5 +41,46 @@
     "navigationBarBackgroundColor": "#007aff",
     "backgroundColor": "#F8F8F8"
   },
+  "tabBar": {
+    "color": "#999999",
+    "selectedColor": "#007aff",
+    "borderStyle": "black",
+    "backgroundColor": "#ffffff",
+    "list": [
+      {
+        "pagePath": "pages/index/index",
+        "text": "首页",
+        "iconPath": "static/tabBar/home.png",
+        "selectedIconPath": "static/tabBar/home.png"
+      },
+      {
+        "pagePath": "pages/map/map",
+        "text": "一张图",
+        "iconPath": "static/tabBar/map.png",
+        "selectedIconPath": "static/tabBar/map.png"
+      },
+      {
+        "pagePath": "pages/Inspectionwarning/Inspectionwarning",
+        "text": "预警",
+        "iconPath": "static/tabBar/warning.png",
+        "selectedIconPath": "static/tabBar/warning.png"
+      },
+      {
+        "pagePath": "pages/personalcenter/my",
+        "text": "我的",
+        "iconPath": "static/tabBar/my.png",
+        "selectedIconPath": "static/tabBar/my.png"
+      }
+    ]
+  },
+  "permission": {
+    "scope.userLocation": {
+      "desc": "你的位置信息将用于选择隐患位置"
+    }
+  },
+  "requiredPrivateInfos": [
+    "chooseLocation",
+    "getLocation"
+  ],
   "usingComponents": {}
 }