shuishen
2022-02-25 13d7349ea1beda3ebd48d27092aed0f17cd1c4b1
Merge branch 'master' of http://192.168.0.105:10010/r/qfqk-android
42 files modified
16 files added
2883 ■■■■■ changed files
api/mock/home.js 26 ●●●●● patch | view | raw | blame | history
pages.json 1366 ●●●● patch | view | raw | blame | history
pages/article/article.vue 2 ●●● patch | view | raw | blame | history
pages/business/business.vue 274 ●●●●● patch | view | raw | blame | history
pages/business/businesscopy.vue 2 ●●● patch | view | raw | blame | history
pages/business/businesscopy2.vue 296 ●●●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersMain/business.vue 299 ●●●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAFFPX/feedback.vue 2 ●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAFFPX/grabOrders.vue 6 ●●●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAFFPX/inPage/page0.vue 31 ●●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAFFPX/map.vue 55 ●●●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAFFPX/once.vue patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAXC/feedback.vue 2 ●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAXC/grabOrders.vue 6 ●●●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAXC/inPage/page0.vue 6 ●●●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAXC/map.vue 184 ●●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAYWXC/feedback.vue 2 ●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAYWXC/grabOrders.vue 6 ●●●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAYWXC/inPage/page0.vue 8 ●●●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAYWXC/map.vue 159 ●●●● patch | view | raw | blame | history
pages/home/home.vue 74 ●●●●● patch | view | raw | blame | history
pages/issue/issue.vue 2 ●●● patch | view | raw | blame | history
pages/myself/myself.vue 8 ●●●● patch | view | raw | blame | history
static/img/dingwei.png patch | view | raw | blame | history
static/img/dinw/dinw1.png patch | view | raw | blame | history
static/img/dinw/dinw2.png patch | view | raw | blame | history
static/img/dinw/dinw3.png patch | view | raw | blame | history
static/img/dinw/dinw4.png patch | view | raw | blame | history
static/img/dinw/dinw5.png patch | view | raw | blame | history
static/img/dinw/dinw6.png patch | view | raw | blame | history
static/map/img/img/dingwei.png patch | view | raw | blame | history
static/map/img/img/dinw/dinw1.png patch | view | raw | blame | history
static/map/img/img/dinw/dinw2.png patch | view | raw | blame | history
static/map/img/img/dinw/dinw3.png patch | view | raw | blame | history
static/map/img/img/dinw/dinw4.png patch | view | raw | blame | history
static/map/img/img/dinw/dinw5.png patch | view | raw | blame | history
static/map/img/img/dinw/dinw6.png patch | view | raw | blame | history
store/apiConfig.js 4 ●●●● patch | view | raw | blame | history
store/positions.js 16 ●●●●● patch | view | raw | blame | history
store/state.js 16 ●●●● patch | view | raw | blame | history
store/websocket.js 31 ●●●● patch | view | raw | blame | history
unpackage/res/icons/1024x1024.png patch | view | raw | blame | history
unpackage/res/icons/120x120.png patch | view | raw | blame | history
unpackage/res/icons/144x144.png patch | view | raw | blame | history
unpackage/res/icons/152x152.png patch | view | raw | blame | history
unpackage/res/icons/167x167.png patch | view | raw | blame | history
unpackage/res/icons/180x180.png patch | view | raw | blame | history
unpackage/res/icons/192x192.png patch | view | raw | blame | history
unpackage/res/icons/20x20.png patch | view | raw | blame | history
unpackage/res/icons/29x29.png patch | view | raw | blame | history
unpackage/res/icons/40x40.png patch | view | raw | blame | history
unpackage/res/icons/58x58.png patch | view | raw | blame | history
unpackage/res/icons/60x60.png patch | view | raw | blame | history
unpackage/res/icons/72x72.png patch | view | raw | blame | history
unpackage/res/icons/76x76.png patch | view | raw | blame | history
unpackage/res/icons/80x80.png patch | view | raw | blame | history
unpackage/res/icons/87x87.png patch | view | raw | blame | history
unpackage/res/icons/96x96.png patch | view | raw | blame | history
api/mock/home.js
@@ -117,19 +117,25 @@
                    img: '/static/images/home/search004.png',
                    url: '../alarm_list/alarm_list'
                },
                {
                    name: '我要报',
                    img: '/static/images/home/report001.png',
                    url: '../reported/reported'
                },
                {
                    name: '我要说',
                    img: '/static/images/home/s4.png',
                    url: '../groupChat/groupChat'
                },
                // {
                //     name: '我要报',
                //     img: '/static/images/home/report001.png',
                //     url: '../reported/reported'
                // },
                // {
                //     name: '我要说',
                //     img: '/static/images/home/s4.png',
                //     url: '../groupChat/groupChat'
                // },
                {
                    name: '我参与',
                    img: '/static/images/home/jusou.png',
                    // url: '../business/business'
                    url: '../grabOrders/grabOrdersMain/business'
                },
                {
                    name: '积分商城',
                    img: '/static/workbench/task8.png',
                    url: '../grabOrders/grabOrders'
                },
                // {
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": "行业圈",
                "navigationBarBackgroundColor": "#103289",
                "navigationBarTextStyle": "white"
            }
        },
        {
            "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"
        }
    }
}
        }
    ],
    "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"
        }
    }
}
pages/article/article.vue
@@ -53,7 +53,7 @@
        
        <u-toast ref="uToast" />
        <!-- 底部导航条 -->
        <u-tabbar :list="tabbar" :mid-button="true"></u-tabbar>
        <u-tabbar :list="tabbar" :mid-button="false"></u-tabbar>
    </view>
</template>
pages/business/business.vue
@@ -1,44 +1,8 @@
<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-empty text="功能研发中" mode="favor" margin-top="400"></u-empty>
        <!-- 底部导航条 -->
        <u-tabbar :list="tabbar" :mid-button="true"></u-tabbar>
        <u-tabbar :list="tabbar" :mid-button="false"></u-tabbar>
    </view>
