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 | 57 +++++++++++++++++++++++++--------------------------------
1 files changed, 25 insertions(+), 32 deletions(-)
diff --git a/src/pages.json b/src/pages.json
index 84e3cd9..2f2ceb2 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -56,34 +56,18 @@
}
},
{
- "path": "theme/index",
- "style": {
- "navigationBarTitleText": "主题设置"
- }
- },
- {
- "path": "taskDetail/index",
- "style": {
- "navigationBarTitleText": "任务详情"
- }
- },
- {
- "path": "inProgress/index",
- "style": {
- "navigationBarTitleText": "任务详情"
- }
- },
- {
"path": "droneConsole/index",
"style": {
"navigationBarTitleText": "直播监控",
- "navigationStyle": "custom"
+ "navigationStyle": "custom",
+ "pageOrientation": "landscape"
}
},
{
"path": "taskDetail/addTask/index",
"style": {
- "navigationBarTitleText": "新建任务"
+ "navigationBarTitleText": "新建任务",
+ "navigationStyle": "custom"
}
},
{
@@ -93,9 +77,9 @@
}
},
{
- "path": "taskDetail/inExecution/index",
+ "path": "taskDetail/inProgress/index",
"style": {
- "navigationBarTitleText": "执行中"
+ "navigationBarTitleText": "任务详情"
}
},
{
@@ -114,7 +98,7 @@
"path": "workDetail/mapWork/index",
"style": {
"navigationBarTitleText": "地图展示",
- "navigationStyle": "custom"
+ "navigationStyle": "custom"
}
},
{
@@ -127,6 +111,12 @@
"path": "userDetail/infos/index",
"style": {
"navigationBarTitleText": "个人资料"
+ }
+ },
+ {
+ "path": "downloadPage/index",
+ "style": {
+ "navigationBarTitleText": "下载"
}
},
{
@@ -158,17 +148,18 @@
"backgroundColor": "#ffffff",
"list": [
{
- "iconPath": "static/images/tabbar/icon_home.svg",
- "selectedIconPath": "static/images/tabbar/icon_home_selected.svg",
+ "iconPath": "static/images/tabbar/icon_home1.png",
+ "selectedIconPath": "static/images/tabbar/icon_home_selected.png",
"pagePath": "pages/map/index",
"text": "地图"
},
{
- "iconPath": "static/images/tabbar/icon_list.svg",
- "selectedIconPath": "static/images/tabbar/icon_list_selected.svg",
+ "iconPath": "static/images/tabbar/icon_list.png",
+ "selectedIconPath": "static/images/tabbar/icon_list_selected.png",
"pagePath": "pages/inspectionTask/index",
"text": "任务"
},
+ // #ifndef MP-WEIXIN
{
"iconPath": "static/images/tabbar/add.png",
"pagePath": "subPackages/taskDetail/addTask/index"
@@ -177,15 +168,16 @@
"iconPath": "static/images/tabbar/drone.png",
"visible": "true"
},
+ // #endif
{
- "iconPath": "static/images/tabbar/icon_order.svg",
- "selectedIconPath": "static/images/tabbar/icon_order_selected.svg",
+ "iconPath": "static/images/tabbar/icon_order.png",
+ "selectedIconPath": "static/images/tabbar/icon_order_selected.png",
"pagePath": "pages/work/index",
"text": "工单"
},
{
- "iconPath": "static/images/tabbar/icon_me.svg",
- "selectedIconPath": "static/images/tabbar/icon_me_selected.svg",
+ "iconPath": "static/images/tabbar/icon_me.png",
+ "selectedIconPath": "static/images/tabbar/icon_me_selected.png",
"pagePath": "pages/user/index",
"text": "我的"
}
@@ -195,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