From 178be3f7a5c36338ee8f2587502fa9a9f059ea8c Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 25 Feb 2022 09:04:30 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/qfqk-android
---
pages/registerUser/idphoto.nvue | 3
pages/registerUser/registerUser.vue | 14
static/map/dingwei.png | 0
pages/grabOrders/map.vue | 390 +++++++++--
pages.json | 1205 ++++++++++++++++++------------------
pages/grabOrders/map/js/moveUniAppMap.js | 128 ++++
pages/business/business.vue | 146 ++-
pages/voting/information.vue | 19
pages/grabOrders/map/img/dingwei.png | 0
store/state.js | 6
10 files changed, 1,170 insertions(+), 741 deletions(-)
diff --git a/pages.json b/pages.json
index d4ad7ff..d72ce79 100644
--- a/pages.json
+++ b/pages.json
@@ -1,612 +1,621 @@
{
- "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",
- "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"
- }
- },
- {
- "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",
+ "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"
+ }
+ },
+ {
+ "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/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/voting/information",
+ "style": {
+ "navigationBarTitleText": "电子证件",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
- }
- ],
- "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"
- }
- }
-}
+ }, {
+ "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
diff --git a/pages/business/business.vue b/pages/business/business.vue
index f72f217..b04ee39 100644
--- a/pages/business/business.vue
+++ b/pages/business/business.vue
@@ -20,7 +20,7 @@
</view>
</view>
<!-- 我的订阅 end -->
-
+
<view class="card wrap">
<view class="title">管理</view>
<view class="list">
@@ -34,7 +34,7 @@
</u-grid>
</view>
</view>
-
+
</view>
<u-toast ref="uToast" />
<!-- 底部导航条 -->
@@ -46,99 +46,130 @@
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:''
- },{
- title:'通讯录',
- img:'../../static/workbench/task4.png',
- url:''
- },{
- title:'电子证件',
- img:'../../static/workbench/task9.png',
- url:''
+ 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: ''
+ }, {
+ title: '通讯录',
+ img: '../../static/workbench/task4.png',
+ url: ''
+ }, {
+ title: '电子证件',
+ img: '../../static/workbench/task9.png',
+ url: ''
+ }],
+ dataTwo: [{
+ title: '参与投票',
+ img: '../../static/workbench/task5.png',
+ url: '/pages/voting/voteManage'
+ }, {
+ title: '投票发起',
+ img: '../../static/workbench/task7.png',
+ url: '/pages/voting/vote'
+ }, {
+ title: '投票排行',
+ img: '../../static/workbench/task6.png',
+ url: '/pages/voting/votRanking'
}
- // ,{
+ // ,{
// title:'模拟考试',
// img:'../../static/workbench/exam.png',
// url:'/pages/exam/startexam'
// }
- ],
- dataTwo:[{
- title:'参与投票',
- img:'../../static/workbench/task5.png',
- url:'/pages/voting/voteManage'
- },{
- title:'投票发起',
- img:'../../static/workbench/task7.png',
- url:'/pages/voting/vote'
- },{
- title:'投票排行',
- img:'../../static/workbench/task6.png',
- url:'/pages/voting/votRanking'
- }]
+ ]
};
},
onLoad() {
-
- },mounted(){
- if(this.$store.state.UserData.stype != "1"){
+
+ },
+ mounted() {
+ if (this.$store.state.UserData.stype != "1") {
this.$refs.uToast.show({
title: '功能暂未开放',
type: 'warning',
});
}
- },methods: {
+ },
+ methods: {
//页面跳转
- goOnePage(url,index){
- if(this.$store.state.UserData.stype != "1"){
+ 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" || index == "5"){
+ } else if (index == "0" || index == "3" || index == "4") {
this.$refs.uToast.show({
title: '功能研发中',
type: 'warning',
});
return;
- }else{
+ } else if (index == 5) {
+ this.getUser();
+ } else {
uni.navigateTo({
- url:url
+ url: url
})
}
},
- goTwoPage(url,index){
- if(this.$store.state.UserData.stype != "1"){
+ //获取用户信息
+ 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" ){
+ } else if (index == "2") {
this.$refs.uToast.show({
title: '功能研发中',
type: 'warning',
});
return;
- }else{
+ } else {
uni.navigateTo({
- url:url
+ url: url
})
}
},
@@ -253,8 +284,7 @@
color: #000000;
&::before {
- content
- : "";
+ content: "";
display: block;
width: 5rpx;
height: 36rpx;
diff --git a/pages/grabOrders/map.vue b/pages/grabOrders/map.vue
index 8dc5174..7a6bf0f 100644
--- a/pages/grabOrders/map.vue
+++ b/pages/grabOrders/map.vue
@@ -4,9 +4,17 @@
<!-- <u-button type="info" @click="acc">测试</u-button> -->
<!-- <web-view :src="urls" @message="message"></web-view> -->
<map :scale='18' id="myMap" style="width: 100%" :style="{height: mapHeight + 'px'}" :markers="markersCom"
- :longitude="longitude" :latitude="latitude" :circles="circlesCom" :polyline="mypolylinesCom"
- show-location="true"></map>
- <view id="Umain">
+ :longitude="longitude" :latitude="latitude" :circles="circlesCom" :polyline="mypolylines"
+ show-location="true">
+ <cover-view class="dingwBut" @click="mapControlsBack">
+ <cover-image src="./map/img/dingwei.png" @click="mapControlsBack">
+ </cover-image>
+ </cover-view>
+
+ </map>
+ <view id="Umain" :style="{ height: activeHeight}" @touchstart="touchstart" @touchend="touchend"
+ @touchmove="touchmove">
+ <view :class="['activeTip',activeTip?'isOpens':'notOpens'] " :style="{height:'30px'}"></view>
<view class="once-b">
任务详情
</view>
@@ -86,21 +94,22 @@
{{ourData.num==ourData.jnum?"人数已满":'我参与'}}
</u-button>
</view>
- <u-popup v-model="showIn" mode="center" border-radius="14" z-index='1000001'>
- <view class="Info2">
- <view class="Info4">是否参加活动</view>
- <view class="Info3">
- <u-button type="primary" @click="openAPP('oks')">参加</u-button>
- <u-button type="error" @click="openAPP('nos')">取消</u-button>
- </view>
- </view>
- </u-popup>
+
</view>
+ <u-popup v-model="showIn" mode="bottom" border-radius="14" z-index='1000001' :mask-close-able="true">
+ <view class="Info2">
+ <view class="Info4">是否参加活动</view>
+ <u-button class="Info5" type="primary" @click="openAPP('oks')">参加</u-button>
+ <u-button class="Info5" type="error" @click="openAPP('nos')">取消</u-button>
+ <!--<view class="Info3">
+ </view> -->
+ </view>
+ </u-popup>
</view>
</template>
<script>
- import $moveWindow from "./map/js/move.js"
+ import $moveUniAppMap from "./map/js/moveUniAppMap.js"
export default {
data() {
return {
@@ -110,11 +119,26 @@
rid: '',
webV: null,
wv: null,
+ mapHeight: 0,
latitude: 28.687205773173343,
longitude: 115.8995839881188,
circles: [], //圆
markers: [], //标记点
- mypolylines: [],
+ mypolylines: [{ //指定一系列坐标点，从数组第一项连线至最后一项
+ points: [],
+ color: "#FE0000", //线的颜色
+ width: 10, //线的宽度
+ dottedLine: false, //是否虚线
+ arrowLine: false, //带箭头的线 开发者工具暂不支持该属性
+ },
+ { //指定一系列坐标点，从数组第一项连线至最后一项
+ points: [],
+ color: "#10a4ff", //线的颜色
+ width: 10, //线的宽度
+ dottedLine: false, //是否虚线
+ arrowLine: false, //带箭头的线 开发者工具暂不支持该属性
+ },
+ ],
useTime: null,
useTimeSet: null,
times: 3000,
@@ -129,9 +153,44 @@
},
bye: true,
types: '', //android?
+ moveDom: null, //移动实体类
+ activeHeight: "auto ", //活动高度 默认自动
+ afterClass: {},
+ activeTip: false, //是否展开
+
+ mapControls: [{
+ id: "1",
+ position: 20,
+ iconPath: "/static/tabbar/addSelectedIcon.png",
+ clickable: true,
+ }], //地图控件
}
},
methods: {
+ mapControlsBack() {
+ // console.log(1111)
+ this.getLocationInfo("notSet");
+ // this.bye = false;
+ // this.timeBegin(1);
+ },
+ touchstart(e) {
+ // console.log(e.changedTouches[0].clientY)
+ if (this.moveDom) {
+ this.moveDom.ListenerTouchstart(e)
+ }
+ },
+ touchmove(e) {
+ // console.log(e.changedTouches[0].clientY)
+ if (this.moveDom) {
+ this.moveDom.ListenerTouchmove(e)
+ }
+ },
+ touchend(e) {
+ // console.log(e.changedTouches[0].clientY)
+ if (this.moveDom) {
+ this.moveDom.ListenerTouchend(e)
+ }
+ },
openAPP(type) {
let that = this;
if (type == "oks") {
@@ -260,7 +319,7 @@
// }
// })
let d = {
- rid:rid,
+ rid: rid,
serid: serid,
type: type,
// data: JSON.stringify(item),
@@ -280,6 +339,7 @@
}
} else {
this.showIn = true;
+ // this.openAPP('oks')
// this.$confirm('是否参与活动：' + this.ourData.rname + "?", '提示', {
// confirmButtonText: '确定',
// cancelButtonText: '取消',
@@ -314,7 +374,8 @@
// }
// },
timeBegin(val) {
- console.log(this.bye)
+ // console.log(this.bye)
+ let that = this;
if (this.bye) {
console.log("再见")
if (that.useTime) {
@@ -327,10 +388,17 @@
}
return
}
- let that = this;
if (this.useTime) {
return
} else {
+ //加入自己的路线基础 索引1
+ // this.mypolylines[1] = { //指定一系列坐标点，从数组第一项连线至最后一项
+ // points: [],
+ // color: "#10a4ff", //线的颜色
+ // width: 10, //线的宽度
+ // dottedLine: false, //是否虚线
+ // arrowLine: false, //带箭头的线 开发者工具暂不支持该属性
+ // }
if (val == 1) {
that.getLocationInfo();
}
@@ -361,8 +429,8 @@
latitude: a,
});
},
- getLocationInfo() {
- var that = this
+ getLocationInfo(val) {
+ var that = this;
uni.getLocation({
type: 'wgs84',
isHighAccuracy: true,
@@ -370,13 +438,8 @@
// console.log(res, "当前位置");
that.latitude = res.latitude
that.longitude = res.longitude
- console.log(that.latitude)
- console.log(that.longitude)
- let d = {
- id: that.ourData.id,
- intlat: [res.longitude, res.latitude]
- }
- that.timeBeginSet(d) //30秒送数据
+ // console.log(that.latitude)
+ // console.log(that.longitude)
that.map.moveToLocation({
latitude: res.latitude,
longitude: res.longitude
@@ -398,6 +461,31 @@
radius: 10, //半径
strokeWidth: 2 //描边的宽度
}]
+ if (val != "notSet") {
+ let d = {
+ id: that.ourData.id,
+ intlat: [res.longitude, res.latitude]
+ }
+ that.timeBeginSet(d) //30秒送数据
+ //加入绘制路线
+ let useDataPosition = {
+ latitude: res.latitude,
+ longitude: res.longitude
+ }
+ let lat = useDataPosition.latitude + '';
+ let long = useDataPosition.longitude + '';
+ let oldLat = that.mypolylines[1].points.length == 0 ? 1 : that.mypolylines[1].points[
+ that.mypolylines[1].points.length -
+ 1].latitude + '';
+ let oldLong = that.mypolylines[1].points.length == 0 ? 1 : that.mypolylines[1].points[
+ that.mypolylines[1].points.length -
+ 1].longitude + '';
+ if (lat != oldLat && long != oldLong) { //判断如果两次位置不一样 那就添加
+ that.mypolylines[1].points.push(useDataPosition);
+ }
+ // console.log(lat != oldLat && long != oldLong, 222222222222);
+ // console.log(that.mypolylines[1].points.length)
+ }
}
});
},
@@ -473,9 +561,10 @@
markersCom() {
return this.markers.slice(0);
},
- mypolylinesCom() {
- return this.mypolylines.slice(0);
- },
+ // mypolylinesCom() {
+ // // console.log(this.mypolylines,"333333333333333333333")
+ // return this.mypolylines.slice(0);
+ // },
socketValue() {
return this.$store.state.socketValue;
}
@@ -510,7 +599,55 @@
onReady() {
let that = this;
- this.types = uni.getSystemInfoSync().platform;
+ this.types = uni.getSystemInfoSync();
+
+ var animation = uni.createAnimation({
+ duration: 1000,
+ timingFunction: 'linear',
+ })
+
+ this.animation = animation;
+
+ let activeHeight = 0;
+ this.getDom("#Umain", (res) => {
+ // console.log(res, 1111111111111111111111111111)
+ that.mapHeight = that.types.windowHeight - res.height + 30;
+ // that.mapHeight = 30;
+ that.activeHeight = res.height;
+ activeHeight = res.height;
+ let minHeight = 4 * 40 + 30
+ let d = {
+ activeDom: "#Umain",
+ adaptDom: "#myMap",
+ uni: uni,
+ maxHeight: activeHeight, //在外面获取活动区域的高度，
+ //在构造中动态获取会实时改变这个值
+ //导致改变固定的最高高度
+ useHeight: minHeight, //缩小后的高度、、可设置成保留高度
+ critical: (activeHeight - minHeight) / 3, //收缩程度，，可设置成总滑动距离的1/2 (maxHeight - useHeight) / 2
+ fn: (res) => {
+ // console.log(res)
+ if (res.state != 'on') {
+ that.mapHeight = that.types.windowHeight - res.height + 30;
+ } else {
+ if (res.translate) {
+ that.activeTip = true;
+ }
+ if (res.translate) {
+ that.activeTip = false;
+ }
+ }
+
+ if (res.translate === true) {
+ that.activeTip = true;
+ } else if (res.translate === false) {
+ that.activeTip = false;
+ }
+ that.activeHeight = res.height + 'px';
+ }
+ }
+ that.moveDom = new $moveUniAppMap(d);
+ })
// if (type == "android") {
// this.useHeight = "calc(100vh - 40px)";
// }
@@ -557,7 +694,7 @@
// data = JSON.stringify({
datas = {
appenUrl: "http://192.168.0.108:83/",
- butCT: "beginUp",
+ butCT: "begin",
buttype: 0,
captain: "我",
city: "南昌市",
@@ -605,12 +742,18 @@
toStrings(d);
}
toStrings(datas);
- console.log(data)
+ // console.log(data)
if (data.team) {
data["teams"] = data.team.split(",");
}
that.ourData = data;
+
+ uni.getSystemInfo({ //初始化地图高度
+ success(res) {
+ that.mapHeight = res.windowHeight;
+ }
+ });
// console.log(data);
// return
// console.log(options.html)
@@ -654,31 +797,31 @@
// }
that.query = uni.createSelectorQuery();
const _this = this;
- uni.getSystemInfo({
- success: (res) => {
- // _this.mapHeight = (res.screenHeight - res.statusBarHeight) /2
- // setTimeout(() => {
- // that.getDom('#Umain', data => {
- // console.log(res.statusBarHeight, res.screenHeight, data, 'dat')
- // console.log(res.screenHeight - data.height + res
- // .statusBarHeight)
- // _this.mapHeight = res.screenHeight - res.statusBarHeight - 420
- that.mapHeight = res.screenHeight - res.statusBarHeight - 466
- that.mapHeight = that.mapHeight
- // })
- // }, 1000)
+ // uni.getSystemInfo({
+ // success: (res) => {
+ // // _this.mapHeight = (res.screenHeight - res.statusBarHeight) /2
+ // // setTimeout(() => {
+ // // that.getDom('#Umain', data => {
+ // // console.log(res.statusBarHeight, res.screenHeight, data, 'dat')
+ // // console.log(res.screenHeight - data.height + res
+ // // .statusBarHeight)
+ // // _this.mapHeight = res.screenHeight - res.statusBarHeight - 420
+ // that.mapHeight = res.screenHeight - res.statusBarHeight - 466
+ // that.mapHeight = that.mapHeight
+ // // })
+ // // }, 1000)
- // that.query.select('#Umain').boundingClientRect(data => {
- // console.log('11111111')
- // console.log(data)
- // }).exec();
- // console.log(res)
- // let info = uni.createSelectorQuery().select("Umain");
- // info.boundingClientRect(function(data) { //data - 各种参数
- // console.log(data.width) // 获取元素宽度
- // }).exec()
- }
- })
+ // // that.query.select('#Umain').boundingClientRect(data => {
+ // // console.log('11111111')
+ // // console.log(data)
+ // // }).exec();
+ // // console.log(res)
+ // // let info = uni.createSelectorQuery().select("Umain");
+ // // info.boundingClientRect(function(data) { //data - 各种参数
+ // // console.log(data.width) // 获取元素宽度
+ // // }).exec()
+ // }
+ // })
// console.log(document.getElementById("Umain"))
// this.checkDomHeightId({
// domName: "getElementById",
@@ -759,10 +902,10 @@
//画线
- console.log(data)
+ // console.log(data)
let line = data.line.split("(")[1].split(")")[0].split(",");
- console.log(line[0].split(" ")[1])
- console.log(line[0].split(" ")[0])
+ // console.log(line[0].split(" ")[1])
+ // console.log(line[0].split(" ")[0])
this.latitude = line[0].split(" ")[1];
this.longitude = line[0].split(" ")[0];
this.map.moveToLocation({
@@ -780,14 +923,15 @@
})
}
// setTimeout(() => {
- this.mypolylines[0] = { //指定一系列坐标点，从数组第一项连线至最后一项
- points: ourline,
- color: "#FE0000", //线的颜色
- width: 10, //线的宽度
- dottedLine: false, //是否虚线
- arrowLine: false, //带箭头的线 开发者工具暂不支持该属性
- }
- console.log(this.mypolylines)
+ // this.mypolylines[0] = { //指定一系列坐标点，从数组第一项连线至最后一项
+ // points: ourline,
+ // color: "#FE0000", //线的颜色
+ // width: 10, //线的宽度
+ // dottedLine: false, //是否虚线
+ // arrowLine: false, //带箭头的线 开发者工具暂不支持该属性
+ // }
+ that.mypolylines[0].points = ourline;
+ // console.log(this.mypolylines)
// }, 1000)
this.showWindow();
// this.getLocationInfo(data);
@@ -804,18 +948,18 @@
<style lang="scss">
.content {
- flex: 1;
- height: 100%;
+ // flex: 1;
+ // height: 100%;
+ overflow: hidden;
+ // position: relative;
}
#Umain {
position: absolute;
- width: 100%;
- height: auto;
- left: 0;
bottom: 0;
- background-color: #e8e8e8;
- z-index: 1000000;
+ left: 0;
+ width: 100%;
+ overflow: hidden;
}
.once {
@@ -911,8 +1055,8 @@
.Info2 {
- width: 200px;
- height: 100px;
+ width: 100%;
+ // height: 100px;
padding: 0 10px;
.Info3 {
@@ -930,5 +1074,99 @@
text-align: center;
height: 50px;
}
+
+ .Info5 {
+ margin-bottom: 10px !important;
+ width: 70%;
+ }
+ }
+
+ .notOpens {
+ &::after {
+ content: "";
+ display: block;
+ width: 20px;
+ height: 4px;
+ background-color: rgba(202, 202, 202, 1);
+ position: absolute;
+ top: 10px;
+ left: calc(50% - 10px);
+ border-radius: 5px;
+ transition: all 0.1s;
+ }
+ }
+
+ .activeTip {
+ background-color: #fff;
+ }
+
+ .isOpens {
+ &::after {
+ content: "";
+ display: block;
+ width: 13px;
+ height: 4px;
+ background-color: rgba(202, 202, 202, 1);
+ position: absolute;
+ top: 10px;
+ left: calc(50% - 12px);
+ border-radius: 5px;
+ transform: rotate(30deg);
+ transition: all 0.1s;
+ }
+
+ &::before {
+ content: "";
+ display: block;
+ width: 13px;
+ height: 4px;
+ background-color: rgba(202, 202, 202, 1);
+ position: absolute;
+ top: 10px;
+ left: calc(50% - 4px);
+ border-radius: 5px;
+ transform: rotate(-30deg);
+ transition: all 0.1s;
+ }
+ }
+
+ .dingwBut {
+ width: 80upx;
+ height: 80upx;
+ background-color: #fff;
+ border-radius: 20upx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ position: absolute;
+ bottom: 40upx;
+ right: 40upx;
+
+ // background-color: red;
+ // .dingwButImg {
+ // width: 80%;
+ // height: 80%;
+ // }
+ // .icon{
+ // }
+ // &::after{
+ // content: url(map/img/dingwei.png);
+ // }
+ // .dingwButImg {
+ // animation: mymove 5s infinite;
+ // animation-timing-function: linear;
+ // }
+ }
+
+
+
+ @keyframes mymove {
+ 0% {
+ transform: rotate(0deg);
+ }
+
+ 100% {
+ transform: rotate(1turn);
+ }
}
</style>
diff --git a/pages/grabOrders/map/img/dingwei.png b/pages/grabOrders/map/img/dingwei.png
new file mode 100644
index 0000000..58a917e
--- /dev/null
+++ b/pages/grabOrders/map/img/dingwei.png
Binary files differ
diff --git a/pages/grabOrders/map/js/moveUniAppMap.js b/pages/grabOrders/map/js/moveUniAppMap.js
new file mode 100644
index 0000000..ac1c9c8
--- /dev/null
+++ b/pages/grabOrders/map/js/moveUniAppMap.js
@@ -0,0 +1,128 @@
+class $moveUniAppMap {
+ constructor(arg) {
+ this.activeDom = arg.activeDom; //活动dom
+ this.adaptDom = arg.adaptDom; //适应dom
+ this.windowSize = arg.uni.getSystemInfoSync(); // 设备参数含屏幕尺寸
+ let doms = arg.uni.createSelectorQuery(); //获取dom参数uni工具
+ this.getDoms = (name, fn) => { //fn是会回调函数，不用promis
+ doms.select(name).boundingClientRect((data) => {
+ if (fn) {
+ fn(data)
+ }
+ }).exec()
+ }
+ // console.log(this.windowSize)
+
+ this.start = 0;
+ this.end = 0;
+ this.domHeight = 0;
+ this.openValue = false; //方向
+ this.useHeight = arg.useHeight; //使用的低高度
+ this.critical = arg.critical; //收缩展开的程度
+ // this.getDoms(this.activeDom, (res) => { //获取dom最大高度
+ this.maxHeight = arg.maxHeight;
+ // })
+ this.fn = (res) => {
+ if (arg.fn) {
+ arg.fn(res)
+ } else {
+ console.log(res, "未设置输出函数")
+ }
+ }
+
+ return this;
+ }
+ ListenerTouchstart(dom) { //开始移动，记录开始点和活动dom高度
+ this.start = dom.changedTouches[0].clientY;
+ this.getDoms(this.activeDom, (res) => { //动态获取当前活动dom高度
+ this.domHeight = res.height;
+ })
+ // let d = {
+ // state: "start",
+ // height: this.maxHeight,
+ // };
+ // // console.log(cha, "cha")
+ // // console.log(+endOn - +this.start, "cha")
+ // this.fn(d);
+ // console.log(this.start, "this.start")
+ }
+ ListenerTouchmove(dom) {
+ let endOn = dom.changedTouches[0].clientY;
+ // console.log(that.domHeight, that.start, endOn)
+ let usecha = +this.start - +endOn;
+ let cha = this.domHeight + usecha;
+ if (cha >= this.maxHeight) {
+ cha = this.maxHeight;
+ } else if (cha <= this.useHeight) {
+ cha = this.useHeight;
+ }
+ let translate = false;
+ if (usecha >= this.critical) {
+ translate = true;
+ }
+ if (usecha <= -this.critical) {
+ translate = true;
+ }
+ let d = {
+ state: "on",
+ height: cha,
+ translate: translate
+ };
+ if (usecha >= 0) {
+ d.state = "up";
+ }
+ // console.log(cha, "cha")
+ // console.log(usecha, "cha")
+ this.fn(d);
+ }
+ ListenerTouchend(dom) {
+ this.end = dom.changedTouches[0].clientY;
+ let cha, states;
+ if (this.end >= this.start) {
+ states = false; //方向向下收缩
+ cha = this.end - this.start;
+ } else {
+ states = true; //方向向上抬起
+ cha = this.start - this.end;
+ }
+ if (cha >= this.critical) {
+ //高
+ this.judge(states, true); //程度
+ } else if (cha < this.critical) {
+ //低
+ this.judge(states, false); //程度
+ }
+ // console.log(cha)
+ }
+ innit() {
+
+ }
+ //输出事件
+ judge(val, chengdu) {
+ let translate = '';
+ if (chengdu) {
+ this.openValue = val;
+ if (val) {
+ this.height = this.maxHeight; //给到向上的最高高度
+ } else {
+ this.height = this.useHeight; //给到向下的最低高度
+ }
+ } else {
+ this.height = this.domHeight; //给到当前高度
+ }
+ if (this.height == this.maxHeight) {
+ translate = false;
+ } else {
+ translate = true;
+ }
+ let d = {
+ state: this.openValue,
+ height: this.height,
+ translate: translate
+ };
+ // console.log(d)
+ this.fn(d);
+ }
+}
+
+export default $moveUniAppMap;
diff --git a/pages/registerUser/idphoto.nvue b/pages/registerUser/idphoto.nvue
index 57568d0..cb1f5a4 100644
--- a/pages/registerUser/idphoto.nvue
+++ b/pages/registerUser/idphoto.nvue
@@ -230,7 +230,8 @@
parentId: d.jsid,
jurisdiction: d.xqobjId,
cardid: d.carId,
- address: d.address
+ address: d.address,
+ workunit: d.obj
}
uni.request({
url: url,
diff --git a/pages/registerUser/registerUser.vue b/pages/registerUser/registerUser.vue
index 8432134..94a19f1 100644
--- a/pages/registerUser/registerUser.vue
+++ b/pages/registerUser/registerUser.vue
@@ -10,15 +10,15 @@
<u-select v-model="show" mode="mutil-column-auto" :list="roleList" @confirm="radioGroupChange">
</u-select>
</u-form-item>
- <u-form-item label="工作单位" prop="obj" left-icon="home-fill" label-width="200" :required="true">
+ <u-form-item label="工作单位" prop="obj" left-icon="home-fill" label-width="200" :required="false">
<u-input v-model="form.obj" placeholder="请输入工作单位" />
</u-form-item>
<u-form-item label="所在地区" prop="xq" left-icon="map-fill" label-width="200" :required="true">
- <u-input v-model="form.xq" type="select" placeholder="请选择辖区" :border="true" @click="regionClick" />
+ <u-input v-model="form.xq" type="select" placeholder="请选择所在地区" :border="true" @click="regionClick" />
<u-select v-model="regionShow" mode="mutil-column-auto" :list="regionList" @confirm="regionSelect">
</u-select>
</u-form-item>
- <u-form-item label="详细地址" prop="address" left-icon="map" label-width="200" :required="true">
+ <u-form-item label="详细地址" prop="address" left-icon="map" label-width="200" :required="false">
<u-input v-model="form.address" placeholder="详细地址" />
</u-form-item>
<u-form-item label="性别" label-width="200" left-icon="man">
@@ -74,14 +74,16 @@
if (value.length <= 11) {
if (phone.test(value)) {
+ this.form.phone = value;
return true
} else {
return callback(new Error('手机号格式不正确'));
}
}
- if (value.length <= 18) {
+ if (value.length > 11) {
if (identity.test(value)) {
+ this.form.carId = value;
return true
} else {
return callback(new Error('身份证号格式不正确'));
@@ -248,13 +250,13 @@
trigger: ['change', 'blur'],
}],
obj: [{
- required: true,
+ required: false,
message: '请输入工作单位',
// 可以单个或者同时写两个触发验证方式
trigger: ['change', 'blur'],
}],
address: [{
- required: true,
+ required: false,
message: '请输入详细地址',
// 可以单个或者同时写两个触发验证方式
trigger: ['change', 'blur'],
diff --git a/pages/voting/information.vue b/pages/voting/information.vue
new file mode 100644
index 0000000..62a6b20
--- /dev/null
+++ b/pages/voting/information.vue
@@ -0,0 +1,19 @@
+<template>
+ <view>
+ <web-view :src="url"></web-view>
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+ url: ''
+ }
+ },
+ onLoad(e) {
+ // 获取传递过来的链接
+ this.url = e.url
+ }
+ }
+</script>
\ No newline at end of file
diff --git a/static/map/dingwei.png b/static/map/dingwei.png
new file mode 100644
index 0000000..58a917e
--- /dev/null
+++ b/static/map/dingwei.png
Binary files differ
diff --git a/store/state.js b/store/state.js
index d7d42d2..aef65ac 100644
--- a/store/state.js
+++ b/store/state.js
@@ -12,7 +12,9 @@
logPath: '',
piAPI: apis.api,
// piAPI: 'http://223.82.109.183:2082/api/',
- // piAPI: 'http://192.168.0.108:83/',
+ // piAPI: 'http://192.168.0.110:83/',
+ //piAPI: 'http://223.82.109.183:2082/api/',
+ BaopiAPI: 'http://223.82.109.183:2080/api/',
puserName: '',
puserID: '',
puserIphone: '',
@@ -55,4 +57,4 @@
...positions.state
}
-export default state
+export default state
\ No newline at end of file
--
Gitblit v1.9.3