</template>
@@ -47,250 +11,20 @@
        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: ''
                }],
                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'
                // }
                ]
            };
        },
        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>
pages/business/businesscopy.vue
@@ -31,7 +31,7 @@
            </view>
        </view>
        <!-- 底部导航条 -->
        <u-tabbar :list="tabbar" :mid-button="true"></u-tabbar>
        <u-tabbar :list="tabbar" :mid-button="false"></u-tabbar>
        
    </view>
</template>
pages/business/businesscopy2.vue
New file
@@ -0,0 +1,296 @@
<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: ''
                }, {
                    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'
                // }
                ]
            };
        },
        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>
pages/grabOrders/grabOrdersMain/business.vue
New file
@@ -0,0 +1,299 @@
<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="3" :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>
                                <u-badge :count="item.cout" :offset="[20, 20]"></u-badge>
                                <view class="nav-item-name">{{item.title}}</view>
                            </navigator>
                        </u-grid-item>
                    </u-grid>
                </view>
            </view>
            <!-- 我的订阅 end -->
            <view class="card wrap" v-if="bashow">
                <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,
                bashow: false,
                dataOne: [{
                    title: '治安巡查',
                    img: '/static/workbench/task2.png',
                    url: '../grabOrdersZAXC/grabOrders?detailData=0',
                    cout: 0
                }, {
                    title: '治安义务宣传',
                    img: '/static/workbench/task1.png',
                    url: '../grabOrdersZAYWXC/grabOrders?detailData=0',
                    cout: 0
                }, {
                    title: '治安防范培训',
                    img: '/static/workbench/task3.png',
                    url: '../grabOrdersZAFFPX/grabOrders?detailData=0',
                    cout: 0
                }, {
                    title: '保安管理',
                    img: '/static/workbench/task4.png',
                    url: '',
                    cout: 0
                }],
                dataTwo: [{
                        title: '电子证件',
                        img: '/static/workbench/task9.png',
                        url: ''
                    }, {
                        title: '模拟考试',
                        img: '/static/workbench/task5.png',
                        url: ''
                    }
                    // ,{
                    //     title:'模拟考试',
                    //     img:'../../static/workbench/exam.png',
                    //     url:'/pages/exam/startexam'
                    // }
                ]
            };
        },
        onShow() {
            this.getNum();
        },
        onLoad() {
        },
        onBackPress(e) {
            console.log("监听返回按钮事件2", e);
            uni.switchTab({
                url: "/pages/home/home"
            })
            // 此处一定姚要return为true,否则页面不会返回到指定路径
            return true;
        },
        mounted() {
            // if (this.$store.state.UserData.stype != "1") {
            //     this.$refs.uToast.show({
            //         title: '功能暂未开放',
            //         type: 'warning',
            //     });
            // }
        },
        methods: {
            //获取资讯信息
            getNum() {
                var that = this;
                uni.request({
                    url: this.$store.state.piAPI + '/taskqd/selectNum',
                    method: 'GET',
                    data: {
                        serid: that.$store.state.UserData.user_id,
                        jurisdiction: that.$store.state.UserData.jurisdiction,
                        workjurisdiction: that.$store.state.UserData.workjurisdiction,
                    },
                    success: (res) => {
                        var data = res.data.data;
                        this.dataOne[0].cout = Number(data.xcha);
                        this.dataOne[1].cout = Number(data.xchuan);
                        this.dataOne[2].cout = Number(data.px);
                    }
                });
            },
            //页面跳转
            goOnePage(url, index) {
                if (index == "3") {
                    this.bashow = !this.bashow;
                }
                uni.navigateTo({
                    url: url
                })
            },
            //获取用户信息
            getUser() {
                var that = this;
                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 (index == "1") {
                    this.$refs.uToast.show({
                        title: '功能研发中',
                        type: 'warning',
                    });
                    return;
                } else {
                    this.getUser();
                }
            },
        }
    };
