From 09bfdb083f90acb29e4b9cf2aeb6201287418ade Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Fri, 25 Feb 2022 11:51:51 +0800
Subject: [PATCH] +
---
pages/home/home.vue | 51
pages/grabOrders/grabOrdersZAXC/map.vue | 8
pages/grabOrders/grabOrdersZAFFPX/inPage/page0.vue | 31
api/mock/home.js | 3
pages.json | 1366 ++++++++++++++++++++++----------------------
pages/grabOrders/grabOrdersZAFFPX/once.vue | 0
store/websocket.js | 4
pages/grabOrders/grabOrdersZAYWXC/inPage/page0.vue | 8
pages/grabOrders/grabOrdersZAYWXC/map.vue | 10
pages/grabOrders/grabOrdersZAFFPX/map.vue | 25
pages/grabOrders/grabOrdersMain/business.vue | 284 +++++++++
11 files changed, 1,053 insertions(+), 737 deletions(-)
diff --git a/api/mock/home.js b/api/mock/home.js
index 4200f21..f78d606 100644
--- a/api/mock/home.js
+++ b/api/mock/home.js
@@ -130,7 +130,8 @@
{
name: '我参与',
img: '/static/images/home/jusou.png',
- url: '../business/business'
+ // url: '../business/business'
+ url: '../grabOrders/grabOrdersMain/business'
},
{
name: '积分商城',
diff --git a/pages.json b/pages.json
index 57b5f77..ebe2627 100644
--- a/pages.json
+++ b/pages.json
@@ -1,693 +1,703 @@
{
- "easycom": {
- "^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
- },
- "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
- {
- "path": "pages/loging/loging",
- "name": "loging",
- "style": {
- "navigationBarTitleText": "请登录",
- "enablePullDownRefresh": false,
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/registerUser/registerUser",
- "name": "loging",
- "style": {
- "navigationBarTitleText": "注册账号",
- "navigationBarBackgroundColor": "#103289",
- "navigationBarTextStyle": "white"
- // "app-plus": {
- // "animationType": "fade-in",
- // "animationDuration": 300
- // }
- }
- },
- {
- "path": "pages/registerUser/idphoto",
- "style": {
- "navigationBarTitleText": "人脸识别",
- "navigationStyle": "custom",
- "backgroundColor": "#000000"
- }
+ "easycom": {
+ "^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
+ },
+ "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+ {
+ "path": "pages/loging/loging",
+ "name": "loging",
+ "style": {
+ "navigationBarTitleText": "请登录",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/registerUser/registerUser",
+ "name": "loging",
+ "style": {
+ "navigationBarTitleText": "注册账号",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ // "app-plus": {
+ // "animationType": "fade-in",
+ // "animationDuration": 300
+ // }
+ }
+ },
+ {
+ "path": "pages/registerUser/idphoto",
+ "style": {
+ "navigationBarTitleText": "人脸识别",
+ "navigationStyle": "custom",
+ "backgroundColor": "#000000"
+ }
- },
- {
- "path": "pages/home/home",
- "style": {
+ },
+ {
+ "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"
- }
- },
- {
- "path": "pages/myself/myself",
- "name": "myself",
- "style": {
- "navigationBarTitleText": "",
- "navigationBarBackgroundColor": "#103289",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "pages/myself/childen/aboutUs",
- "name": "aboutUs",
- "style": {
- "navigationBarTitleText": "关于我们",
- "navigationBarBackgroundColor": "#103289",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "pages/myself/childen/shezhi",
- "name": "shezhi",
- "style": {
- "navigationBarTitleText": "系统设置",
- "navigationBarBackgroundColor": "#103289",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "pages/myself/childen/yijian",
- "name": "yijian",
- "style": {
- "navigationBarTitleText": "意见反馈",
- "navigationBarBackgroundColor": "#F56968"
- }
- },
- {
- "path": "pages/myself/childen/genxin",
- "name": "genxin",
- "style": {
- "navigationBarTitleText": "隐私政策",
- "navigationBarBackgroundColor": "#103289",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "pages/business/business",
- "style": {
- "navigationBarTitleText": "工作台",
- "enablePullDownRefresh": false,
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/myself/childen/xinxi",
- "name": "xinxi",
- "style": {
- "navigationBarTitleText": "账户信息",
- "navigationBarBackgroundColor": "#F56968"
- }
- },
- {
- "path": "pages/myself/childen/info/nickName",
- "name": "nickName",
- "style": {
- "navigationBarTitleText": "修改昵称",
- "navigationBarBackgroundColor": "#F56968"
- }
- },
- {
- "path": "pages/myself/childen/info/phone",
- "name": "phone",
- "style": {
- "navigationBarTitleText": "修改电话",
- "navigationBarBackgroundColor": "#F56968"
- }
- },
- {
- "path": "pages/myself/childen/info/email",
- "name": "email",
- "style": {
- "navigationBarTitleText": "修改邮箱",
- "navigationBarBackgroundColor": "#F56968"
- }
- },
- {
- "path": "pages/myself/childen/info/birthday",
- "name": "birthday",
- "style": {
- "navigationBarTitleText": "修改生日",
- "navigationBarBackgroundColor": "#F56968"
- }
- },
- {
- "path": "pages/reported/reported",
- "name": "reported",
- "style": {
- "navigationBarTitleText": "我要报",
- "app-plus": {
- "titleNView": false
- }
- }
- },
- {
- "path": "pages/groupChat/groupChat",
- "name": "groupChat",
- "style": {
- "navigationBarTitleText": "我要说",
- "navigationBarBackgroundColor": "#103289",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "components/submit/submit",
- "style": {}
- },
- {
- "path": "pages/groupChat/chating",
- "name": "chating",
- "style": {
- "navigationBarTitleText": "聊天室2",
- "navigationStyle": "custom",
- "app-plus": {
- "titleNView": false
- }
- }
- },
- {
- "path": "pages/groupChat/chatingQZ",
- "name": "chatingQZ",
- "style": {
- "navigationBarTitleText": "聊天室2",
- "navigationStyle": "custom",
- "app-plus": {
- "titleNView": false
- }
- }
- },
- {
- "path": "pages/infoRegistration/infoRegistration",
- "name": "infoRegistration",
- "style": {
- "navigationBarTitleText": "信息登记"
- }
- },
- {
- "path": "pages/infoRegistration/infoCheck",
- "name": "infoCheck",
- "style": {
- "navigationBarTitleText": "信息核实"
- }
- },
- {
- "path": "pages/visitRecord/visitRecord",
- "name": "visitRecord",
- "style": {
- "navigationBarTitleText": "拜访记录"
- }
- },
- {
- "path": "pages/riskReporting/riskReporting",
- "name": "riskReporting",
- "style": {
- "navigationBarTitleText": "风险上报"
- }
- },
- {
- "path": "pages/equipment/equipment",
- "name": "equipment",
- "style": {
- "navigationBarTitleText": "设备安装"
- }
- },
- {
- "path": "pages/article/article",
- "style": {
- "navigationBarTitleText": "资讯",
- "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
+ "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"
+ }
+ },
+ {
+ "path": "pages/myself/myself",
+ "name": "myself",
+ "style": {
+ "navigationBarTitleText": "",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/myself/childen/aboutUs",
+ "name": "aboutUs",
+ "style": {
+ "navigationBarTitleText": "关于我们",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/myself/childen/shezhi",
+ "name": "shezhi",
+ "style": {
+ "navigationBarTitleText": "系统设置",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/myself/childen/yijian",
+ "name": "yijian",
+ "style": {
+ "navigationBarTitleText": "意见反馈",
+ "navigationBarBackgroundColor": "#F56968"
+ }
+ },
+ {
+ "path": "pages/myself/childen/genxin",
+ "name": "genxin",
+ "style": {
+ "navigationBarTitleText": "隐私政策",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/business/business",
+ "style": {
+ "navigationBarTitleText": "工作台",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/myself/childen/xinxi",
+ "name": "xinxi",
+ "style": {
+ "navigationBarTitleText": "账户信息",
+ "navigationBarBackgroundColor": "#F56968"
+ }
+ },
+ {
+ "path": "pages/myself/childen/info/nickName",
+ "name": "nickName",
+ "style": {
+ "navigationBarTitleText": "修改昵称",
+ "navigationBarBackgroundColor": "#F56968"
+ }
+ },
+ {
+ "path": "pages/myself/childen/info/phone",
+ "name": "phone",
+ "style": {
+ "navigationBarTitleText": "修改电话",
+ "navigationBarBackgroundColor": "#F56968"
+ }
+ },
+ {
+ "path": "pages/myself/childen/info/email",
+ "name": "email",
+ "style": {
+ "navigationBarTitleText": "修改邮箱",
+ "navigationBarBackgroundColor": "#F56968"
+ }
+ },
+ {
+ "path": "pages/myself/childen/info/birthday",
+ "name": "birthday",
+ "style": {
+ "navigationBarTitleText": "修改生日",
+ "navigationBarBackgroundColor": "#F56968"
+ }
+ },
+ {
+ "path": "pages/reported/reported",
+ "name": "reported",
+ "style": {
+ "navigationBarTitleText": "我要报",
+ "app-plus": {
+ "titleNView": false
+ }
+ }
+ },
+ {
+ "path": "pages/groupChat/groupChat",
+ "name": "groupChat",
+ "style": {
+ "navigationBarTitleText": "我要说",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "components/submit/submit",
+ "style": {}
+ },
+ {
+ "path": "pages/groupChat/chating",
+ "name": "chating",
+ "style": {
+ "navigationBarTitleText": "聊天室2",
+ "navigationStyle": "custom",
+ "app-plus": {
+ "titleNView": false
+ }
+ }
+ },
+ {
+ "path": "pages/groupChat/chatingQZ",
+ "name": "chatingQZ",
+ "style": {
+ "navigationBarTitleText": "聊天室2",
+ "navigationStyle": "custom",
+ "app-plus": {
+ "titleNView": false
+ }
+ }
+ },
+ {
+ "path": "pages/infoRegistration/infoRegistration",
+ "name": "infoRegistration",
+ "style": {
+ "navigationBarTitleText": "信息登记"
+ }
+ },
+ {
+ "path": "pages/infoRegistration/infoCheck",
+ "name": "infoCheck",
+ "style": {
+ "navigationBarTitleText": "信息核实"
+ }
+ },
+ {
+ "path": "pages/visitRecord/visitRecord",
+ "name": "visitRecord",
+ "style": {
+ "navigationBarTitleText": "拜访记录"
+ }
+ },
+ {
+ "path": "pages/riskReporting/riskReporting",
+ "name": "riskReporting",
+ "style": {
+ "navigationBarTitleText": "风险上报"
+ }
+ },
+ {
+ "path": "pages/equipment/equipment",
+ "name": "equipment",
+ "style": {
+ "navigationBarTitleText": "设备安装"
+ }
+ },
+ {
+ "path": "pages/article/article",
+ "style": {
+ "navigationBarTitleText": "资讯",
+ "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": "详情",
- "navigationBarBackgroundColor": "#103289",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "pages/patrol/patrol",
- "name": "equipment",
- "style": {
- "navigationBarTitleText": "巡逻任务",
- "navigationBarBackgroundColor": "#103289",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "pages/investigation/investigation",
- "name": "investigation",
- "style": {
- "navigationBarTitleText": "地图",
- "navigationBarBackgroundColor": "#103289",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "pages/workbench/workbench",
- "name": "workbench",
- "style": {
- "navigationBarTitleText": "我要巡",
- "app-plus": {
- "titleNView": false
- }
- }
- },
- {
- "path": "pages/handle/handle",
- "style": {
- "navigationBarTitleText": "我要办",
- "navigationBarBackgroundColor": "#103289",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "pages/alarm_list/alarm_list",
- "name": "alarm_list",
- "style": {
- "navigationBarTitleText": "我要查",
- "navigationBarBackgroundColor": "#103289",
- "navigationBarTextStyle": "white"
- }
- },
- // {
- // "path": "pages/grabOrders/grabOrders备份/grabOrders",
- // "name": "grabOrders",
- // "style": {
- // "navigationBarTitleText": "我参与",
- // "navigationBarBackgroundColor": "#103289",
- // "navigationBarTextStyle": "white"
- // }
- // },
- { //治安巡查
- "path": "pages/grabOrders/grabOrdersZAXC/grabOrders",
- "name": "grabOrdersZAXC",
- "style": {
- "navigationBarTitleText": "治安巡查",
- "navigationBarBackgroundColor": "#103289",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "pages/grabOrders/grabOrdersZAXC/map",
- "name": "map",
- "style": {
- "navigationBarTitleText": "任务详情",
- "navigationBarBackgroundColor": "#103289",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "pages/grabOrders/grabOrdersZAXC/task",
- "name": "task",
- "style": {
- "navigationBarTitleText": "任务详情",
- "navigationBarBackgroundColor": "#103289",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "pages/grabOrders/grabOrdersZAXC/feedback",
- "name": "feedback",
- "style": {
- "navigationBarTitleText": "任务反馈",
- "navigationBarBackgroundColor": "#103289",
- "navigationBarTextStyle": "white"
- }
- },
- { //治安义务宣传
- "path": "pages/grabOrders/grabOrdersZAYWXC/grabOrders",
- "name": "grabOrdersZAYWXC",
- "style": {
- "navigationBarTitleText": "治安义务宣传",
- "navigationBarBackgroundColor": "#103289",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "pages/grabOrders/grabOrdersZAYWXC/map",
- "name": "map",
- "style": {
- "navigationBarTitleText": "任务详情",
- "navigationBarBackgroundColor": "#103289",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "pages/grabOrders/grabOrdersZAYWXC/task",
- "name": "task",
- "style": {
- "navigationBarTitleText": "任务详情",
- "navigationBarBackgroundColor": "#103289",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "pages/grabOrders/grabOrdersZAYWXC/feedback",
- "name": "feedback",
- "style": {
- "navigationBarTitleText": "任务反馈",
- "navigationBarBackgroundColor": "#103289",
- "navigationBarTextStyle": "white"
- }
- },
- { //治安防范培训
- "path": "pages/grabOrders/grabOrdersZAFFPX/grabOrders",
- "name": "grabOrdersZAFFPX",
- "style": {
- "navigationBarTitleText": "治安防范培训",
- "navigationBarBackgroundColor": "#103289",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "pages/grabOrders/grabOrdersZAFFPX/map",
- "name": "map",
- "style": {
- "navigationBarTitleText": "任务详情",
- "navigationBarBackgroundColor": "#103289",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "pages/grabOrders/grabOrdersZAFFPX/task",
- "name": "task",
- "style": {
- "navigationBarTitleText": "任务详情",
- "navigationBarBackgroundColor": "#103289",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "pages/grabOrders/grabOrdersZAFFPX/feedback",
- "name": "feedback",
- "style": {
- "navigationBarTitleText": "任务反馈",
- "navigationBarBackgroundColor": "#103289",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "pages/issue/issue",
- "name": "issue",
- "style": {
- "navigationBarTitleText": "发布",
- "navigationBarBackgroundColor": "#103289",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "pages/index/index",
- "name": "index",
- "style": {
- "navigationBarTitleText": "首页"
- }
- },
- {
- "path": "pages/map/map",
- "name": "map",
- "style": {
- "navigationBarTitleText": "群防任务",
- "navigationBarBackgroundColor": "#103289",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "pages/currentMap/currentMap",
- "name": "currentMap",
- "style": {
- "navigationBarTitleText": "获取辖区",
- "navigationBarBackgroundColor": "#103289",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "pages/clockSignIn/clockSignIn",
- "name": "clockSignIn",
- "style": {
- "navigationBarTitleText": "打卡签到",
- "navigationBarBackgroundColor": "#25262E",
- "app-plus": {
- "titleNView": false
- }
- }
- },
- {
- "path": "pages/poput/workbench/policeDetails/policeDetails",
- "name": "policeDetails",
- "style": {
- "navigationBarTitleText": "警情详情提交信息页面"
- }
- },
- {
- "path": "pages/poput/mapJQtijiao/mapJQtijiao/mapJQtijiao",
- "name": "mapJQtijiao",
- "style": {
- "navigationBarTitleText": "处理结果",
- "navigationBarBackgroundColor": "#103289",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "pages/poput/alarmOver/alarmOver",
- "name": "alarmOver",
- "style": {
- "navigationBarTitleText": "任务详情",
- "navigationBarBackgroundColor": "#103289",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "pages/error-page/403",
- "style": {
- "navigationBarTitleText": "403"
- }
- },
- {
- "path": "pages/error-page/404",
- "style": {
- "navigationBarTitleText": "404"
- }
- },
- {
- "path": "pages/error-page/500",
- "style": {
- "navigationBarTitleText": "500"
- }
- }, {
- "path": "pages/alarm_list/integral/integral",
- "style": {
- "navigationBarTitleText": "查积分",
- "navigationBarBackgroundColor": "#103289",
- "navigationBarTextStyle": "white"
- }
+ }
+ }, {
+ "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": "详情",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/patrol/patrol",
+ "name": "equipment",
+ "style": {
+ "navigationBarTitleText": "巡逻任务",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/investigation/investigation",
+ "name": "investigation",
+ "style": {
+ "navigationBarTitleText": "地图",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/workbench/workbench",
+ "name": "workbench",
+ "style": {
+ "navigationBarTitleText": "我要巡",
+ "app-plus": {
+ "titleNView": false
+ }
+ }
+ },
+ {
+ "path": "pages/handle/handle",
+ "style": {
+ "navigationBarTitleText": "我要办",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/alarm_list/alarm_list",
+ "name": "alarm_list",
+ "style": {
+ "navigationBarTitleText": "我要查",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ // {
+ // "path": "pages/grabOrders/grabOrders备份/grabOrders",
+ // "name": "grabOrders",
+ // "style": {
+ // "navigationBarTitleText": "我参与",
+ // "navigationBarBackgroundColor": "#103289",
+ // "navigationBarTextStyle": "white"
+ // }
+ // },
+ {
+ "path": "pages/grabOrders/grabOrdersMain/business",
+ "name": "grabOrders",
+ "style": {
+ "navigationBarTitleText": "我参与",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white",
+ "navigationStyle": "custom"
+ }
+ },
+ { //治安巡查
+ "path": "pages/grabOrders/grabOrdersZAXC/grabOrders",
+ "name": "grabOrdersZAXC",
+ "style": {
+ "navigationBarTitleText": "治安巡查",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/grabOrders/grabOrdersZAXC/map",
+ "name": "map",
+ "style": {
+ "navigationBarTitleText": "巡查详情",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/grabOrders/grabOrdersZAXC/task",
+ "name": "task",
+ "style": {
+ "navigationBarTitleText": "任务详情",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/grabOrders/grabOrdersZAXC/feedback",
+ "name": "feedback",
+ "style": {
+ "navigationBarTitleText": "巡查反馈",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ { //治安义务宣传
+ "path": "pages/grabOrders/grabOrdersZAYWXC/grabOrders",
+ "name": "grabOrdersZAYWXC",
+ "style": {
+ "navigationBarTitleText": "治安义务宣传",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/grabOrders/grabOrdersZAYWXC/map",
+ "name": "map",
+ "style": {
+ "navigationBarTitleText": "宣传详情",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/grabOrders/grabOrdersZAYWXC/task",
+ "name": "task",
+ "style": {
+ "navigationBarTitleText": "任务详情",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/grabOrders/grabOrdersZAYWXC/feedback",
+ "name": "feedback",
+ "style": {
+ "navigationBarTitleText": "宣传反馈",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ { //治安防范培训
+ "path": "pages/grabOrders/grabOrdersZAFFPX/grabOrders",
+ "name": "grabOrdersZAFFPX",
+ "style": {
+ "navigationBarTitleText": "治安防范培训",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/grabOrders/grabOrdersZAFFPX/map",
+ "name": "map",
+ "style": {
+ "navigationBarTitleText": "培训详情",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/grabOrders/grabOrdersZAFFPX/task",
+ "name": "task",
+ "style": {
+ "navigationBarTitleText": "任务详情",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/grabOrders/grabOrdersZAFFPX/feedback",
+ "name": "feedback",
+ "style": {
+ "navigationBarTitleText": "培训反馈",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/issue/issue",
+ "name": "issue",
+ "style": {
+ "navigationBarTitleText": "发布",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/index/index",
+ "name": "index",
+ "style": {
+ "navigationBarTitleText": "首页"
+ }
+ },
+ {
+ "path": "pages/map/map",
+ "name": "map",
+ "style": {
+ "navigationBarTitleText": "群防任务",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/currentMap/currentMap",
+ "name": "currentMap",
+ "style": {
+ "navigationBarTitleText": "获取辖区",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/clockSignIn/clockSignIn",
+ "name": "clockSignIn",
+ "style": {
+ "navigationBarTitleText": "打卡签到",
+ "navigationBarBackgroundColor": "#25262E",
+ "app-plus": {
+ "titleNView": false
+ }
+ }
+ },
+ {
+ "path": "pages/poput/workbench/policeDetails/policeDetails",
+ "name": "policeDetails",
+ "style": {
+ "navigationBarTitleText": "警情详情提交信息页面"
+ }
+ },
+ {
+ "path": "pages/poput/mapJQtijiao/mapJQtijiao/mapJQtijiao",
+ "name": "mapJQtijiao",
+ "style": {
+ "navigationBarTitleText": "处理结果",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/poput/alarmOver/alarmOver",
+ "name": "alarmOver",
+ "style": {
+ "navigationBarTitleText": "任务详情",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/error-page/403",
+ "style": {
+ "navigationBarTitleText": "403"
+ }
+ },
+ {
+ "path": "pages/error-page/404",
+ "style": {
+ "navigationBarTitleText": "404"
+ }
+ },
+ {
+ "path": "pages/error-page/500",
+ "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/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",
+ "style": {
+ "navigationBarTitleText": "行业政策",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
- }, {
- "path": "pages/alarm_list/industry/industry_detail",
- "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/vote",
+ "style": {
+ "navigationBarTitleText": "参与投票",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
- }, {
- "path": "pages/voting/voteManage",
- "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/voteDetail",
+ "style": {
+ "navigationBarTitleText": "投票详情",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
- }, {
- "path": "pages/voting/votRanking",
- "style": {
- "navigationBarTitleText": "投票排名",
- "navigationBarBackgroundColor": "#103289",
- "navigationBarTextStyle": "white"
- }
+ }, {
+ "path": "pages/voting/votRanking",
+ "style": {
+ "navigationBarTitleText": "投票排名",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
- }, {
- "path": "pages/registerUser/agreement",
- "style": {
- "navigationBarTitleText": "",
- "navigationBarBackgroundColor": "#103289",
- "navigationBarTextStyle": "white"
- }
+ }, {
+ "path": "pages/registerUser/agreement",
+ "style": {
+ "navigationBarTitleText": "",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
- },
- {
- "path": "pages/voting/information",
- "style": {
- "navigationBarTitleText": "电子证件",
- "navigationBarBackgroundColor": "#103289",
- "navigationBarTextStyle": "white"
- }
+ },
+ {
+ "path": "pages/voting/information",
+ "style": {
+ "navigationBarTitleText": "电子证件",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
- }, {
- "path": "pages/exam/startexam",
- "name": "startexam",
- "style": {
- "navigationBarTitleText": "开始考试",
- "navigationBarBackgroundColor": "#103289",
- "navigationBarTextStyle": "white"
- }
- }, {
- "path": "pages/exam/examTextPage",
- "name": "examTextPage",
- "style": {
- "navigationStyle": "custom",
- "navigationBarTitleText": "",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/exam/examReviewPage",
- "name": "examReviewPage",
- "style": {
- "navigationStyle": "custom",
- "navigationBarTitleText": "",
- "enablePullDownRefresh": false
- }
+ }, {
+ "path": "pages/exam/startexam",
+ "name": "startexam",
+ "style": {
+ "navigationBarTitleText": "开始考试",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+ }, {
+ "path": "pages/exam/examTextPage",
+ "name": "examTextPage",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/exam/examReviewPage",
+ "name": "examReviewPage",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
- }
- ],
- "globalStyle": { //将组件安装在项目的components目录下，并符合components/组件名称/组件名称.vue目录结构。可以不用引用、注册，直接在页面中使用。
- "autoscan": true
- },
- "tabBar": {
- "color": "#7a7e83",
- "selectedColor": "#0faeff",
- "backgroundColor": "#ffffff",
- "list": [{
- "pagePath": "pages/home/home",
- "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",
- "text": "工作台",
- "iconPath": "static/tabbar/workbench.png",
- "selectedIconPath": "static/tabbar/workbenchH.png"
- },
- {
- "pagePath": "pages/myself/myself",
- "text": "我的",
- "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"
- }
- }
-}
\ No newline at end of file
+ }
+ ],
+ "globalStyle": { //将组件安装在项目的components目录下，并符合components/组件名称/组件名称.vue目录结构。可以不用引用、注册，直接在页面中使用。
+ "autoscan": true
+ },
+ "tabBar": {
+ "color": "#7a7e83",
+ "selectedColor": "#0faeff",
+ "backgroundColor": "#ffffff",
+ "list": [{
+ "pagePath": "pages/home/home",
+ "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",
+ "text": "工作台",
+ "iconPath": "static/tabbar/workbench.png",
+ "selectedIconPath": "static/tabbar/workbenchH.png"
+ },
+ {
+ "pagePath": "pages/myself/myself",
+ "text": "我的",
+ "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"
+ }
+ }
+}
diff --git a/pages/grabOrders/grabOrdersMain/business.vue b/pages/grabOrders/grabOrdersMain/business.vue
new file mode 100644
index 0000000..548c07b
--- /dev/null
+++ b/pages/grabOrders/grabOrdersMain/business.vue
@@ -0,0 +1,284 @@
+<template>
+ <view class="container">
+ <view class="head">
+ <u-navbar :is-fixed="false" :border-bottom="false" :is-back="true" back-icon-name="arrow-leftward"
+ back-icon-color="#fff" back-icon-size="35" :background="{ background: '#103289' }" title="我参与"
+ title-color="#fff"></u-navbar>
+ <view class="head-bg"></view>
+ <!-- 我的订阅 start -->
+ <view class="card sub">
+ <view class="title">常用工具</view>
+ <view class="list">
+ <u-grid :col="4" :border="false">
+ <u-grid-item bg-color="transparent" v-for="(item, index) in dataOne" :key="index">
+ <navigator hover-class="none" class="nav-item" @click="goOnePage(item.url,index)">
+ <image :src="item.img" mode="widthFix" class="nav-item-img"></image>
+ <view class="nav-item-name">{{item.title}}</view>
+ </navigator>
+ </u-grid-item>
+ </u-grid>
+ </view>
+ </view>
+ <!-- 我的订阅 end -->
+
+ <view class="card wrap">
+ <view class="title">保安管理</view>
+ <view class="list">
+ <u-grid :col="4" :border="false">
+ <u-grid-item bg-color="transparent" v-for="(item, index) in dataTwo" :key="index">
+ <navigator hover-class="none" url="" class="nav-item" @click="goTwoPage(item.url,index)">
+ <image :src="item.img" mode="widthFix" class="nav-item-img"></image>
+ <view class="nav-item-name">{{item.title}}</view>
+ </navigator>
+ </u-grid-item>
+ </u-grid>
+ </view>
+ </view>
+
+ </view>
+ <u-toast ref="uToast" />
+ <!-- 底部导航条 -->
+ <!-- <u-tabbar :list="tabbar" :mid-button="false"></u-tabbar> -->
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+ tabbar: this.$store.state.tabbar,
+ dataOne: [{
+ title: '治安巡查',
+ img: '/static/workbench/task1.png',
+ url: ''
+ }, {
+ title: '治安义务宣传',
+ img: '/static/workbench/task2.png',
+ url: '/pages/patrol/patrol'
+ }, {
+ title: '治安防范培训',
+ img: '/static/workbench/task3.png',
+ url: '/pages/reported/reported'
+ }, {
+ title: '保安管理',
+ img: '/static/workbench/task8.png',
+ url: ''
+ }],
+ dataTwo: [{
+ title: '电子证件',
+ img: '/static/workbench/task9.png',
+ url: ''
+ },{
+ title: '模拟考试',
+ img: '/static/workbench/task5.png',
+ url: '/pages/voting/voteManage'
+ }
+ // ,{
+ // title:'模拟考试',
+ // img:'../../static/workbench/exam.png',
+ // url:'/pages/exam/startexam'
+ // }
+ ]
+ };
+ },
+ onLoad() {
+
+ },
+ mounted() {
+ if (this.$store.state.UserData.stype != "1") {
+ this.$refs.uToast.show({
+ title: '功能暂未开放',
+ type: 'warning',
+ });
+ }
+ },
+ methods: {
+ //页面跳转
+ goOnePage(url, index) {
+ if (this.$store.state.UserData.stype != "1") {
+ this.$refs.uToast.show({
+ title: '功能暂未开放',
+ type: 'warning',
+ });
+ return;
+ } else if (index == "0" || index == "3" || index == "4") {
+ this.$refs.uToast.show({
+ title: '功能研发中',
+ type: 'warning',
+ });
+ return;
+ } else if (index == 5) {
+ this.getUser();
+ } else {
+ uni.navigateTo({
+ url: url
+ })
+ }
+ },
+ //获取用户信息
+ getUser() {
+ var that = this;
+ debugger
+ uni.request({
+ url: that.$store.state.BaopiAPI + '/blade-user/detail',
+ method: 'GET',
+ data: {
+ cardid: that.$store.state.UserData.cardid,
+ isDeleted:0,
+ status : 1,
+ },
+ success: (res) => {
+ if(res.statusCode == "200"){
+ var urls="http://223.82.109.183:2080/securityInfo.html?securityNumber="+res.data.data.securitynumber;
+ uni.navigateTo({
+ url: '../voting/information?url=' + urls
+ });
+ }else{
+ this.$refs.uToast.show({
+ title: '暂无证件信息',
+ type: 'warning',
+ });
+ }
+ }
+ });
+ },
+ goTwoPage(url, index) {
+ if (this.$store.state.UserData.stype != "1") {
+ this.$refs.uToast.show({
+ title: '功能暂未开放',
+ type: 'warning',
+ });
+ return;
+ } else if (index == "2") {
+ this.$refs.uToast.show({
+ title: '功能研发中',
+ type: 'warning',
+ });
+ return;
+ } else {
+ uni.navigateTo({
+ url: url
+ })
+ }
+ },
+ }
+ };
+</script>
+
+<style lang="scss">
+ .container {
+ background-color: #f7f7f7;
+ min-height: 100vh;
+ overflow: hidden;
+ }
+
+ .head {
+ position: relative;
+ top: 0;
+ left: 0;
+ z-index: 1;
+ }
+
+ .head-bg {
+ position: absolute;
+ left: 0px;
+ top: 0px;
+ z-index: -1;
+ width: 750rpx;
+ height: 270rpx;
+ background: #103289;
+ }
+
+ .card {
+ margin: 30rpx;
+ background: #ffffff;
+ border-radius: 20rpx;
+ margin-top: 36rpx;
+ }
+
+ .sub {
+ .title {
+ padding-top: 36rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+
+ font-size: 30rpx;
+ font-family: Source Han Sans CN;
+ font-weight: 500;
+ color: #000000;
+
+ &::before {
+ content: '';
+ display: block;
+ width: 135rpx;
+ height: 1rpx;
+ background: #e4e7ed;
+ margin: 0 17rpx;
+ }
+
+ &::after {
+ content: '';
+ display: block;
+ width: 135rpx;
+ height: 1rpx;
+ background: #e4e7ed;
+ margin: 0 17rpx;
+ }
+ }
+ }
+
+ .list {
+ display: flex;
+ flex-wrap: wrap;
+ padding: 0 0 30rpx;
+
+ .nav-item {
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ align-items: center;
+ font-size: 30rpx;
+ font-family: Source Han Sans CN;
+ font-weight: 400;
+ color: #131313;
+ line-height: 48rpx;
+
+ &-img {
+ width: 64rpx;
+ height: 64rpx;
+ margin-bottom: 20rpx;
+ }
+
+ &-name {
+ font-size: 26rpx;
+ font-family: PingFang SC;
+ font-weight: 400;
+ color: #585b61;
+ opacity: 0.77;
+ }
+ }
+ }
+
+ .wrap {
+ .title {
+ padding: 36rpx 16rpx;
+ display: flex;
+ align-items: center;
+ font-size: 32rpx;
+ font-family: Source Han Sans CN;
+ font-weight: 500;
+ color: #000000;
+
+ &::before {
+ content: "";
+ display: block;
+ width: 5rpx;
+ height: 36rpx;
+ margin-right: 10rpx;
+ background: #103289;
+ }
+ }
+ }
+</style>
diff --git a/pages/grabOrders/grabOrdersZAFFPX/inPage/page0.vue b/pages/grabOrders/grabOrdersZAFFPX/inPage/page0.vue
index 597afcc..aee0871 100644
--- a/pages/grabOrders/grabOrdersZAFFPX/inPage/page0.vue
+++ b/pages/grabOrders/grabOrdersZAFFPX/inPage/page0.vue
@@ -9,24 +9,31 @@
<view class="o-l-m-up">
{{item.rname}}
</view>
- <view class="o-l-m-center">
- <u-icon name="order" color="#d0d0d0" size="28"></u-icon>
- 人数：{{item.num}}/ {{item.jnum}}
- </view>
+ <!-- <view class="o-l-m-center">
+ <u-icon name="account" color="#d0d0d0" size="28"></u-icon>
+ 培训讲师：<span>{{item.fname}}</span>
+ </view> -->
<view class="o-l-m-center">
<u-icon name="volume" color="#d0d0d0" size="28"></u-icon>
- 时间：{{item.time.slice(0,10)}}
+ 培训开始时间：
+ </view>
+ <view class="o-l-m-center" style="padding-left: 13px;">
+ <!-- <u-icon name="volume" color="#d0d0d0" size="28"></u-icon> -->
+ <!-- 时间： -->
+ {{item.time}}
</view>
</view>
</view>
<view class="onve-right">
<u-button :class="[item.type == 1?'':item.type == 0?'blues':'greens']" size="mini" :disabled="true"
v-if="item.iscation == 0" @click="getOrders(swiperCurrent,item)">
- <span class="Cation notCation">队员</span>{{item.type == 1?"完成反馈":item.type == 0?"正在进行":"还未开始"}}
+ <!-- <span class="Cation notCation">队员</span> -->
+ {{item.type == 1?"完成反馈":item.type == 0?"正在进行":"还未开始"}}
</u-button>
<u-button :class="[item.type == 1?'':item.type == 0?'blues':'greens']" size="mini"
:disabled="item.type == 1" v-if="item.iscation == 1" @click="getOrders(swiperCurrent,item)">
- <span class="Cation">队长</span>{{item.type == 1?"完成反馈":item.type == 0?"上传反馈":"开始任务"}}
+ <!-- <span class="Cation">队长</span> -->
+ {{item.type == 1?"完成反馈":item.type == 0?"上传反馈":"开始任务"}}
</u-button>
<view class="o-r-$">
积分：{{item.integral}}
@@ -140,6 +147,16 @@
}
}
+ .o-l-m-center span {
+ display: inline-block;
+ padding: 0px 5px 1px;
+ margin: 0 5px;
+ background-color: #ECF5FF;
+ border: 0.5px solid #e4f1ff;
+ color: #429FFF;
+ border-radius: 8px;
+ }
+
// .onceUp {
// width: 100%;
// height: 25%;
diff --git a/pages/grabOrders/grabOrdersZAFFPX/map.vue b/pages/grabOrders/grabOrdersZAFFPX/map.vue
index 4a84607..396ed1b 100644
--- a/pages/grabOrders/grabOrdersZAFFPX/map.vue
+++ b/pages/grabOrders/grabOrdersZAFFPX/map.vue
@@ -20,7 +20,7 @@
</view> -->
<view class="once">
<span class="once-left">
- 任务标题
+ 培训标题
</span>
<span class="once-right">
{{ourData.rname}}
@@ -28,7 +28,7 @@
</view>
<view class="once">
<span class="once-left">
- 任务内容
+ 培训内容
</span>
<span class="once-right">
{{ourData.content}}
@@ -36,7 +36,7 @@
</view>
<view class="once">
<span class="once-left">
- 发布者
+ 培训讲师
</span>
<span class="once-right">
<span>{{ourData.fname}}</span>
@@ -44,7 +44,7 @@
</view>
<view class="once">
<span class="once-left">
- 任务地区
+ 培训地点
</span>
<span class="once-right">
{{ourData.province}} - {{ourData.city}} - {{ourData.district}}
@@ -60,10 +60,10 @@
</view>
<view class="once">
<span class="once-left">
- 人数
+ 参培队伍
</span>
<span class="once-right">
- {{ourData.num}} / {{ourData.jnum}}
+ 保安员队伍
</span>
</view>
<!-- <view class="once">
@@ -85,13 +85,16 @@
<view class="once-c" v-if="ourData.buttype == 0">
<u-button :type="ourData.butCT == 'beginUp'?'primary':ourData.butCT == 'begin'?'success':'info'"
@click="openAPP(ourData.buttype)" :disabled="ourData.butCT== 'over' || ourData.iscation == '0'">
- {{ourData.butCT == 'beginUp'?(ourData.iscation == '0'?'正在进行':'上传反馈'):ourData.butCT == 'begin'?(ourData.iscation == '0'?'还未开始':'开始任务'):'任务完成'}}
+ {{ourData.butCT == 'beginUp'?(ourData.iscation == '0'?'正在培训':'上传反馈'):ourData.butCT == 'begin'?(ourData.iscation == '0'?'还未开始':'开始培训'):'培训结束'}}
</u-button>
</view>
<view class="once-c" v-if="ourData.buttype == 1">
- <u-button :type="ourData.num==ourData.jnum?'info':'success'" @click="openAPP(ourData.buttype)"
+ <!-- <u-button :type="ourData.num==ourData.jnum?'info':'success'" @click="openAPP(ourData.buttype)"
:disabled="(ourData.num==ourData.jnum)&& ourData.buttype==1 ||ourData.type == 1">
{{ourData.num==ourData.jnum?"人数已满":'我参与'}}
+ </u-button> -->
+ <u-button type="success" @click="openAPP(ourData.buttype)">
+ 我参与
</u-button>
</view>
@@ -698,7 +701,7 @@
buttype: 0,
captain: "我",
city: "南昌市",
- content: "测试",
+ content: "测试培训内容",
district: "西湖区",
id: 37,
integral: "222",
@@ -710,13 +713,13 @@
province: "江西省",
publisher: "管理",
raddress: null,
- rname: "测试1",
+ rname: "测试培训",
rtype: "0",
serid: "1123598821738675201,",
team: "你,他,它",
time: "2022-02-18 14:15:52",
type: "2",
- fname: "管理者",
+ fname: "培训老师张",
myid: 111,
myName: 222,
url: "http://223.82.109.183:2081/zhba/upload/20220218/67f0c8bf3e7b5024c64133691f265072.ico",
diff --git a/pages/grabOrders/grabOrdersZAFFPX/once.vue b/pages/grabOrders/grabOrdersZAFFPX/once.vue
index d9fd418..c8808b2 100644
--- a/pages/grabOrders/grabOrdersZAFFPX/once.vue
+++ b/pages/grabOrders/grabOrdersZAFFPX/once.vue
Binary files differ
diff --git a/pages/grabOrders/grabOrdersZAXC/map.vue b/pages/grabOrders/grabOrdersZAXC/map.vue
index 1f705ad..cc38950 100644
--- a/pages/grabOrders/grabOrdersZAXC/map.vue
+++ b/pages/grabOrders/grabOrdersZAXC/map.vue
@@ -16,11 +16,11 @@
@touchmove="touchmove">
<view :class="['activeTip',activeTip?'isOpens':'notOpens'] " :style="{height:'30px'}"></view>
<view class="once-b">
- 任务详情
+ 巡查详情
</view>
<view class="once">
<span class="once-left">
- 任务标题
+ 巡查标题
</span>
<span class="once-right">
{{ourData.rname}}
@@ -28,7 +28,7 @@
</view>
<view class="once">
<span class="once-left">
- 任务内容
+ 巡查内容
</span>
<span class="once-right">
{{ourData.content}}
@@ -44,7 +44,7 @@
</view>
<view class="once">
<span class="once-left">
- 任务地区
+ 集合点
</span>
<span class="once-right">
{{ourData.province}} - {{ourData.city}} - {{ourData.district}}
diff --git a/pages/grabOrders/grabOrdersZAYWXC/inPage/page0.vue b/pages/grabOrders/grabOrdersZAYWXC/inPage/page0.vue
index 597afcc..ec9da04 100644
--- a/pages/grabOrders/grabOrdersZAYWXC/inPage/page0.vue
+++ b/pages/grabOrders/grabOrdersZAYWXC/inPage/page0.vue
@@ -22,11 +22,13 @@
<view class="onve-right">
<u-button :class="[item.type == 1?'':item.type == 0?'blues':'greens']" size="mini" :disabled="true"
v-if="item.iscation == 0" @click="getOrders(swiperCurrent,item)">
- <span class="Cation notCation">队员</span>{{item.type == 1?"完成反馈":item.type == 0?"正在进行":"还未开始"}}
+ <!-- <span class="Cation notCation">队员</span> -->
+ {{item.type == 1?"完成反馈":item.type == 0?"正在进行":"还未开始"}}
</u-button>
<u-button :class="[item.type == 1?'':item.type == 0?'blues':'greens']" size="mini"
:disabled="item.type == 1" v-if="item.iscation == 1" @click="getOrders(swiperCurrent,item)">
- <span class="Cation">队长</span>{{item.type == 1?"完成反馈":item.type == 0?"上传反馈":"开始任务"}}
+ <!-- <span class="Cation orange">队长</span> -->
+ {{item.type == 1?"完成反馈":item.type == 0?"上传反馈":"开始任务"}}
</u-button>
<view class="o-r-$">
积分：{{item.integral}}
@@ -199,6 +201,6 @@
}
.notCation {
- color: #18a655;
+ color: #18a655 !important;
}
</style>
diff --git a/pages/grabOrders/grabOrdersZAYWXC/map.vue b/pages/grabOrders/grabOrdersZAYWXC/map.vue
index 1f705ad..336de37 100644
--- a/pages/grabOrders/grabOrdersZAYWXC/map.vue
+++ b/pages/grabOrders/grabOrdersZAYWXC/map.vue
@@ -16,11 +16,11 @@
@touchmove="touchmove">
<view :class="['activeTip',activeTip?'isOpens':'notOpens'] " :style="{height:'30px'}"></view>
<view class="once-b">
- 任务详情
+ 宣传详情
</view>
<view class="once">
<span class="once-left">
- 任务标题
+ 宣传标题
</span>
<span class="once-right">
{{ourData.rname}}
@@ -28,7 +28,7 @@
</view>
<view class="once">
<span class="once-left">
- 任务内容
+ 宣传内容
</span>
<span class="once-right">
{{ourData.content}}
@@ -44,7 +44,7 @@
</view>
<view class="once">
<span class="once-left">
- 任务地区
+ 集合点
</span>
<span class="once-right">
{{ourData.province}} - {{ourData.city}} - {{ourData.district}}
@@ -85,7 +85,7 @@
<view class="once-c" v-if="ourData.buttype == 0">
<u-button :type="ourData.butCT == 'beginUp'?'primary':ourData.butCT == 'begin'?'success':'info'"
@click="openAPP(ourData.buttype)" :disabled="ourData.butCT== 'over' || ourData.iscation == '0'">
- {{ourData.butCT == 'beginUp'?(ourData.iscation == '0'?'正在进行':'上传反馈'):ourData.butCT == 'begin'?(ourData.iscation == '0'?'还未开始':'开始任务'):'任务完成'}}
+ {{ourData.butCT == 'beginUp'?(ourData.iscation == '0'?'正在进行':'上传反馈'):ourData.butCT == 'begin'?(ourData.iscation == '0'?'还未开始':'开始任务'):'宣传任务完成'}}
</u-button>
</view>
<view class="once-c" v-if="ourData.buttype == 1">
diff --git a/pages/home/home.vue b/pages/home/home.vue
index d003a0b..943a46f 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -82,7 +82,8 @@
</view>
</view> -->
<view class="notice-class">
- <u-notice-bar :speed="160" :duration="2000" :isCircular="true" :more-icon="true" mode="horizontal" type="none" :list="gdlist"></u-notice-bar>
+ <u-notice-bar :speed="160" :duration="2000" :isCircular="true" :more-icon="true" mode="horizontal"
+ type="none" :list="gdlist"></u-notice-bar>
</view>
<!-- 公告 end -->
@@ -97,8 +98,8 @@
</navigator>
<view class="news-list">
- <view hover-class="none" class="news-item" @click="goArticleDetail(item)"
- v-for="(item, index) in newsList" :key="index" >
+ <view hover-class="none" class="news-item" @click="goArticleDetail(item)"
+ v-for="(item, index) in newsList" :key="index">
<view class="left">
<view class="info">
{{item.title}}
@@ -137,7 +138,7 @@
status: 'loadmore',
list: 15,
page: 1,
- cout:1,
+ cout: 1,
pagesize: 2,
keyword: '',
focus: false,
@@ -146,7 +147,7 @@
newsList: [],
navButton: [],
serviceButton: [],
- tabbar:this.$store.state.tabbar,
+ tabbar: this.$store.state.tabbar,
gdlist: [
'国家发改委：防止和避免“放松防控”和“过度防控”'
]
@@ -190,9 +191,9 @@
},
methods: {
//点击更多跳转资讯页
- goArticle(){
+ goArticle() {
uni.switchTab({
- url:'../article/article'
+ url: '../article/article'
})
},
//去跳转详情页面
@@ -200,12 +201,12 @@
let detail = {
id: e.id
};
- if(e.articleType.indexOf("ksp") != -1){
+ if (e.articleType.indexOf("ksp") != -1) {
//去跳转
uni.navigateTo({
url: '../article/article_video?detailData=' + (JSON.stringify(e))
});
- }else{
+ } else {
//去跳转
uni.navigateTo({
url: '../article/article_detail?detailData=' + JSON.stringify(detail)
@@ -223,26 +224,21 @@
this.focus = false;
},
//页面跳转
- goBusinessPage(url,index){
- if(index==0){
- //我要看在tabbar
+ goBusinessPage(url, index) {
+ if (index == 0) {
+ //我要看在tabbar 我参与
uni.switchTab({
- url:url
+ url: url
})
- }else if(this.$store.state.UserData.stype != "1"){
+ } else if (this.$store.state.UserData.stype != "1") {
this.$refs.uToast.show({
title: '功能暂未开放',
type: 'warning',
})
return;
- }else if (index==4){
+ } else {
uni.navigateTo({
- url:'../grabOrders/grabOrdersZAXC/grabOrders?detailData=' + (JSON.stringify(this.cout))
- })
- }
- else{
- uni.navigateTo({
- url:url
+ url: url
})
}
},
@@ -257,7 +253,7 @@
jurisdiction: that.$store.state.UserData.jurisdiction
},
success: (res) => {
- this.cout=res.data.data
+ this.cout = res.data.data
}
});
},
@@ -285,7 +281,7 @@
//如果数量小于分页数量，则为最后一页
this.status = 'loading';
}
- res.data.data.records.forEach(item =>{
+ res.data.data.records.forEach(item => {
that.newsList.push(item);
})
}
@@ -425,8 +421,8 @@
}
}
}
-
- .notice-class{
+
+ .notice-class {
background: #ffffff;
border-radius: 15px 15px 15px 15px;
margin: 0 20rpx;
@@ -450,6 +446,7 @@
.notice-info {
flex: 1;
+
.notice-cell:first-of-type {
margin-bottom: 15rpx;
}
@@ -586,13 +583,13 @@
color: #a6abb5;
- .advisory-title-name{
+ .advisory-title-name {
font-size: 0.7rem;
letter-spacing: 1px;
flex: 1;
}
- .advisory-title-time{
+ .advisory-title-time {
margin-right: 0.1rem;
font-size: 0.7rem;
}
diff --git a/store/websocket.js b/store/websocket.js
index 3045f61..0be862c 100644
--- a/store/websocket.js
+++ b/store/websocket.js
@@ -83,6 +83,7 @@
let curRoute = routes[routes.length - 1].route; //获取当前页面的路由
// console.log(curRoute)
// return
+ // let
uni.request({
url: $store.state.piAPI + "taskqd/selectLi",
method: "POST",
@@ -106,7 +107,8 @@
});
console.log(val)
- if (types == "android", curRoute != "pages/grabOrders/map") {
+ // if (types == "android", curRoute != "pages/grabOrders/map") {
+ if (curRoute != "pages/grabOrders/map") {
uni.navigateTo({
url: "/pages/grabOrders/map?data=" + JSON.stringify(
val),
--
Gitblit v1.9.3