From 648904d076ae6e17892b40675598b1c8dc474277 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 24 Apr 2026 16:21:12 +0800
Subject: [PATCH] Merge branch 'feature/v9.0/9.0.3' into feature/v9.0/9.0.4
---
src/pages.json | 39 ++++++++-------------------------------
1 files changed, 8 insertions(+), 31 deletions(-)
diff --git a/src/pages.json b/src/pages.json
index 939a1f4..9cd978c 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -42,14 +42,7 @@
"navigationBarTitleText": "登录页",
"navigationStyle": "custom"
}
- },
- {
- "path": "pages/placeholder/placeholder",
- "style": {
- "navigationBarTitleText": "占位页面"
- }
}
-
],
"subPackages": [
{
@@ -63,24 +56,6 @@
}
},
{
- "path": "theme/index",
- "style": {
- "navigationBarTitleText": "主题设置"
- }
- },
- {
- "path": "taskDetail/index",
- "style": {
- "navigationBarTitleText": "任务详情"
- }
- },
- {
- "path": "inProgress/index",
- "style": {
- "navigationBarTitleText": "任务详情"
- }
- },
- {
"path": "droneConsole/index",
"style": {
"navigationBarTitleText": "直播监控",
@@ -90,7 +65,8 @@
{
"path": "taskDetail/addTask/index",
"style": {
- "navigationBarTitleText": "新建任务"
+ "navigationBarTitleText": "新建任务",
+ "navigationStyle": "custom"
}
},
{
@@ -100,9 +76,9 @@
}
},
{
- "path": "taskDetail/inExecution/index",
+ "path": "taskDetail/inProgress/index",
"style": {
- "navigationBarTitleText": "执行中"
+ "navigationBarTitleText": "任务详情"
}
},
{
@@ -121,7 +97,7 @@
"path": "workDetail/mapWork/index",
"style": {
"navigationBarTitleText": "地图展示",
- "navigationStyle": "custom"
+ "navigationStyle": "custom"
}
},
{
@@ -176,15 +152,16 @@
"pagePath": "pages/inspectionTask/index",
"text": "任务"
},
+ // #ifndef MP-WEIXIN
{
"iconPath": "static/images/tabbar/add.png",
"pagePath": "subPackages/taskDetail/addTask/index"
},
{
- "pagePath": "pages/placeholder/placeholder",
"iconPath": "static/images/tabbar/drone.png",
"visible": "true"
},
+ // #endif
{
"iconPath": "static/images/tabbar/icon_order.png",
"selectedIconPath": "static/images/tabbar/icon_order_selected.png",
@@ -205,4 +182,4 @@
"navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8"
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3