From e3dcaeb0180a4e37347ac9ceb44c8a59ae7af37f Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Mon, 21 Feb 2022 19:40:20 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/qfqk-android
---
pages.json | 253 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 229 insertions(+), 24 deletions(-)
diff --git a/pages.json b/pages.json
index 8382de9..d4c1245 100644
--- a/pages.json
+++ b/pages.json
@@ -17,7 +17,7 @@
"name": "loging",
"style": {
"navigationBarTitleText": "注册账号",
- "navigationBarBackgroundColor": "#0BB9C8",
+ "navigationBarBackgroundColor": "#103289",
"navigationBarTextStyle": "white"
// "app-plus": {
// "animationType": "fade-in",
@@ -26,11 +26,37 @@
}
},
{
+ "path": "pages/registerUser/idphoto",
+ "style": {
+ "navigationBarTitleText": "人脸识别",
+ "navigationStyle": "custom",
+ "backgroundColor": "#000000"
+ }
+
+ },
+ {
"path": "pages/home/home",
"style": {
+
"navigationBarTitleText": "首页",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/shengzs/index",
+ "style": {
+ "navigationBarTitleText": "能量树",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/myself/childen/collect",
+ "style": {
+ "navigationBarTitleText": "我的收藏",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
}
},
{
@@ -38,7 +64,7 @@
"name": "myself",
"style": {
"navigationBarTitleText": "",
- "navigationBarBackgroundColor": "#0BB9C8",
+ "navigationBarBackgroundColor": "#103289",
"navigationBarTextStyle": "white"
}
},
@@ -47,7 +73,7 @@
"name": "aboutUs",
"style": {
"navigationBarTitleText": "关于我们",
- "navigationBarBackgroundColor": "#0BB9C8",
+ "navigationBarBackgroundColor": "#103289",
"navigationBarTextStyle": "white"
}
},
@@ -56,7 +82,7 @@
"name": "shezhi",
"style": {
"navigationBarTitleText": "系统设置",
- "navigationBarBackgroundColor": "#0BB9C8",
+ "navigationBarBackgroundColor": "#103289",
"navigationBarTextStyle": "white"
}
},
@@ -73,7 +99,7 @@
"name": "genxin",
"style": {
"navigationBarTitleText": "隐私政策",
- "navigationBarBackgroundColor": "#0BB9C8",
+ "navigationBarBackgroundColor": "#103289",
"navigationBarTextStyle": "white"
}
},
@@ -81,8 +107,8 @@
"path": "pages/business/business",
"style": {
"navigationBarTitleText": "工作台",
- "navigationBarBackgroundColor": "#0BB9C8",
- "navigationBarTextStyle": "white"
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
}
},
{
@@ -140,8 +166,8 @@
"name": "groupChat",
"style": {
"navigationBarTitleText": "我要说",
- "navigationBarBackgroundColor": "#0BB9C8",
- "navigationBarTextStyle":"white"
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
}
},
{
@@ -209,23 +235,59 @@
"path": "pages/article/article",
"style": {
"navigationBarTitleText": "资讯",
- "navigationBarBackgroundColor": "#0BB9C8",
- "navigationBarTextStyle": "white"
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white",
+ "onReachBottomDistance": 0
+ }
+ },
+ {
+ "path": "pages/article/article_video",
+ "style": {
+ "navigationBarTitleText": "视频",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white",
+ "app-plus": {
+ "titleNView": false,
+ "subNVues": [{
+ "id": "comment",
+ "path": "pages/subnvue/comment",
+ "style": {
+ "height": "100%",
+ "position": "absolute",
+ "bottom": "0",
+ "background": "transparent",
+ "zindex": 1
+
+ }
+ }, {
+ "id": "input-box",
+ "path": "pages/subnvue/input-box",
+ "style": {
+ "height": "100%",
+ "position": "absolute",
+ "bottom": "0",
+ "background": "transparent",
+ "zindex": 2
+ }
+ }]
+ }
}
},
{
"path": "pages/article/article_detail",
"name": "equipment",
"style": {
- "navigationBarTitleText": "详情"
+ "navigationBarTitleText": "详情",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
}
},
{
"path": "pages/patrol/patrol",
"name": "equipment",
"style": {
- "navigationBarTitleText": "巡逻管理",
- "navigationBarBackgroundColor": "#0BB9C8",
+ "navigationBarTitleText": "巡逻任务",
+ "navigationBarBackgroundColor": "#103289",
"navigationBarTextStyle": "white"
}
},
@@ -233,7 +295,9 @@
"path": "pages/investigation/investigation",
"name": "investigation",
"style": {
- "navigationBarTitleText": "地图"
+ "navigationBarTitleText": "地图",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
}
},
{
@@ -249,15 +313,71 @@
{
"path": "pages/handle/handle",
"style": {
- "navigationBarTitleText": "我要办"
+ "navigationBarTitleText": "我要办",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
}
},
{
"path": "pages/alarm_list/alarm_list",
"name": "alarm_list",
"style": {
- "navigationBarTitleText": "群防任务",
- "navigationBarBackgroundColor": "#0BB9C8",
+ "navigationBarTitleText": "我要查",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/grabOrders/grabOrders",
+ "name": "grabOrders",
+ "style": {
+ "navigationBarTitleText": "我参与",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/grabOrders/map",
+ "name": "map",
+ "style": {
+ "navigationBarTitleText": "任务详情",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ // {
+ // "path": "pages/grabOrders/xcxm",
+ // "name": "map",
+ // "style": {
+ // "navigationBarTitleText": "任务详情",
+ // "navigationBarBackgroundColor": "#103289",
+ // "navigationBarTextStyle": "white"
+ // }
+ // },
+ {
+ "path": "pages/issue/issue",
+ "name": "issue",
+ "style": {
+ "navigationBarTitleText": "发布",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/grabOrders/task",
+ "name": "task",
+ "style": {
+ "navigationBarTitleText": "任务详情",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/grabOrders/feedback",
+ "name": "feedback",
+ "style": {
+ "navigationBarTitleText": "任务反馈",
+ "navigationBarBackgroundColor": "#103289",
"navigationBarTextStyle": "white"
}
},
@@ -272,7 +392,20 @@
"path": "pages/map/map",
"name": "map",
"style": {
- "navigationBarTitleText": "地图"
+ "navigationBarTitleText": "群防任务",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/currentMap/currentMap",
+ "name": "currentMap",
+ "style": {
+ "navigationBarTitleText": "获取辖区",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
}
},
{
@@ -298,7 +431,7 @@
"name": "mapJQtijiao",
"style": {
"navigationBarTitleText": "处理结果",
- "navigationBarBackgroundColor": "#0BB9C8",
+ "navigationBarBackgroundColor": "#103289",
"navigationBarTextStyle": "white"
}
},
@@ -307,7 +440,7 @@
"name": "alarmOver",
"style": {
"navigationBarTitleText": "任务详情",
- "navigationBarBackgroundColor": "#0BB9C8",
+ "navigationBarBackgroundColor": "#103289",
"navigationBarTextStyle": "white"
}
},
@@ -328,8 +461,74 @@
"style": {
"navigationBarTitleText": "500"
}
+ }, {
+ "path": "pages/alarm_list/integral/integral",
+ "style": {
+ "navigationBarTitleText": "查积分",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+
+ }, {
+ "path": "pages/alarm_list/organ/organ",
+ "style": {
+ "navigationBarTitleText": "组织申请",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+
+ }, {
+ "path": "pages/alarm_list/industry/industry",
+ "style": {
+ "navigationBarTitleText": "行业政策",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+
+ }, {
+ "path": "pages/alarm_list/industry/industry_detail",
+ "style": {
+ "navigationBarTitleText": "行业政策",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+
+ }, {
+ "path": "pages/voting/vote",
+ "style": {
+ "navigationBarTitleText": "参与投票",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+
+ }, {
+ "path": "pages/voting/voteManage",
+ "style": {
+ "navigationBarTitleText": "我的投票",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+
+ }, {
+ "path": "pages/voting/voteDetail",
+ "style": {
+ "navigationBarTitleText": "投票详情",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+
}
- ],
+ ,{
+ "path" : "pages/voting/votRanking",
+ "style" :
+ {
+ "navigationBarTitleText": "投票排名",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+
+ }
+ ],
"globalStyle": { //将组件安装在项目的components目录下，并符合components/组件名称/组件名称.vue目录结构。可以不用引用、注册，直接在页面中使用。
"autoscan": true
},
@@ -342,11 +541,18 @@
"text": "首页",
"iconPath": "static/tabbar/index01.png",
"selectedIconPath": "static/tabbar/index02.png"
- }, {
+ },
+ {
"pagePath": "pages/article/article",
"text": "资讯",
"iconPath": "static/tabbar/article.png",
"selectedIconPath": "static/tabbar/articleH.png"
+ },
+ {
+ "pagePath": "pages/issue/issue",
+ "iconPath": "static/tabbar/addIcon.png",
+ "selectedIconPath": "static/tabbar/addSelectedIcon.png",
+ "text": "发布"
},
{
"pagePath": "pages/business/business",
@@ -360,7 +566,6 @@
"iconPath": "static/tabbar/my.png",
"selectedIconPath": "./static/tabbar/my-blue.png"
}
-
]
},
"globalStyle": { // 不能在globalStyle中设置隐藏头部导航栏，否则聊天页面的头部栏会不显示，在pages中设置titleNView为false就可以隐藏头部导航栏了
--
Gitblit v1.9.3