From ebd0ec4f51288042b6fc5bf714b1febbb63cfacc Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Fri, 09 Jan 2026 18:03:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
uniapps/work-app/src/pages.json | 261 +++++++++++++++++++++++++--------------------------
1 files changed, 127 insertions(+), 134 deletions(-)
diff --git a/uniapps/work-app/src/pages.json b/uniapps/work-app/src/pages.json
index 642517b..595286e 100644
--- a/uniapps/work-app/src/pages.json
+++ b/uniapps/work-app/src/pages.json
@@ -1,137 +1,130 @@
{
- "easycom": {
- "custom": {
- "^u--(.*)": "uview-plus/components/u-$1/u-$1.vue",
- "^up-(.*)": "uview-plus/components/u-$1/u-$1.vue",
- "^u-([^-].*)": "uview-plus/components/u-$1/u-$1.vue",
- "^(?!z-paging-refresh|z-paging-load-more)z-paging(.*)": "z-paging/components/z-paging$1/z-paging$1.vue"
- }
- },
- "pages": [
- {
- "path": "pages/work/index",
- "style": {
- "navigationBarTitleText": "事件工单",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/voiceCall/index",
- "style": {
- "navigationBarTitleText": "通话",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/map/index",
- "style": {
- "navigationBarTitleText": "地图",
- "navigationStyle": "custom"
- }
- },
+ "easycom": {
+ "custom": {
+ "^u--(.*)": "uview-plus/components/u-$1/u-$1.vue",
+ "^up-(.*)": "uview-plus/components/u-$1/u-$1.vue",
+ "^u-([^-].*)": "uview-plus/components/u-$1/u-$1.vue",
+ "^(?!z-paging-refresh|z-paging-load-more)z-paging(.*)": "z-paging/components/z-paging$1/z-paging$1.vue"
+ }
+ },
+ "pages": [
+ {
+ "path": "pages/work/index",
+ "style": {
+ "navigationBarTitleText": "事件工单",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/voiceCall/index",
+ "style": {
+ "navigationBarTitleText": "通话",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/map/index",
+ "style": {
+ "navigationBarTitleText": "地图",
+ "navigationStyle": "custom"
+ }
+ },
- {
- "path": "pages/user/index",
- "style": {
- "navigationBarTitleText": "我的",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/login/index",
- "style": {
- "navigationBarTitleText": "登录页",
- "navigationStyle": "custom"
- }
- }
- ],
- "subPackages": [
- {
- "root": "subPackages",
- "pages": [
- {
- "path": "404/index",
- "style": {
- "navigationBarTitleText": "404",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "workDetail/index",
- "style": {
- "navigationBarTitleText": "工单详情"
- }
- },
- {
- "path": "workDetail/addWork/index",
- "style": {
- "navigationBarTitleText": "新建工单"
- }
- },
- {
- "path": "workDetail/mapWork/index",
- "style": {
- "navigationBarTitleText": "地图展示",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "userDetail/infos/index",
- "style": {
- "navigationBarTitleText": "个人资料"
- }
- },
- {
- "path": "userDetail/password/index",
- "style": {
- "navigationBarTitleText": "修改密码"
- }
- },
- {
- "path": "browser/index",
- "style": {
- "navigationBarTitleText": "地图"
- }
- }
- ]
- }
- ],
- "tabBar": {
- "color": "#8c8c8c",
- "selectedColor": "#1D6FE9",
- "borderStyle": "black",
- "backgroundColor": "#ffffff",
- "list": [
- {
- "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_order.png",
- "selectedIconPath": "static/images/tabbar/icon_order_selected.png",
- "pagePath": "pages/voiceCall/index",
- "text": "通话"
- },
- {
- "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_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"
- }
+ {
+ "path": "pages/user/index",
+ "style": {
+ "navigationBarTitleText": "我的",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/login/index",
+ "style": {
+ "navigationBarTitleText": "登录页",
+ "navigationStyle": "custom"
+ }
+ }
+ ],
+ "subPackages": [
+ {
+ "root": "subPackages",
+ "pages": [
+ {
+ "path": "404/index",
+ "style": {
+ "navigationBarTitleText": "404",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "workDetail/index",
+ "style": {
+ "navigationBarTitleText": "工单详情"
+ }
+ },
+ {
+ "path": "workDetail/mapWork/index",
+ "style": {
+ "navigationBarTitleText": "工单位置"
+ }
+ },
+ {
+ "path": "userDetail/infos/index",
+ "style": {
+ "navigationBarTitleText": "个人资料"
+ }
+ },
+ {
+ "path": "userDetail/password/index",
+ "style": {
+ "navigationBarTitleText": "修改密码"
+ }
+ },
+ {
+ "path": "browser/index",
+ "style": {
+ "navigationBarTitleText": "地图"
+ }
+ }
+ ]
+ }
+ ],
+ "tabBar": {
+ "color": "#8c8c8c",
+ "selectedColor": "#1D6FE9",
+ "borderStyle": "black",
+ "backgroundColor": "#ffffff",
+ "list": [
+ {
+ "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_order.png",
+ "selectedIconPath": "static/images/tabbar/icon_order_selected.png",
+ "pagePath": "pages/voiceCall/index",
+ "text": "语音通话"
+ },
+ {
+ "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_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"
+ }
}
--
Gitblit v1.9.3