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 | 220 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 151 insertions(+), 69 deletions(-)
diff --git a/src/pages.json b/src/pages.json
index d251f2d..2f2ceb2 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -9,48 +9,45 @@
},
"pages": [
{
- "path": "pages/tab/home/index",
+ "path": "pages/map/index",
"style": {
- "navigationBarTitleText": "首页"
- }
- },
- {
- "path": "pages/tab/map/index",
- "style": {
- "navigationBarTitleText": "地图"
- }
- },
- {
- "path": "pages/tab/list/index",
- "style": {
- "navigationBarTitleText": "列表"
- }
- },
- {
- "path": "pages/tab/user/index",
- "style": {
+ "navigationBarTitleText": "地图",
"navigationStyle": "custom"
- },
- "needLogin": true
+ }
+ },
+ {
+ "path": "pages/inspectionTask/index",
+ "style": {
+ "navigationBarTitleText": "巡检任务",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/work/index",
+ "style": {
+ "navigationBarTitleText": "事件工单",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/user/index",
+ "style": {
+ "navigationBarTitleText": "我的",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/login/index",
+ "style": {
+ "navigationBarTitleText": "登录页",
+ "navigationStyle": "custom"
+ }
}
],
"subPackages": [
{
- "root": "pages/common",
+ "root": "subPackages",
"pages": [
- {
- "path": "login/index",
- "style": {
- "navigationBarTitleText": "登录",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "webview/index",
- "style": {
- "navigationBarTitleText": "网页"
- }
- },
{
"path": "404/index",
"style": {
@@ -59,53 +56,138 @@
}
},
{
- "path": "theme/index",
+ "path": "droneConsole/index",
"style": {
- "navigationBarTitleText": "主题设置"
+ "navigationBarTitleText": "直播监控",
+ "navigationStyle": "custom",
+ "pageOrientation": "landscape"
+ }
+ },
+ {
+ "path": "taskDetail/addTask/index",
+ "style": {
+ "navigationBarTitleText": "新建任务",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "taskDetail/execution/index",
+ "style": {
+ "navigationBarTitleText": "任务详情"
+ }
+ },
+ {
+ "path": "taskDetail/inProgress/index",
+ "style": {
+ "navigationBarTitleText": "任务详情"
+ }
+ },
+ {
+ "path": "workDetail/index",
+ "style": {
+ "navigationBarTitleText": "工单详情"
+ }
+ },
+ {
+ "path": "workDetail/addWork/index",
+ "style": {
+ "navigationBarTitleText": "新建工单"
+ }
+ },
+ {
+ "path": "workDetail/mapWork/index",
+ "style": {
+ "navigationBarTitleText": "地图展示",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "workDetail/photoMagnify/index",
+ "style": {
+ "navigationBarTitleText": "照片放大"
+ }
+ },
+ {
+ "path": "userDetail/infos/index",
+ "style": {
+ "navigationBarTitleText": "个人资料"
+ }
+ },
+ {
+ "path": "downloadPage/index",
+ "style": {
+ "navigationBarTitleText": "下载"
+ }
+ },
+ {
+ "path": "userDetail/password/index",
+ "style": {
+ "navigationBarTitleText": "修改密码"
+ }
+ },
+ {
+ "path": "browser/index",
+ "style": {
+ "navigationBarTitleText": "地图"
+ }
+ },
+ {
+ "path": "qrCode/index",
+ "style": {
+ "navigationBarTitleText": "扫码",
+ "navigationBarTextStyle": "black"
}
}
]
}
],
- "preloadRule": {
- "pages/tab/home/index": {
- "network": "all",
- "packages": ["pages/common"]
- }
- },
"tabBar": {
- "color": "#1b233b",
- "selectedColor": "#21d59d",
+ "color": "#8c8c8c",
+ "selectedColor": "#1D6FE9",
"borderStyle": "black",
"backgroundColor": "#ffffff",
- "list": [{
- "iconPath": "static/images/tabbar/icon_home.png",
- "selectedIconPath": "static/images/tabbar/icon_home_selected.png",
- "pagePath": "pages/tab/home/index",
- "text": "首页"
- },
- {
- "iconPath": "static/images/tabbar/icon_home.png",
- "selectedIconPath": "static/images/tabbar/icon_home_selected.png",
- "pagePath": "pages/tab/map/index",
- "text": "地图"
- },
- {
- "iconPath": "static/images/tabbar/icon_list.png",
- "selectedIconPath": "static/images/tabbar/icon_list_selected.png",
- "pagePath": "pages/tab/list/index",
- "text": "列表"
- }, {
- "iconPath": "static/images/tabbar/icon_me.png",
- "selectedIconPath": "static/images/tabbar/icon_me_selected.png",
- "pagePath": "pages/tab/user/index",
- "text": "我的"
- }]
+ "list": [
+ {
+ "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.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"
+ },
+ {
+ "iconPath": "static/images/tabbar/drone.png",
+ "visible": "true"
+ },
+ // #endif
+ {
+ "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.png",
+ "selectedIconPath": "static/images/tabbar/icon_me_selected.png",
+ "pagePath": "pages/user/index",
+ "text": "我的"
+ }
+ ]
},
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "uni-app",
"navigationBarBackgroundColor": "#F8F8F8",
- "backgroundColor": "#F8F8F8"
+ "backgroundColor": "#F8F8F8",
+ "pageOrientation": "portrait" //横屏配置，全局屏幕旋转设置(仅 APP/微信/QQ小程序)，支持 auto / portrait / landscape
}
}
--
Gitblit v1.9.3