From 86c2d61ba9d33f1886cfc904dcaf17f033e4c80a Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 17 Jan 2026 13:52:53 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web

---
 uniapps/work-wx/src/pages.json |   50 ++++++++++++++++++++++++++------------------------
 1 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/uniapps/work-wx/src/pages.json b/uniapps/work-wx/src/pages.json
index f6784de..44584ee 100644
--- a/uniapps/work-wx/src/pages.json
+++ b/uniapps/work-wx/src/pages.json
@@ -11,32 +11,41 @@
 		{
 			"path": "pages/page/index",
 			"style": {
-				"navigationBarTitleText": "首页",
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "首页"
+			}
+		},
+		{
+			"path": "pages/register/index",
+			"style": {
+				"navigationBarTitleText": "注册"
 			}
 		},
 		{
 			"path": "pages/equipmentManagement/index",
 			"style": {
-				"navigationBarTitleText": "设备管理",
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "设备管理"
 			}
 		},
 		{
 			"path": "pages/legalPolicy/index",
 			"style": {
-				"navigationBarTitleText": "法律政策",
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "法律政策"
 			}
 		},
 
 		{
 			"path": "pages/user/index",
 			"style": {
-				"navigationBarTitleText": "我的",
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "我的"
 			}
 		},
+    {
+      "path": "pages/map/index",
+      "style": {
+        "navigationBarTitleText": "地图",
+        "navigationStyle": "custom"
+      }
+    },
 		{
 			"path": "pages/login/index",
 			"style": {
@@ -56,7 +65,7 @@
 						"navigationStyle": "custom"
 					}
 				},
-				
+
 				{
 					"path": "airspaceInformation/index",
 					"style": {
@@ -88,13 +97,6 @@
 					}
 				},
 				{
-					"path": "workDetail/mapWork/index",
-					"style": {
-						"navigationBarTitleText": "地图展示",
-						"navigationStyle": "custom"
-					}
-				},
-				{
 					"path": "userDetail/infos/index",
 					"style": {
 						"navigationBarTitleText": "个人资料"
@@ -122,26 +124,26 @@
 		"backgroundColor": "#ffffff",
 		"list": [
 			{
-				"iconPath": "static/images/tabbar/icon_order.png",
-				"selectedIconPath": "static/images/tabbar/icon_order_selected.png",
+				"iconPath": "static/images/tabbar/home.png",
+				"selectedIconPath": "static/images/tabbar/home-selected.png",
 				"pagePath": "pages/page/index",
 				"text": "首页"
 			},
 			{
-				"iconPath": "static/images/tabbar/icon_order.png",
-				"selectedIconPath": "static/images/tabbar/icon_order_selected.png",
+				"iconPath": "static/images/tabbar/sbgl.png",
+				"selectedIconPath": "static/images/tabbar/sbgl-selected.png",
 				"pagePath": "pages/equipmentManagement/index",
 				"text": "设备管理"
 			},
 			{
-				"iconPath": "static/images/tabbar/icon_home1.png",
-				"selectedIconPath": "static/images/tabbar/icon_home_selected.png",
+				"iconPath": "static/images/tabbar/flzc.png",
+				"selectedIconPath": "static/images/tabbar/flzc-selected.png",
 				"pagePath": "pages/legalPolicy/index",
 				"text": "法律政策"
 			},
 			{
-				"iconPath": "static/images/tabbar/icon_me.png",
-				"selectedIconPath": "static/images/tabbar/icon_me_selected.png",
+				"iconPath": "static/images/tabbar/my.png",
+				"selectedIconPath": "static/images/tabbar/my-selected.png",
 				"pagePath": "pages/user/index",
 				"text": "我的"
 			}

--
Gitblit v1.9.3