From 44dd9c4eb8a2489c63a5eb53fd4254bbb3510e95 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 18 Jun 2026 09:14:57 +0800
Subject: [PATCH] Merge branch 'feature/v9.0/9.0.4'

---
 src/pages.json |   88 +++++++++++++++++++++-----------------------
 1 files changed, 42 insertions(+), 46 deletions(-)

diff --git a/src/pages.json b/src/pages.json
index e839174..2f2ceb2 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -11,45 +11,36 @@
     {
       "path": "pages/map/index",
       "style": {
-        "navigationBarTitleText": "地图"
+        "navigationBarTitleText": "地图",
+        "navigationStyle": "custom"
       }
     },
     {
       "path": "pages/inspectionTask/index",
       "style": {
-        "navigationBarTitleText": "巡检任务"
+        "navigationBarTitleText": "巡检任务",
+        "navigationStyle": "custom"
       }
     },
     {
       "path": "pages/work/index",
       "style": {
-        "navigationBarTitleText": "事件工单"
+        "navigationBarTitleText": "事件工单",
+        "navigationStyle": "custom"
       }
     },
     {
       "path": "pages/user/index",
       "style": {
-        "navigationBarTitleText": "我的"
-      }
-    },
-    {
-      "path": "pages/inspectionTask/TaskDetails/TaskDetails",
-      "style": {
-        "navigationBarTitleText": "执行中",
-        "navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/inspectionTask/DroneConsole/DroneConsole",
-      "style": {
-        "navigationBarTitleText": "控制台",
+        "navigationBarTitleText": "我的",
         "navigationStyle": "custom"
       }
     },
     {
       "path": "pages/login/index",
       "style": {
-        "navigationBarTitleText": "登录页"
+        "navigationBarTitleText": "登录页",
+        "navigationStyle": "custom"
       }
     }
   ],
@@ -65,21 +56,18 @@
           }
         },
         {
-          "path": "theme/index",
+          "path": "droneConsole/index",
           "style": {
-            "navigationBarTitleText": "主题设置"
-          }
-        },
-        {
-          "path": "taskDetail/index",
-          "style": {
-            "navigationBarTitleText": "任务详情"
+            "navigationBarTitleText": "直播监控",
+            "navigationStyle": "custom",
+            "pageOrientation": "landscape"
           }
         },
         {
           "path": "taskDetail/addTask/index",
           "style": {
-            "navigationBarTitleText": "新建任务"
+            "navigationBarTitleText": "新建任务",
+            "navigationStyle": "custom"
           }
         },
         {
@@ -89,9 +77,9 @@
           }
         },
         {
-          "path": "taskDetail/inExecution/index",
+          "path": "taskDetail/inProgress/index",
           "style": {
-            "navigationBarTitleText": "执行中"
+            "navigationBarTitleText": "任务详情"
           }
         },
         {
@@ -109,7 +97,8 @@
         {
           "path": "workDetail/mapWork/index",
           "style": {
-            "navigationBarTitleText": "地图展示"
+            "navigationBarTitleText": "地图展示",
+            "navigationStyle": "custom"
           }
         },
         {
@@ -122,6 +111,12 @@
           "path": "userDetail/infos/index",
           "style": {
             "navigationBarTitleText": "个人资料"
+          }
+        },
+        {
+          "path": "downloadPage/index",
+          "style": {
+            "navigationBarTitleText": "下载"
           }
         },
         {
@@ -147,13 +142,13 @@
     }
   ],
   "tabBar": {
-    "color": "#1b233b",
-    "selectedColor": "#21d59d",
+    "color": "#8c8c8c",
+    "selectedColor": "#1D6FE9",
     "borderStyle": "black",
     "backgroundColor": "#ffffff",
     "list": [
       {
-        "iconPath": "static/images/tabbar/icon_home.png",
+        "iconPath": "static/images/tabbar/icon_home1.png",
         "selectedIconPath": "static/images/tabbar/icon_home_selected.png",
         "pagePath": "pages/map/index",
         "text": "地图"
@@ -162,23 +157,23 @@
         "iconPath": "static/images/tabbar/icon_list.png",
         "selectedIconPath": "static/images/tabbar/icon_list_selected.png",
         "pagePath": "pages/inspectionTask/index",
-        "text": "巡检任务"
+        "text": "任务"
+      },
+      // #ifndef MP-WEIXIN
+      {
+        "iconPath": "static/images/tabbar/add.png",
+        "pagePath": "subPackages/taskDetail/addTask/index"
       },
       {
-        "iconPath": "static/images/tabbar/add-task.svg",
-        "selectedIconPath": "static/images/tabbar/add-task.svg",
-        "pagePath": "subPackages/taskDetail/addTask/index",
-        "text": "",
-        "style": {
-          "width": "600",
-          "height": "600"
-        }
+        "iconPath": "static/images/tabbar/drone.png",
+        "visible": "true"
       },
+      // #endif
       {
-        "iconPath": "static/images/tabbar/icon_home.png",
-        "selectedIconPath": "static/images/tabbar/icon_home_selected.png",
+        "iconPath": "static/images/tabbar/icon_order.png",
+        "selectedIconPath": "static/images/tabbar/icon_order_selected.png",
         "pagePath": "pages/work/index",
-        "text": "事件工单"
+        "text": "工单"
       },
       {
         "iconPath": "static/images/tabbar/icon_me.png",
@@ -192,6 +187,7 @@
     "navigationBarTextStyle": "black",
     "navigationBarTitleText": "uni-app",
     "navigationBarBackgroundColor": "#F8F8F8",
-    "backgroundColor": "#F8F8F8"
+    "backgroundColor": "#F8F8F8",
+    "pageOrientation": "portrait" //横屏配置，全局屏幕旋转设置(仅 APP/微信/QQ小程序)，支持 auto / portrait / landscape
   }
 }

--
Gitblit v1.9.3