</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>
pages/grabOrders/grabOrdersZAFFPX/feedback.vue
@@ -67,7 +67,7 @@
        onBackPress(e) {
            console.log("监听返回按钮事件1", e);
            uni.redirectTo({
                url: "/pages/grabOrders/grabOrders"
                url: "/pages/grabOrders/grabOrdersZAFFPX/grabOrders?detailData=0"
            })
            // 此处一定姚要return为true,否则页面不会返回到指定路径
            return true;
pages/grabOrders/grabOrdersZAFFPX/grabOrders.vue
@@ -64,8 +64,8 @@
        },
        onBackPress(e) {
            console.log("监听返回按钮事件2", e);
            uni.switchTab({
                url: "/pages/home/home"
            uni.redirectTo({
                url: "/pages/grabOrders/grabOrdersMain/business"
            })
            // 此处一定姚要return为true,否则页面不会返回到指定路径
            return true;
@@ -181,10 +181,12 @@
                    d = {
                        serid: uni.getStorageSync("ids") || that.$store.state.puserID,
                        type: val + "",
                        tasktype:'2'
                    };
                if (val == 1) {
                    d.jurisdiction = this.$store.state.UserData.jurisdiction;
                    d.workjurisdiction = this.$store.state.UserData.workjurisdiction;
                }
                // console.log(that.$store.state.puserID)
                uni.request({
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%;
pages/grabOrders/grabOrdersZAFFPX/map.vue
@@ -1,6 +1,6 @@
<template>
    <view class="content">
        <!-- <u-top-tips ref="uTips"></u-top-tips> -->
        <u-top-tips ref="uTips"></u-top-tips>
        <!-- <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"
@@ -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,10 +44,18 @@
            </view>
            <view class="once">
                <span class="once-left">
                    任务地区
                    联系方式
                </span>
                <span class="once-right">
                    {{ourData.province}}&nbsp;-&nbsp;{{ourData.city}}&nbsp;-&nbsp;{{ourData.district}}
                    <span>{{ourData.phone}}</span>
                </span>
            </view>
            <view class="once">
                <span class="once-left">
                    培训地点
                </span>
                <span class="once-right">
                    {{ourData.gathername}}
                </span>
            </view>
            <view class="once">
@@ -60,10 +68,10 @@
            </view>
            <view class="once">
                <span class="once-left">
                    人数
                    参培队伍
                </span>
                <span class="once-right">
                    {{ourData.num}}&nbsp;/&nbsp;{{ourData.jnum}}
                    保安员队伍
                </span>
            </view>
            <!-- <view class="once">
@@ -85,13 +93,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>
@@ -253,7 +264,7 @@
                                });
                                setTimeout(function() {
                                    uni.redirectTo({
                                        url: "/pages/grabOrders/grabOrders?in=true"
                                        url: "/pages/grabOrders/grabOrdersZAFFPX/grabOrders?in=true"
                                    })
                                }, 2200)
                            }
@@ -276,7 +287,8 @@
                        // }
                        this.bye = true;
                        uni.redirectTo({
                            url: '/pages/grabOrders/feedback?data=' + JSON.stringify(this.ourData) +
                            url: '/pages/grabOrders/grabOrdersZAFFPX/feedback?data=' + JSON.stringify(this
                                    .ourData) +
                                '&other="11111"'
                        });
                    } else if (that.ourData.butCT == "begin") {
@@ -323,9 +335,10 @@
                            serid: serid,
                            type: type,
                            // data: JSON.stringify(item),
                            goto: "grabOrdersZAFFPX",
                            that: that,
                            fn: () => {
                                that.getGrabOrders(that.current); //重获取数据
                                // that.getGrabOrders(that.current); //重获取数据
                                // setTimeout(() => {
                                //     that.openOnce(item);
                                // }, 500)
@@ -598,7 +611,7 @@
        mounted() {},
        onReady() {
            let that = this;
            return
            this.types = uni.getSystemInfoSync();
            var animation = uni.createAnimation({
@@ -698,7 +711,7 @@
                    buttype: 0,
                    captain: "我",
                    city: "南昌市",
                    content: "测试",
                    content: "测试培训内容",
                    district: "西湖区",
                    id: 37,
                    integral: "222",
@@ -710,13 +723,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",
@@ -748,7 +761,7 @@
            }
            that.ourData = data;
            return
            uni.getSystemInfo({ //初始化地图高度
                success(res) {
                    that.mapHeight = res.windowHeight;
@@ -900,10 +913,12 @@
            //     }
            // })
            return
            //画线
            // console.log(data)
            let line = data.line.split("(")[1].split(")")[0].split(",");
            if (data.line) {
                let line = data.line.split("(")[1].split(")")[0].split(",");
            }
            // console.log(line[0].split(" ")[1])
            // console.log(line[0].split(" ")[0])
            this.latitude = line[0].split(" ")[1];
pages/grabOrders/grabOrdersZAFFPX/once.vue
Binary files differ
pages/grabOrders/grabOrdersZAXC/feedback.vue
@@ -67,7 +67,7 @@
        onBackPress(e) {
            console.log("监听返回按钮事件1", e);
            uni.redirectTo({
                url: "/pages/grabOrders/grabOrders"
                url: "/pages/grabOrders/grabOrdersZAXC/grabOrders?detailData=0"
            })
            // 此处一定姚要return为true,否则页面不会返回到指定路径
            return true;
pages/grabOrders/grabOrdersZAXC/grabOrders.vue
@@ -64,8 +64,8 @@
        },
        onBackPress(e) {
            console.log("监听返回按钮事件2", e);
            uni.switchTab({
                url: "/pages/home/home"
            uni.redirectTo({
                url: "/pages/grabOrders/grabOrdersMain/business"
            })
            // 此处一定姚要return为true,否则页面不会返回到指定路径
            return true;
@@ -181,10 +181,12 @@
                    d = {
                        serid: uni.getStorageSync("ids") || that.$store.state.puserID,
                        type: val + "",
                        tasktype:'0'
                    };
                if (val == 1) {
                    d.jurisdiction = this.$store.state.UserData.jurisdiction;
                    d.workjurisdiction = this.$store.state.UserData.workjurisdiction;
                }
                // console.log(that.$store.state.puserID)
                uni.request({
pages/grabOrders/grabOrdersZAXC/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">队长</span> -->
                    {{item.type == 1?"完成反馈":item.type == 0?"上传反馈":"开始任务"}}
                </u-button>
                <view class="o-r-$">
                    积分:{{item.integral}}
pages/grabOrders/grabOrdersZAXC/map.vue
@@ -1,11 +1,10 @@
<template>
    <view class="content">
        <!-- <u-top-tips ref="uTips"></u-top-tips> -->
        <u-top-tips ref="uTips"></u-top-tips>
        <!-- <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="mypolylines"
            show-location="true">
        <map :scale='18' id="myMap" style="width: 100%" :style="{height: mapHeight + 'px'}" :markers="markers"
            :longitude="longitude" :latitude="latitude" :circles="circles" :polyline="mypolylines" show-location="true">
            <cover-view class="dingwBut" @click="mapControlsBack">
                <cover-image src="./map/img/dingwei.png" @click="mapControlsBack">
                </cover-image>
@@ -16,11 +15,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 +27,7 @@
            </view>
            <view class="once">
                <span class="once-left">
                    任务内容
                    巡查内容
                </span>
                <span class="once-right">
                    {{ourData.content}}
@@ -44,10 +43,18 @@
            </view>
            <view class="once">
                <span class="once-left">
                    任务地区
                    联系方式
                </span>
                <span class="once-right">
                    {{ourData.province}}&nbsp;-&nbsp;{{ourData.city}}&nbsp;-&nbsp;{{ourData.district}}
                    <span>{{ourData.phone}}</span>
                </span>
            </view>
            <view class="once">
                <span class="once-left">
                    集合点
                </span>
                <span class="once-right">
                    {{ourData.gathername}}
                </span>
            </view>
            <view class="once">
@@ -122,8 +129,38 @@
                mapHeight: 0,
                latitude: 28.687205773173343,
                longitude: 115.8995839881188,
                circles: [], //圆
                markers: [], //标记点
                circles: [{
                    latitude: '',
                    longitude: '',
                    fillColor: "#D9E6EF", //填充颜色
                    color: "#A7B6CB", //描边的颜色
                    radius: 50, //半径
                    strokeWidth: 2, //描边的宽度
                }, {
                    latitude: '',
                    longitude: '',
                    fillColor: "#D9E6EF", //填充颜色
                    color: "#A7B6CB", //描边的颜色
                    radius: 10, //半径
                    strokeWidth: 2, //描边的宽度
                }], //圆
                markers: [{
                    width: 40,
                    height: 40,
                    id: 1,
                    latitude: '',
                    longitude: '',
                    iconPath: 'http://223.82.109.183:2081/zhba/upload/20220225/f0aecffbaf0a2ce80f7938569da20de7.png',
                }, {
                    width: 40,
                    height: 40,
                    id: 2,
                    latitude: '',
                    longitude: '',
                    iconPath: 'http://223.82.109.183:2081/zhba/upload/20220225/7b486f647a15e708aca662dbd496dcd3.png',
                }], //标记点
                jihecircles: [], //集合点
                jihemarkers: [], //集合点
                mypolylines: [{ //指定一系列坐标点,从数组第一项连线至最后一项
                        points: [],
                        color: "#FE0000", //线的颜色
@@ -164,6 +201,7 @@
                    iconPath: "/static/tabbar/addSelectedIcon.png",
                    clickable: true,
                }], //地图控件
                inThere: true,
            }
        },
        methods: {
@@ -253,7 +291,7 @@
                                });
                                setTimeout(function() {
                                    uni.redirectTo({
                                        url: "/pages/grabOrders/grabOrders?in=true"
                                        url: "/pages/grabOrders/grabOrdersZAXC/grabOrders?in=true"
                                    })
                                }, 2200)
                            }
@@ -276,7 +314,7 @@
                        // }
                        this.bye = true;
                        uni.redirectTo({
                            url: '/pages/grabOrders/feedback?data=' + JSON.stringify(this.ourData) +
                            url: '/pages/grabOrders/grabOrdersZAXC/feedback?data=' + JSON.stringify(this.ourData) +
                                '&other="11111"'
                        });
                    } else if (that.ourData.butCT == "begin") {
@@ -323,9 +361,10 @@
                            serid: serid,
                            type: type,
                            // data: JSON.stringify(item),
                            goto: "grabOrdersZAXC",
                            that: that,
                            fn: () => {
                                that.getGrabOrders(that.current); //重获取数据
                                // that.getGrabOrders(that.current); //重获取数据
                                // setTimeout(() => {
                                //     that.openOnce(item);
                                // }, 500)
@@ -440,27 +479,34 @@
                        that.longitude = res.longitude
                        // console.log(that.latitude)
                        // console.log(that.longitude)
                        that.map.moveToLocation({
                            latitude: res.latitude,
                            longitude: res.longitude
                        });
                        if (that.inThere) {
                            that.inThere = false;
                            that.map.moveToLocation({
                                latitude: res.latitude,
                                longitude: res.longitude
                            });
                        }
                        // that.mover(res.longitude, res.latitude); //移动
                        // that.$store.commit("setMsg",d)
                        //标记点
                        that.markers = [{
                            id: 1,
                            latitude: res.latitude,
                            longitude: res.longitude,
                            iconPath: './map/img/dinw/dinw1.png',
                        }]
                        that.circles = [{ //在地图上显示圆
                            latitude: res.latitude,
                            longitude: res.longitude,
                            fillColor: "#D9E6EF", //填充颜色
                            color: "#A7B6CB", //描边的颜色
                            radius: 10, //半径
                            strokeWidth: 2 //描边的宽度
                        }]
                        that.markers[1].latitude = res.latitude;
                        that.markers[1].longitude = res.longitude;
                        that.circles[1].latitude = res.latitude;
                        that.circles[1].longitude = res.longitude;
                        // that.markers = [{
                        //     id: 1,
                        //     latitude: res.latitude,
                        //     longitude: res.longitude,
                        //     iconPath: './map/img/dinw/dinw1.png',
                        // }]
                        // that.circles = [{ //在地图上显示圆
                        //     latitude: res.latitude,
                        //     longitude: res.longitude,
                        //     fillColor: "#D9E6EF", //填充颜色
                        //     color: "#A7B6CB", //描边的颜色
                        //     radius: 10, //半径
                        //     strokeWidth: 2 //描边的宽度
                        // }]
                        if (val != "notSet") {
                            let d = {
                                id: that.ourData.id,
@@ -555,12 +601,27 @@
                    return this.$store.state.isOnTaskValue;
                }
            },
            circlesCom() {
                return this.circles.slice(0);
            },
            markersCom() {
                return this.markers.slice(0);
            },
            // circlesCom() {
            //     // let d = [...this.circles, ...this.jihecircles];
            //     let d = [{
            //         id: 1,
            //         latitude: +data.latlong[0],
            //         longitude: +data.latlong[1],
            //         iconPath: './map/img/dinw/dinw6.png',
            //     }, {
            //         id: 2,
            //         latitude: +data.latlong[0],
            //         longitude: +data.latlong[1],
            //         iconPath: './map/img/dinw/dinw6.png',
            //     }];
            //     return d;
            // },
            // markersCom() {
            //     let d = [...this.markers, ...this.jihemarkers];
            //     console.log(d, 6666)
            //     return d;
            // },
            // mypolylinesCom() {
            //     // console.log(this.mypolylines,"333333333333333333333")
            //     return this.mypolylines.slice(0);
@@ -595,8 +656,8 @@
                deep: true
            }
        },
        mounted() {},
        onReady() {
        // mounted() {},
        mounted() {
            let that = this;
            this.types = uni.getSystemInfoSync();
@@ -720,6 +781,8 @@
                    myid: 111,
                    myName: 222,
                    url: "http://223.82.109.183:2081/zhba/upload/20220218/67f0c8bf3e7b5024c64133691f265072.ico",
                    gather: "28.699957,115.862118",
                    gathername: "江西省南昌市红谷滩区沙井街道凤凰中大道南昌市公安局"
                    // })
                }
            } else {
@@ -746,8 +809,31 @@
            if (data.team) {
                data["teams"] = data.team.split(",");
            }
            if (data.gather) {
                data["latlong"] = data.gather.split(",");
            }
            that.ourData = data;
            this.latitude = +data.latlong[0];
            this.longitude = +data.latlong[1];
            that.markers[0].latitude = data.latlong[0];
            that.markers[0].longitude = data.latlong[1];
            that.circles[0].latitude = data.latlong[0];
            that.circles[0].longitude = data.latlong[1];
            //集合标记点
            // that.jihecircles = [{
            //     id: 444,
            //     latitude: +data.latlong[0],
            //     longitude: +data.latlong[1],
            //     iconPath: './map/img/dinw/dinw6.png',
            // }]
            // that.jihemarkers = [{ //在地图上显示圆
            //     latitude: +data.latlong[0],
            //     longitude: +data.latlong[1],
            //     fillColor: "#D9E6EF", //填充颜色
            //     color: "#A7B6CB", //描边的颜色
            //     radius: 20, //半径
            //     strokeWidth: 2 //描边的宽度
            // }]
            uni.getSystemInfo({ //初始化地图高度
                success(res) {
@@ -906,14 +992,14 @@
            let line = data.line.split("(")[1].split(")")[0].split(",");
            // 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({
                // latitude: line[0].split(" ")[1],
                // longitude: line[0].split(" ")[0]
                latitude: 40.013305,
                longitude: 118.685713
            });
            // this.latitude = line[0].split(" ")[1];
            // this.longitude = line[0].split(" ")[0];
            // this.map.moveToLocation({
            //     // latitude: line[0].split(" ")[1],
            //     // longitude: line[0].split(" ")[0]
            //     latitude: 40.013305,
            //     longitude: 118.685713
            // });
            let ourline = [];
            for (let k in line) {
                let ins = line[k].split(" ");
pages/grabOrders/grabOrdersZAYWXC/feedback.vue
@@ -67,7 +67,7 @@
        onBackPress(e) {
            console.log("监听返回按钮事件1", e);
            uni.redirectTo({
                url: "/pages/grabOrders/grabOrders"
                url: "/pages/grabOrders/grabOrdersZAYWXC/grabOrders?detailData=0"
            })
            // 此处一定姚要return为true,否则页面不会返回到指定路径
            return true;
pages/grabOrders/grabOrdersZAYWXC/grabOrders.vue
@@ -64,8 +64,8 @@
        },
        onBackPress(e) {
            console.log("监听返回按钮事件2", e);
            uni.switchTab({
                url: "/pages/home/home"
            uni.redirectTo({
                url: "/pages/grabOrders/grabOrdersMain/business"
            })
            // 此处一定姚要return为true,否则页面不会返回到指定路径
            return true;
@@ -181,10 +181,12 @@
                    d = {
                        serid: uni.getStorageSync("ids") || that.$store.state.puserID,
                        type: val + "",
                        tasktype:'1'
                    };
                if (val == 1) {
                    d.jurisdiction = this.$store.state.UserData.jurisdiction;
                    d.workjurisdiction = this.$store.state.UserData.workjurisdiction;
                }
                // console.log(that.$store.state.puserID)
                uni.request({
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>
pages/grabOrders/grabOrdersZAYWXC/map.vue
@@ -1,11 +1,10 @@
<template>
    <view class="content">
        <!-- <u-top-tips ref="uTips"></u-top-tips> -->
        <u-top-tips ref="uTips"></u-top-tips>
        <!-- <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="mypolylines"
            show-location="true">
        <map :scale='18' id="myMap" style="width: 100%" :style="{height: mapHeight + 'px'}" :markers="markers"
            :longitude="longitude" :latitude="latitude" :circles="circles" :polyline="mypolylines" show-location="true">
            <cover-view class="dingwBut" @click="mapControlsBack">
                <cover-image src="./map/img/dingwei.png" @click="mapControlsBack">
                </cover-image>
@@ -16,11 +15,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 +27,7 @@
            </view>
            <view class="once">
                <span class="once-left">
                    任务内容
                    宣传内容
                </span>
                <span class="once-right">
                    {{ourData.content}}
@@ -44,10 +43,18 @@
            </view>
            <view class="once">
                <span class="once-left">
                    任务地区
                    联系方式
                </span>
                <span class="once-right">
                    {{ourData.province}}&nbsp;-&nbsp;{{ourData.city}}&nbsp;-&nbsp;{{ourData.district}}
                    <span>{{ourData.phone}}</span>
                </span>
            </view>
            <view class="once">
                <span class="once-left">
                    集合点
                </span>
                <span class="once-right">
                    {{ourData.gathername}}
                </span>
            </view>
            <view class="once">
@@ -85,7 +92,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">
@@ -122,8 +129,38 @@
                mapHeight: 0,
                latitude: 28.687205773173343,
                longitude: 115.8995839881188,
                circles: [], //圆
                markers: [], //标记点
                circles: [{
                    latitude: '',
                    longitude: '',
                    fillColor: "#D9E6EF", //填充颜色
                    color: "#A7B6CB", //描边的颜色
                    radius: 50, //半径
                    strokeWidth: 2, //描边的宽度
                }, {
                    latitude: '',
                    longitude: '',
                    fillColor: "#D9E6EF", //填充颜色
                    color: "#A7B6CB", //描边的颜色
                    radius: 10, //半径
                    strokeWidth: 2, //描边的宽度
                }], //圆
                markers: [{
                    width: 40,
                    height: 40,
                    id: 1,
                    latitude: '',
                    longitude: '',
                    iconPath: 'http://223.82.109.183:2081/zhba/upload/20220225/f0aecffbaf0a2ce80f7938569da20de7.png',
                }, {
                    width: 40,
                    height: 40,
                    id: 2,
                    latitude: '',
                    longitude: '',
                    iconPath: 'http://223.82.109.183:2081/zhba/upload/20220225/7b486f647a15e708aca662dbd496dcd3.png',
                }], //标记点
                jihecircles: [], //集合点
                jihemarkers: [], //集合点
                mypolylines: [{ //指定一系列坐标点,从数组第一项连线至最后一项
                        points: [],
                        color: "#FE0000", //线的颜色
@@ -164,6 +201,7 @@
                    iconPath: "/static/tabbar/addSelectedIcon.png",
                    clickable: true,
                }], //地图控件
                inThere: true,
            }
        },
        methods: {
@@ -253,7 +291,7 @@
                                });
                                setTimeout(function() {
                                    uni.redirectTo({
                                        url: "/pages/grabOrders/grabOrders?in=true"
                                        url: "/pages/grabOrders/grabOrdersZAYWXC/grabOrders?in=true"
                                    })
                                }, 2200)
                            }
@@ -276,7 +314,8 @@
                        // }
                        this.bye = true;
                        uni.redirectTo({
                            url: '/pages/grabOrders/feedback?data=' + JSON.stringify(this.ourData) +
                            url: '/pages/grabOrders/grabOrdersZAYWXC/feedback?data=' + JSON.stringify(this
                                    .ourData) +
                                '&other="11111"'
                        });
                    } else if (that.ourData.butCT == "begin") {
@@ -322,10 +361,11 @@
                            rid: rid,
                            serid: serid,
                            type: type,
                            goto: "grabOrdersZAYWXC",
                            // data: JSON.stringify(item),
                            that: that,
                            fn: () => {
                                that.getGrabOrders(that.current); //重获取数据
                                // that.getGrabOrders(that.current); //重获取数据
                                // setTimeout(() => {
                                //     that.openOnce(item);
                                // }, 500)
@@ -440,27 +480,34 @@
                        that.longitude = res.longitude
                        // console.log(that.latitude)
                        // console.log(that.longitude)
                        that.map.moveToLocation({
                            latitude: res.latitude,
                            longitude: res.longitude
                        });
                        if (that.inThere) {
                            that.inThere = false;
                            that.map.moveToLocation({
                                latitude: res.latitude,
                                longitude: res.longitude
                            });
                        }
                        // that.mover(res.longitude, res.latitude); //移动
                        // that.$store.commit("setMsg",d)
                        //标记点
                        that.markers = [{
                            id: 1,
                            latitude: res.latitude,
                            longitude: res.longitude,
                            iconPath: './map/img/dinw/dinw1.png',
                        }]
                        that.circles = [{ //在地图上显示圆
                            latitude: res.latitude,
                            longitude: res.longitude,
                            fillColor: "#D9E6EF", //填充颜色
                            color: "#A7B6CB", //描边的颜色
                            radius: 10, //半径
                            strokeWidth: 2 //描边的宽度
                        }]
                        that.markers[1].latitude = res.latitude;
                        that.markers[1].longitude = res.longitude;
                        that.circles[1].latitude = res.latitude;
                        that.circles[1].longitude = res.longitude;
                        // that.markers = [{
                        //     id: 1,
                        //     latitude: res.latitude,
                        //     longitude: res.longitude,
                        //     iconPath: './map/img/dinw/dinw1.png',
                        // }]
                        // that.circles = [{ //在地图上显示圆
                        //     latitude: res.latitude,
                        //     longitude: res.longitude,
                        //     fillColor: "#D9E6EF", //填充颜色
                        //     color: "#A7B6CB", //描边的颜色
                        //     radius: 10, //半径
                        //     strokeWidth: 2 //描边的宽度
                        // }]
                        if (val != "notSet") {
                            let d = {
                                id: that.ourData.id,
@@ -556,10 +603,10 @@
                }
            },
            circlesCom() {
                return this.circles.slice(0);
                return [...this.circles.slice(0), ...this.jihecircles.slice(0)];
            },
            markersCom() {
                return this.markers.slice(0);
                return [...this.markers.slice(0), ...this.jihemarkers.slice(0)];
            },
            // mypolylinesCom() {
            //     // console.log(this.mypolylines,"333333333333333333333")
@@ -720,6 +767,8 @@
                    myid: 111,
                    myName: 222,
                    url: "http://223.82.109.183:2081/zhba/upload/20220218/67f0c8bf3e7b5024c64133691f265072.ico",
                    gather: "28.699957,115.862118",
                    gathername: "江西省南昌市红谷滩区沙井街道凤凰中大道南昌市公安局"
                    // })
                }
            } else {
@@ -746,8 +795,32 @@
            if (data.team) {
                data["teams"] = data.team.split(",");
            }
            if (data.gather) {
                data["latlong"] = data.gather.split(",");
            }
            that.ourData = data;
            this.latitude = data.latlong[0];
            this.longitude = data.latlong[1];
            //集合标记点
            that.markers[0].latitude = data.latlong[0];
            that.markers[0].longitude = data.latlong[1];
            that.circles[0].latitude = data.latlong[0];
            that.circles[0].longitude = data.latlong[1];
            // that.jihecircles = [{
            //     id: 444,
            //     latitude: data.latlong[0],
            //     longitude: data.latlong[1],
            //     iconPath: './map/img/dinw/dinw6.png',
            // }]
            // that.jihemarkers = [{ //在地图上显示圆
            //     latitude: data.latlong[0],
            //     longitude: data.latlong[1],
            //     fillColor: "#D9E6EF", //填充颜色
            //     color: "#A7B6CB", //描边的颜色
            //     radius: 20, //半径
            //     strokeWidth: 2 //描边的宽度
            // }]
            uni.getSystemInfo({ //初始化地图高度
                success(res) {
@@ -906,14 +979,14 @@
            let line = data.line.split("(")[1].split(")")[0].split(",");
            // 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({
                // latitude: line[0].split(" ")[1],
                // longitude: line[0].split(" ")[0]
                latitude: 40.013305,
                longitude: 118.685713
            });
            // this.latitude = line[0].split(" ")[1];
            // this.longitude = line[0].split(" ")[0];
            // this.map.moveToLocation({
            //     // latitude: line[0].split(" ")[1],
            //     // longitude: line[0].split(" ")[0]
            //     latitude: 40.013305,
            //     longitude: 118.685713
            // });
            let ourline = [];
            for (let k in line) {
                let ins = line[k].split(" ");
pages/home/home.vue
@@ -46,12 +46,12 @@
                        <view class="name">{{ item.name }}</view>
                    </navigator>
                </u-grid-item>
                <u-grid-item bg-color="transparent" key="8">
                <!-- <u-grid-item bg-color="transparent" key="8">
                    <navigator url="/pages/service/service" hover-class="none" class="service-item">
                        <image src="/static/images/home/s8.png" mode="widthFix" class="img"></image>
                        <view class="name">更多</view>
                    </navigator>
                </u-grid-item>
                </u-grid-item> -->
            </u-grid>
        </view>
        <!-- 服务按钮 end -->
@@ -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" @click="wxtsGo"></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}}
@@ -117,7 +118,7 @@
        </view>
        <u-toast ref="uToast" />
        <!-- 底部导航条 -->
        <u-tabbar :list="tabbar" :mid-button="true" height="50px" icon-size="40"></u-tabbar>
        <u-tabbar :list="tabbar" :mid-button="false" height="50px" icon-size="40"></u-tabbar>
    </view>
</template>
@@ -137,7 +138,7 @@
                status: 'loadmore',
                list: 15,
                page: 1,
                cout:1,
                cout: 1,
                pagesize: 2,
                keyword: '',
                focus: false,
@@ -146,9 +147,9 @@
                newsList: [],
                navButton: [],
                serviceButton: [],
                tabbar:this.$store.state.tabbar,
                tabbar: this.$store.state.tabbar,
                gdlist: [
                    '国家发改委:防止和避免“放松防控”和“过度防控”'
                    '南昌一波重磅“官宣”!来了!'
                ]
            };
        },
@@ -189,10 +190,20 @@
            }, 2000);
        },
        methods: {
            //温馨提示跳转页面
            wxtsGo(){
                //去跳转
                let detail = {
                    id: "991"
                };
                uni.navigateTo({
                    url: '../article/article_detail?detailData=' + JSON.stringify(detail)
                });
            },
            //点击更多跳转资讯页
            goArticle(){
            goArticle() {
                uni.switchTab({
                    url:'../article/article'
                    url: '../article/article'
                })
            },
            //去跳转详情页面
@@ -200,12 +211,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 +234,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
                    })
                }
            },
@@ -254,10 +260,13 @@
                    method: 'GET',
                    data: {
                        serid: that.$store.state.UserData.user_id,
                        jurisdiction: that.$store.state.UserData.jurisdiction
                        jurisdiction: that.$store.state.UserData.jurisdiction,
                        workjurisdiction: that.$store.state.UserData.workjurisdiction,
                    },
                    success: (res) => {
                        this.cout=res.data.data
                        var data = res.data.data;
                        var num = Number(data.px)  + Number(data.xcha) + Number(data.xchuan);
                        this.cout = num;
                    }
                });
            },
@@ -285,7 +294,7 @@
                                        //如果数量小于分页数量,则为最后一页
                                        this.status = 'loading';
                                    }
                                    res.data.data.records.forEach(item =>{
                                    res.data.data.records.forEach(item => {
                                        that.newsList.push(item);
                                    })
                                }
@@ -425,8 +434,8 @@
            }
        }
    }
    .notice-class{
    .notice-class {
        background: #ffffff;
        border-radius: 15px 15px 15px 15px;
        margin: 0 20rpx;
@@ -450,6 +459,7 @@
        .notice-info {
            flex: 1;
            .notice-cell:first-of-type {
                margin-bottom: 15rpx;
            }
@@ -586,13 +596,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;
                        }
pages/issue/issue.vue
@@ -41,7 +41,7 @@
            <u-button class="custom-style" type="primary" @click="inits"> 我发布</u-button>
        </view>
        <u-toast ref="uToast" />
        <u-tabbar :list="tabs" :mid-button="true"></u-tabbar>
        <u-tabbar :list="tabs" :mid-button="false"></u-tabbar>
    </view>
</template>
pages/myself/myself.vue
@@ -18,12 +18,12 @@
            </view>
        </view> 
        <view class="bomBut">
            <view class="attendance-btn">
            <!-- <view class="attendance-btn">
                <view class="attendance-info"  @click="goToAttendance()">
                    <image src="../../static/myself/clock01.png" class="attendance-image"/>
                    <view class="attendance-title">考勤打卡</view>
                </view>
            </view>
            </view> -->
            <view class="onceBut" v-for="(item, index) in inSide" :key="index" @click="openThere(item.open)">
                <view class="buts">
                    <image :src="item.imgSrc" mode=""></image>
@@ -38,7 +38,7 @@
        </uniPopup>
        <u-toast ref="uToast" />
        <!-- 底部导航条 -->
        <u-tabbar :list="tabbar" :mid-button="true"></u-tabbar>
        <u-tabbar :list="tabbar" :mid-button="false"></u-tabbar>
    </view>
</template>
@@ -417,7 +417,7 @@
        .bomBut {
            width: 88%;
            margin: 0 auto;
            height: 24rem;
            height: 15rem;
            z-index: 999;
            border-radius: 2px;
            margin-top: -2.5rem;
static/img/dingwei.png
static/img/dinw/dinw1.png
static/img/dinw/dinw2.png
static/img/dinw/dinw3.png
static/img/dinw/dinw4.png
static/img/dinw/dinw5.png
static/img/dinw/dinw6.png
static/map/img/img/dingwei.png
static/map/img/img/dinw/dinw1.png
static/map/img/img/dinw/dinw2.png
static/map/img/img/dinw/dinw3.png
static/map/img/img/dinw/dinw4.png
static/map/img/img/dinw/dinw5.png
static/map/img/img/dinw/dinw6.png
store/apiConfig.js
@@ -1,9 +1,9 @@
let i = 1; //1是服务器
let i = 0; //1是服务器
if (i) {
    var api = 'http://223.82.109.183:2082/api/';
    var wsapi = 'ws://223.82.109.183:2082/wss/websocket';
} else {
    var api = 'http://192.168.0.198/';
    var api = 'http://192.168.0.108:83/';
    var wsapi = 'ws://192.168.0.108:9034/websocket';
}
store/positions.js
@@ -89,15 +89,21 @@
                serid = val.serid,
                type = val.type,
                that = val.that,
                goto1 = val.goto,
                // data = val.data,
                tips = (type, title) => {
                    that.$refs.uTips.show({
                        title: title,
                        type: type,
                        duration: '2300'
                    })
                    if (that.$refs.uTips) {
                        that.$refs.uTips.show({
                            title: title,
                            type: type,
                            duration: '2300'
                        })
                    }
                    // that.getGrabOrders(that.current); //重获取数据
                }
            if (type == "start") {
                type = goto1 + ',' + type
            }
            uni.request({
                url: $store.state.piAPI + "taskqd/startTask?" +
                    `rid=${rid}&serid=${serid}&type=${type}`,
store/state.js
@@ -32,16 +32,16 @@
            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: "发布",
            midButton: true,
        },
        // {
        //     pagePath: "/pages/issue/issue",
        //     iconPath: "/static/tabbar/addIcon.png",
        //     selectedIconPath: "/static/tabbar/addSelectedIcon.png",
        //     text: "发布",
        //     midButton: true,
        // },
        {
            pagePath: "/pages/business/business",
            text: "工作台",
            text: "行业圈",
            iconPath: "/static/tabbar/workbench.png",
            selectedIconPath: "/static/tabbar/workbenchH.png"
        },
store/websocket.js
@@ -60,7 +60,7 @@
            state.socket = value;
        },
        setSocketValue(state, value) {
            // console.log(value)
            console.log(value, 222222222222)
            // if (value.router) { //正常数据返回
            //     //去除心跳数据
            //     if (value.router == 'share/heartbeat') {
@@ -72,17 +72,30 @@
            // } else { //异常数据返回
            //     console.log(value, '异常')
            // }
            if (state.socketValue.type === "start") {
            let route;
            let type;
            let types111 = state.socketValue.type.split(",");
            if (types111.length > 1) {
                route = types111[0];
                type = types111[1];
            } else {
                type = types111[0];
            }
            console.log()
            if (type === "start") {
                let types = uni.getSystemInfoSync().platform;
                let
                    d = {
                        serid: uni.getStorageSync("ids") || $store.state.puserID,
                        type: 0,
                        tasktype: route == "grabOrdersZAXC" ? 0 : (route == "grabOrdersZAYWXC" ? 1 : 2)
                    };
                let routes = getCurrentPages(); //获取当前页面栈
                let curRoute = routes[routes.length - 1].route; //获取当前页面的路由
                // console.log(curRoute)
                // return
                // let
                uni.request({
                    url: $store.state.piAPI + "taskqd/selectLi",
                    method: "POST",
@@ -105,16 +118,20 @@
                                    isOn: true
                                });
                                console.log(val)
                                if (types == "android", curRoute != "pages/grabOrders/map") {
                                let url = "/pages/grabOrders/map?data=" + JSON.stringify(val);
                                if (route) {
                                    url = "/pages/grabOrders/" + route + "/map?data=" + JSON.stringify(val);
                                }
                                console.log(url)
                                // if (types == "android", curRoute != "pages/grabOrders/map") {
                                if (curRoute != "pages/grabOrders/map") {
                                    uni.navigateTo({
                                        url: "/pages/grabOrders/map?data=" + JSON.stringify(
                                            val),
                                        url: url,
                                    });
                                    return
                                }
                                uni.redirectTo({
                                    url: "/pages/grabOrders/map?data=" + JSON.stringify(val),
                                    url: url,
                                });
                            } else {
                                continue;
unpackage/res/icons/1024x1024.png

unpackage/res/icons/120x120.png

unpackage/res/icons/144x144.png

unpackage/res/icons/152x152.png

unpackage/res/icons/167x167.png

unpackage/res/icons/180x180.png

unpackage/res/icons/192x192.png

unpackage/res/icons/20x20.png

unpackage/res/icons/29x29.png

unpackage/res/icons/40x40.png

unpackage/res/icons/58x58.png

unpackage/res/icons/60x60.png

unpackage/res/icons/72x72.png

unpackage/res/icons/76x76.png

unpackage/res/icons/80x80.png

unpackage/res/icons/87x87.png

unpackage/res/icons/96x96.png