From e3e6a984ee20e3a77852442b68ddb1d887e2e769 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 26 Dec 2025 18:05:34 +0800
Subject: [PATCH] Merge branch 'feature/v9.0/9.0.3' into prod
---
src/pages.json | 31 ++++++++-----------------------
1 files changed, 8 insertions(+), 23 deletions(-)
diff --git a/src/pages.json b/src/pages.json
index 49e545b..9cd978c 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -56,24 +56,6 @@
}
},
{
- "path": "theme/index",
- "style": {
- "navigationBarTitleText": "主题设置"
- }
- },
- {
- "path": "taskDetail/index",
- "style": {
- "navigationBarTitleText": "任务详情"
- }
- },
- {
- "path": "inProgress/index",
- "style": {
- "navigationBarTitleText": "任务详情"
- }
- },
- {
"path": "droneConsole/index",
"style": {
"navigationBarTitleText": "直播监控",
@@ -83,7 +65,8 @@
{
"path": "taskDetail/addTask/index",
"style": {
- "navigationBarTitleText": "新建任务"
+ "navigationBarTitleText": "新建任务",
+ "navigationStyle": "custom"
}
},
{
@@ -93,9 +76,9 @@
}
},
{
- "path": "taskDetail/inExecution/index",
+ "path": "taskDetail/inProgress/index",
"style": {
- "navigationBarTitleText": "执行中"
+ "navigationBarTitleText": "任务详情"
}
},
{
@@ -114,7 +97,7 @@
"path": "workDetail/mapWork/index",
"style": {
"navigationBarTitleText": "地图展示",
- "navigationStyle": "custom"
+ "navigationStyle": "custom"
}
},
{
@@ -169,6 +152,7 @@
"pagePath": "pages/inspectionTask/index",
"text": "任务"
},
+ // #ifndef MP-WEIXIN
{
"iconPath": "static/images/tabbar/add.png",
"pagePath": "subPackages/taskDetail/addTask/index"
@@ -177,6 +161,7 @@
"iconPath": "static/images/tabbar/drone.png",
"visible": "true"
},
+ // #endif
{
"iconPath": "static/images/tabbar/icon_order.png",
"selectedIconPath": "static/images/tabbar/icon_order_selected.png",
@@ -197,4 +182,4 @@
"navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8"
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3