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 | 333 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 282 insertions(+), 51 deletions(-)
diff --git a/pages.json b/pages.json
index 891df99..d4c1245 100644
--- a/pages.json
+++ b/pages.json
@@ -7,7 +7,18 @@
"path": "pages/loging/loging",
"name": "loging",
"style": {
- "navigationBarTitleText": "请登录"
+ "navigationBarTitleText": "请登录",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/registerUser/registerUser",
+ "name": "loging",
+ "style": {
+ "navigationBarTitleText": "注册账号",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
// "app-plus": {
// "animationType": "fade-in",
// "animationDuration": 300
@@ -15,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"
}
},
{
@@ -27,7 +64,8 @@
"name": "myself",
"style": {
"navigationBarTitleText": "",
- "navigationBarBackgroundColor": "#25262E"
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
}
},
{
@@ -35,7 +73,8 @@
"name": "aboutUs",
"style": {
"navigationBarTitleText": "关于我们",
- "navigationBarBackgroundColor": "#F56968"
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
}
},
{
@@ -43,7 +82,8 @@
"name": "shezhi",
"style": {
"navigationBarTitleText": "系统设置",
- "navigationBarBackgroundColor": "#F56968"
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
}
},
{
@@ -58,17 +98,17 @@
"path": "pages/myself/childen/genxin",
"name": "genxin",
"style": {
- "navigationBarTitleText": "版本信息",
- "navigationBarBackgroundColor": "#F56968"
+ "navigationBarTitleText": "隐私政策",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
}
},
{
"path": "pages/business/business",
"style": {
"navigationBarTitleText": "工作台",
- "app-plus":{
- "titleNView":false
- }
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
}
},
{
@@ -116,8 +156,8 @@
"name": "reported",
"style": {
"navigationBarTitleText": "我要报",
- "app-plus":{
- "titleNView":false
+ "app-plus": {
+ "titleNView": false
}
}
},
@@ -125,32 +165,34 @@
"path": "pages/groupChat/groupChat",
"name": "groupChat",
"style": {
- "navigationBarTitleText": "聊天室"
+ "navigationBarTitleText": "我要说",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
}
},
{
- "path" : "components/submit/submit",
- "style" : {}
+ "path": "components/submit/submit",
+ "style": {}
},
{
"path": "pages/groupChat/chating",
"name": "chating",
"style": {
"navigationBarTitleText": "聊天室2",
- "navigationStyle":"custom",
- "app-plus":{
- "titleNView":false
+ "navigationStyle": "custom",
+ "app-plus": {
+ "titleNView": false
}
}
},
{
- "path": "pages/groupChat/chatingcopy",
- "name": "chatingcopy",
+ "path": "pages/groupChat/chatingQZ",
+ "name": "chatingQZ",
"style": {
"navigationBarTitleText": "聊天室2",
- "navigationStyle":"custom",
- "app-plus":{
- "titleNView":false
+ "navigationStyle": "custom",
+ "app-plus": {
+ "titleNView": false
}
}
},
@@ -193,8 +235,41 @@
"path": "pages/article/article",
"style": {
"navigationBarTitleText": "资讯",
- "app-plus":{
- "titleNView":false
+ "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
+ }
+ }]
}
}
},
@@ -202,21 +277,27 @@
"path": "pages/article/article_detail",
"name": "equipment",
"style": {
- "navigationBarTitleText": "详情"
+ "navigationBarTitleText": "详情",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
}
},
{
"path": "pages/patrol/patrol",
"name": "equipment",
"style": {
- "navigationBarTitleText": "巡逻管理"
+ "navigationBarTitleText": "巡逻任务",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
}
},
{
"path": "pages/investigation/investigation",
"name": "investigation",
"style": {
- "navigationBarTitleText": "地图"
+ "navigationBarTitleText": "地图",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
}
},
{
@@ -224,15 +305,17 @@
"name": "workbench",
"style": {
"navigationBarTitleText": "我要巡",
- "app-plus":{
- "titleNView":false
+ "app-plus": {
+ "titleNView": false
}
}
},
{
"path": "pages/handle/handle",
"style": {
- "navigationBarTitleText": "我要办"
+ "navigationBarTitleText": "我要办",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
}
},
{
@@ -240,9 +323,62 @@
"name": "alarm_list",
"style": {
"navigationBarTitleText": "我要查",
- "app-plus":{
- "titleNView":false
- }
+ "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"
}
},
{
@@ -256,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"
}
},
{
@@ -265,8 +414,8 @@
"style": {
"navigationBarTitleText": "打卡签到",
"navigationBarBackgroundColor": "#25262E",
- "app-plus":{
- "titleNView":false
+ "app-plus": {
+ "titleNView": false
}
}
},
@@ -282,7 +431,17 @@
"name": "mapJQtijiao",
"style": {
"navigationBarTitleText": "处理结果",
- "navigationBarBackgroundColor": "#0cd7e5"
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/poput/alarmOver/alarmOver",
+ "name": "alarmOver",
+ "style": {
+ "navigationBarTitleText": "任务详情",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
}
},
{
@@ -302,9 +461,75 @@
"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"
+ }
+
}
- ],
- "globalStyle": {//将组件安装在项目的components目录下，并符合components/组件名称/组件名称.vue目录结构。可以不用引用、注册，直接在页面中使用。
+ ,{
+ "path" : "pages/voting/votRanking",
+ "style" :
+ {
+ "navigationBarTitleText": "投票排名",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+
+ }
+ ],
+ "globalStyle": { //将组件安装在项目的components目录下，并符合components/组件名称/组件名称.vue目录结构。可以不用引用、注册，直接在页面中使用。
"autoscan": true
},
"tabBar": {
@@ -316,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",
@@ -334,18 +566,17 @@
"iconPath": "static/tabbar/my.png",
"selectedIconPath": "./static/tabbar/my-blue.png"
}
-
]
},
"globalStyle": { // 不能在globalStyle中设置隐藏头部导航栏，否则聊天页面的头部栏会不显示，在pages中设置titleNView为false就可以隐藏头部导航栏了
- "navigationBarTextStyle": "black",
- "navigationBarTitleText": "hello",
- "navigationBarBackgroundColor": "#fff",
- "backgroundColor": "#f7f7f7",
- "backgroundTextStyle":"light",
- "pageOrientation":"portrait", //横屏配置，屏幕旋转设置
- "app-plus": {
- "bounce": "none"
- }
- }
+ "navigationBarTextStyle": "black",
+ "navigationBarTitleText": "hello",
+ "navigationBarBackgroundColor": "#fff",
+ "backgroundColor": "#f7f7f7",
+ "backgroundTextStyle": "light",
+ "pageOrientation": "portrait", //横屏配置，屏幕旋转设置
+ "app-plus": {
+ "bounce": "none"
+ }
+ }
}
--
Gitblit v1.9.3