Merge branch 'master' of http://192.168.0.105:10010/r/qfqk-android

liuyg

2022-02-25 95c1b3b51b7a79338a72f5f2d12784a7e2668909

Merge branch 'master' of http://192.168.0.105:10010/r/qfqk-android

 pages/grabOrders/grabOrdersMain/business.vue

@@ -7,12 +7,13 @@
            <view class="head-bg"></view>
            <!-- 我的订阅 start -->
            <view class="card sub">
                <view class="title">常用工具</view>
                <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>
@@ -50,20 +51,24 @@
                bashow:false,
                dataOne: [{
                    title: '治安巡查',
                    img: '/static/workbench/task1.png',
                    url: '../grabOrdersZAXC/grabOrders'
                    img: '/static/workbench/task2.png',
                    url: '../grabOrdersZAXC/grabOrders',
                    cout: 0
                }, {
                    title: '治安义务宣传',
                    img: '/static/workbench/task2.png',
                    url: '../grabOrdersZAYWXC/grabOrders'
                    img: '/static/workbench/task1.png',
                    url: '../grabOrdersZAYWXC/grabOrders',
                    cout: 0
                }, {
                    title: '治安防范培训',
                    img: '/static/workbench/task3.png',
                    url: '../grabOrdersZAFFPX/grabOrders'
                    url: '../grabOrdersZAFFPX/grabOrders',
                    cout: 0
                }, {
                    title: '保安管理',
                    img: '/static/workbench/task8.png',
                    url: ''
                    img: '/static/workbench/task4.png',
                    url: '',
                    cout: 0
                }],
                dataTwo: [{
                        title: '电子证件',
@@ -82,18 +87,40 @@
                ]
            };
        },
        onShow() {
            this.getNum();
        },
        onLoad() {

        },
        mounted() {
            if (this.$store.state.UserData.stype != "1") {
                this.$refs.uToast.show({
                    title: '功能暂未开放',
                    type: 'warning',
                });
            }
            // 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"){
@@ -197,14 +224,14 @@
                margin: 0 17rpx;
            }

            &::after {
                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;
            // }
        }
    }


 pages/home/home.vue

@@ -211,7 +211,6 @@
                let detail = {
                    id: e.id
                };
                debugger
                if (e.articleType.indexOf("ksp") != -1) {
                    //去跳转
                    uni.navigateTo({