更新

Lou

2024-04-11 d2fc0a397f1f6ea67e4889e47f1dc8755f944b88

更新

 common/setting.js

@@ -10,8 +10,8 @@
    version: '2.0.0',
    // 开发环境接口Url
    // devUrl: 'http://z4042833u6.wicp.vip',
    devUrl: 'http://192.168.2.111:9528',
    // devUrl: 'https://srgdjczzxtpt.com:2080/api',
    // devUrl: 'http://192.168.2.111:9528',
    devUrl: 'https://srgdjczzxtpt.com:2080/api',
    // devUrl: 'https://kt39592615.goho.co',
    minioBaseUrl: "https://srgdjczzxtpt.com:2080/gminio/jczz/",
    // minioBaseUrl: "http://192.168.0.101:9528/",

 pages/circle/index.vue

@@ -158,7 +158,7 @@
            let accountInfo = wx.getAccountInfoSync();
            this.envVersion = accountInfo.miniProgram.envVersion;
            let role = uni.getStorageSync('activeRole')
            if (role.roleName == "居民") {
            if (role.roleName == "居民" || role.roleName == '无诈') {
                this.tabList = getTabbarList(1);
                this.roleType = 0
            } else {

 pages/home/index.scss

@@ -63,6 +63,9 @@
        background-color: rgb(236,244,255);
        border:1px solid currentColor;
    }
    .search-content-text{
        width:80%;
    }
    .mask{
        position: fixed;
        width:100%;

 pages/home/index.vue

@@ -12,12 +12,13 @@
        <!-- <view class="search-bar" :style="{background:background.top}">

            <u-search placeholder="请输入关键字" v-model="keyword" :showAction="true" actionText="搜索" :animation="true"

                :actionStyle="{color:'#fff'}" bgColor="#fff" @change="changeKeyword"></u-search>

            <view class="mask"></view>

            <view class="search-content bgc-ff">

            <view class="mask" v-if="searchList.length"></view>

            <view class="search-content bgc-ff" v-if="searchList.length">

                <scroll-view class="search-scroll" :scroll-y="true">

                    <view class="search-content-row flex j-c-s-b a-i-c" v-for="i in 5">

                        <text class="f-28">万达华府</text>

                        <view class="search-tag f-26 c-main">房屋</view>

                    <view class="search-content-row flex j-c-s-b a-i-c" v-for="(i,k) in searchList" :key="k"

                        @click="searchLink(i)">

                        <text class="search-content-text f-28">{{i.title}}</text>

                        <view class="search-tag f-26 c-main">{{i.typeName}}</view>

                    </view>

                </scroll-view>

            </view>

@@ -193,21 +194,21 @@
                                <u-grid-item @click="navigatorPage('/subPackage/label/form')"

                                    v-if="curSelectSite.isFront == 1">

                                    <view class="nav-item flex f-d-c a-i-c">

                                        <u-icon name="/static/icon/nav-11.png" width="80rpx" height="80rpx"></u-icon>

                                        <u-icon name="/static/icon/nav-25.png" width="80rpx" height="80rpx"></u-icon>

                                        <text class="nav-item-text f-26  mt-10">二手交易</text>

                                    </view>

                                </u-grid-item>

                                <u-grid-item @click="navigatorPage('/subPackage/label/check')"

                                    v-if="curSelectSite.isNine == 1">

                                    <view class="nav-item flex f-d-c a-i-c">

                                        <u-icon name="/static/icon/nav-11.png" width="80rpx" height="80rpx"></u-icon>

                                        <u-icon name="/static/icon/nav-23.png" width="80rpx" height="80rpx"></u-icon>

                                        <text class="nav-item-text f-26  mt-10">消防自查</text>

                                    </view>

                                </u-grid-item>

                                <u-grid-item @click="navigatorPage('/subPackage/counterfraud/addReport')"

                                    v-if="curSelectSite.noExplosionCategory">

                                    <view class="nav-item flex f-d-c a-i-c">

                                        <u-icon name="/static/icon/nav-11.png" width="80rpx" height="80rpx"></u-icon>

                                        <u-icon name="/static/icon/nav-27.png" width="80rpx" height="80rpx"></u-icon>

                                        <text class="nav-item-text f-26  mt-10">无诈上报</text>

                                    </view>

                                </u-grid-item>

@@ -370,7 +371,7 @@
                time: 0,

                userGPS: false,

                location: {},

                roleType: 2, // 1网格员/系统管理员 、  2居民   3民警

                roleType: 2, // 1网格员/系统管理员 、  2居民   3民警  4无诈

                roleTypeName: "街道社区网格",

                selectBoxShow: false,

                siteColumns: [],

@@ -443,22 +444,22 @@
                            //     path: '/subPackage/bs/views/repair'

                            // },

                            {

                                icon: "/static/icon/nav-02.png",

                                icon: "/static/icon/nav-20.png",

                                text: "公共维修",

                                path: "/subPackage/bs/views/addRepair?title=公共维修&type=1"

                            },

                            {

                                icon: "/static/icon/nav-02.png",

                                icon: "/static/icon/nav-21.png",

                                text: "居家维修",

                                path: "/subPackage/bs/views/addRepair?title=居家维修&type=2"

                            },

                            {

                                icon: "/static/icon/nav-04.png",

                                icon: "/static/icon/nav-19.png",

                                text: "矛盾纠纷",

                                path: "/subPackage/bs/views/addRepair?title=矛盾纠纷&type=3"

                            },

                            {

                                icon: "/static/icon/nav-11.png",

                                icon: "/static/icon/nav-22.png",

                                text: "投诉举报",

                                path: "/subPackage/bs/views/addRepair?title=投诉举报&type=4"

                            },

@@ -483,6 +484,7 @@
                            }

                        ]

                    },



                    {

                        name: '社区服务',

                        list: [{

@@ -516,22 +518,22 @@
                tabs2: [{

                        name: '公众服务',

                        list: [{

                                icon: "/static/icon/nav-02.png",

                                icon: "/static/icon/nav-20.png",

                                text: "公共维修",

                                path: "/subPackage/bs/views/addRepair?title=公共维修&type=1"

                            },

                            {

                                icon: "/static/icon/nav-02.png",

                                icon: "/static/icon/nav-21.png",

                                text: "居家维修",

                                path: "/subPackage/bs/views/addRepair?title=居家维修&type=2"

                            },

                            {

                                icon: "/static/icon/nav-04.png",

                                icon: "/static/icon/nav-19.png",

                                text: "矛盾纠纷",

                                path: "/subPackage/bs/views/addRepair?title=矛盾纠纷&type=3"

                            },

                            {

                                icon: "/static/icon/nav-11.png",

                                icon: "/static/icon/nav-22.png",

                                text: "投诉举报",

                                path: "/subPackage/bs/views/addRepair?title=投诉举报&type=4"

                            },

@@ -594,22 +596,22 @@
                tabs3: [{

                        name: '公众服务',

                        list: [{

                                icon: "/static/icon/nav-02.png",

                                icon: "/static/icon/nav-20.png",

                                text: "公共维修",

                                path: "/subPackage/bs/views/addRepair?title=公共维修&type=1"

                            },

                            {

                                icon: "/static/icon/nav-02.png",

                                icon: "/static/icon/nav-21.png",

                                text: "居家维修",

                                path: "/subPackage/bs/views/addRepair?title=居家维修&type=2"

                            },

                            {

                                icon: "/static/icon/nav-04.png",

                                icon: "/static/icon/nav-19.png",

                                text: "矛盾纠纷",

                                path: "/subPackage/bs/views/addRepair?title=矛盾纠纷&type=3"

                            },

                            {

                                icon: "/static/icon/nav-11.png",

                                icon: "/static/icon/nav-22.png",

                                text: "投诉举报",

                                path: "/subPackage/bs/views/addRepair?title=投诉举报&type=4"

                            },

@@ -671,7 +673,8 @@
                    banner: "linear-gradient(180deg, #017BFC 0%, rgba(1, 123, 252, 0) 100%)"

                },

                tabList: [],

                keyword: ""

                keyword: "",

                searchList: []

            }

        },



@@ -754,8 +757,8 @@
                    this.tabs.splice(1, 0, {

                        name: '警务服务',

                        list: [{

                            icon: "/static/icon/nav-11.png",

                            text: "取保候审",

                            icon: "/static/icon/nav-26.png",

                            text: "取保监居",

                            path: '/subPackage/label/bail'

                        }]

                    })

@@ -784,12 +787,35 @@
            // },



            changeKeyword(val) {



                console.log(val);

                searchContent({

                    searchKey: val

                    searchKey: val,

                    current: 1,

                    size: 90,

                    indexName: "jczz"

                }).then(res => {

                    console.log(res)

                    this.searchList = res.data.records;

                })

            },





            searchLink(item) {

                //通知公告，经营场所，房屋，住户

                switch (item.typeName) {

                    case "通知公告":

                        uni.navigateTo({

                            url: "/subPackage/article/detail?id=${item.tableId}&type=${item.type}"

                        })



                        break;

                    case "经营场所":

                        break;

                    case "房屋":

                        break;

                    default:

                        break;

                }

            },





@@ -924,6 +950,14 @@
                    this.$set(this.background, "banner",

                        "linear-gradient(180deg, #017BFC 0%, rgba(1, 123, 252, 0) 99%)");



                } else if (roleName == '无诈') {

                    this.tabList = getTabbarList(1);

                    type = 2

                    this.roleType = 4

                    this.roleTypeName = "居民"

                    this.$set(this.background, "top", "#017BFC");

                    this.$set(this.background, "banner",

                        "linear-gradient(180deg, #017BFC 0%, rgba(1, 123, 252, 0) 99%)");

                } else if (roleName == '民警') {

                    this.tabList = getTabbarList(2);

                    type = 1

@@ -1125,9 +1159,9 @@
                    } else {

                        this.isBailer = false;

                        let itemIndex = this.tabs.findIndex(item => item.name.trim() == "警务服务")

                        if (itemIndex != -1) {

                            this.tabs.splice(itemIndex, 1);

                        }

                        // if (itemIndex != -1) {

                        //     this.tabs.splice(itemIndex, 1);

                        // }



                    }

                    return;


 pages/login/login-account.vue

@@ -278,8 +278,8 @@
    }

    .title-img {
        width: 650rpx;
        height: 49rpx;
        width: 408rpx;
        height: 104rpx;
        display: block;
        margin: 320rpx 0 120rpx;
    }

 pages/statistics/index.vue

@@ -325,6 +325,9 @@
            let {
                roleName
            } = uni.getStorageSync("activeRole");



            if (roleName == "网格员") {
                this.tabList = getTabbarList(3);
                // this.tabbarIndex = 1;

 pages/user/center.vue

@@ -129,7 +129,7 @@
        onShow() {
            // this.getUserInfo();
            let role = uni.getStorageSync('activeRole')
            if (role.roleName == "居民") {
            if (role.roleName == "居民" || role.roleName == '无诈') {
                this.tabbarList = getTabbarList(1)
                this.roleType = 1
                this.color = "#017BFC"

 static/icon/login-title.png

 static/icon/nav-23.png

 static/icon/nav-24.png

 static/icon/nav-25.png

 static/icon/nav-26.png

 static/icon/nav-27.png

 subPackage/counterfraud/addReport.vue

@@ -6,7 +6,7 @@
                    <u-form :model="info" ref="form">
                        <block v-for="(i,k) in item.children">
                            <view class="f-30 c-33">
                                {{i.title}}
                                {{k+1}}、{{i.title}}
                            </view>
                            <!-- <u-form-item labelWidth="90" label="隐患" prop="gateStatus">
                                <view class="btn-group flex">
@@ -21,7 +21,7 @@
                                </view>
                            </u-form-item> -->
                            <view class="">
                                <u-form-item labelWidth="100" label="照片" prop="gateStatus">
                                <u-form-item labelWidth="100" label="附件" prop="gateStatus">
                                    <u-upload :fileList="i.urls" :previewFullImage="uploadConfig.previewFullImage"
                                        :accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple"
                                        :maxCount="uploadConfig.maxCount" :capture="uploadConfig.capture"
@@ -33,10 +33,10 @@
                                        </view>
                                    </u-upload>
                                </u-form-item>
                                <u-form-item labelWidth="100" label="描述" prop="gateStatus">
                                <!-- <u-form-item labelWidth="100" label="描述" prop="gateStatus">
                                    <u-textarea v-model="i.remark" placeholder="请输入描述"
                                        placeholderClass="c-99 f-26"></u-textarea>
                                </u-form-item>
                                </u-form-item> -->
                            </view>
                        </block>
                    </u-form>
@@ -198,7 +198,7 @@
                        for (let k = 0, kk = data[i].children.length; k < kk; k++) {
                            // this.info.patrolRecordVOList.push(obj);
                            data[i].children[k].urls = [];
                            data[i].children[k].remark = "";
                            // data[i].children[k].remark = "";
                            count += 1;
                        }
                    }
@@ -231,7 +231,7 @@
                            itemId: this.questionList[i].children[k].id,
                            // state: this.questionList[i].children[k].state,
                            imageUrls: this.setImages(this.questionList[i].children[k].urls),
                            remark: this.questionList[i].children[k].remark || ""
                            // remark: this.questionList[i].children[k].remark || ""
                        })
                        // if (this.questionList[i].children[k].state == 0) {
                        //     count += 1;

 subPackage/workbench/views/counterfraudReportDetail.vue

@@ -58,7 +58,7 @@
                            <u-collapse-item :name="n.itemId" :title="i.title" :disabled="true" :clickable="false"
                                :isLink="false">
                                <view class="mb-20" v-if="n.imageUrls">
                                    <view class="f-26 mb-10 c-00">照片</view>
                                    <view class="f-26 mb-10 c-00">附件</view>
                                    <view class="flex flex-wrap">
                                        <view class="mr-20" v-for="r in ($setImageUrl(n.imageUrls))">
                                            <u-image :src="r" width="140rpx" height="140rpx"
@@ -67,12 +67,12 @@
                                    </view>
                                </view>

                                <view class="mb-20" v-if="n.remark">
                                <!-- <view class="mb-20" v-if="n.remark">
                                    <view class="f-26 mb-10 c-00">描述</view>
                                    <view class="f-28 c-00">
                                        {{n.remark}}
                                    </view>
                                </view>
                                </view> -->

                                <!-- <view class="mb-20" v-if="roleType == 2 || (roleType == 1 && n.rectificationImageUrls)">
                                    <view class="f-26 mb-10 c-00">整改后照片</view>