linwe
2024-06-21 5b33fa25f18d485fac7414637aa5e7579741f057
代码优化
10 files modified
131 ■■■■■ changed files
common/setting.js 5 ●●●●● patch | view | raw | blame | history
pages.json 7 ●●●● patch | view | raw | blame | history
pages/home/index.vue 5 ●●●●● patch | view | raw | blame | history
pages/user/center.vue 4 ●●● patch | view | raw | blame | history
subPackage/counterfraud/addReport.vue 2 ●●● patch | view | raw | blame | history
subPackage/house/components/userInfo.vue 60 ●●●● patch | view | raw | blame | history
subPackage/label/form.vue 34 ●●●●● patch | view | raw | blame | history
subPackage/school/security.vue 11 ●●●● patch | view | raw | blame | history
subPackage/task/index.vue 2 ●●● patch | view | raw | blame | history
subPackage/user/role/index.vue 1 ●●●● patch | view | raw | blame | history
common/setting.js
@@ -10,8 +10,8 @@
    version: '2.0.0',
    // 开发环境接口Url
    // devUrl: 'http://z4042833u6.wicp.vip',
    devUrl: 'http://localhost:9528',
    // devUrl: 'https://srgdjczzxtpt.com:2080/api',
    // devUrl: 'http://localhost: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/",
@@ -19,6 +19,7 @@
    prodUrl: 'https://srgdjczzxtpt.com:2080/api',
    // prodUrl: 'http://192.168.2.105:9528',
    uploadUrl: 'https://srgdjczzxtpt.com:2080/api',
    // uploadUrl: 'http://localhost:9528',
    // 后端数据的接收方式application/json;charset=UTF-8或者application/x-www-form-urlencoded;charset=UTF-8
    contentType: 'application/json;charset=UTF-8',
pages.json
@@ -321,7 +321,12 @@
                        "navigationBarTitleText": "二手交易",
                        "enablePullDownRefresh": false,
                        "navigationBarBackgroundColor": "#fff",
                        "navigationBarTextStyle": "black"
                        "navigationBarTextStyle": "black",
                        "usingComponents": {
                            // #ifdef MP-WEIXIN
                            "ocr-navigator": "plugin://ocr-plugin/ocr-navigator"
                            // #endif
                        }
                    }
                },
                {
pages/home/index.vue
@@ -30,7 +30,8 @@
        </view>
        <view class="content bgc-ff">
            <view class="">
                <view class="section flex j-c-s-a a-i-c" v-if="isShowContact && curSelectSite.addressType == 1">
                <view class="section flex j-c-s-a a-i-c"
                    v-if="isShowContact && (curSelectSite.addressType == 1 || curSelectSite.addressType == 2)">
                    <view class="section-item" v-for="(i,k) in contactList" :key="k" v-if="i.name"
                        @click="navigatorPage(`${i.path}?id=${i.id}`)">
                        <image class="section-item-bg" :src="i.bgImg" mode="aspectFill"></image>
@@ -919,7 +920,7 @@
                    let count = 0;
                    count += Number(data.bqsj) + Number(data.xfzc) + Number(data.xfyhzg) + Number(data.qbhs) +
                        Number(data.cssh) + Number(data.czsh) + Number(data.jzzsq) + Number(data.wztj) + Number(
                            data.xyaqyhpc) + Number(data.xyjfmd) + Number(data.xyyh);
                            data.xyaqjc) + Number(data.xyjfmd) + Number(data.xyyh);
                    this.taskCount = count
                })
            },
pages/user/center.vue
@@ -167,7 +167,9 @@
                // this.tabbarIndex = 1;
                this.tabbarIndex = 2
            }
            this.addressType = uni.getStorageSync("siteInfo").addressType;
            if (uni.getStorageSync("siteInfo")) {
                this.addressType = uni.getStorageSync("siteInfo").addressType;
            }
        },
        mounted() {
subPackage/counterfraud/addReport.vue
@@ -21,7 +21,7 @@
                                </view>
                            </u-form-item> -->
                            <view class="">
                                <u-form-item labelWidth="100" label="附件" prop="gateStatus">
                                <u-form-item labelWidth="40" label="附件" prop="gateStatus">
                                    <u-upload :fileList="i.urls" :previewFullImage="uploadConfig.previewFullImage"
                                        :accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple"
                                        :maxCount="uploadConfig.maxCount" :capture="uploadConfig.capture"
subPackage/house/components/userInfo.vue
@@ -49,6 +49,36 @@
                            </view>
                            <u-icon slot="right" name="arrow-right"></u-icon>
                        </u-form-item>
                        <u-form-item @click="showSelectBus('与业主关系','relationship')" class="form-item" labelWidth="120"
                            label="与业主关系" required prop="relationship">
                            <u--input border="none" v-model="selectDefaultName.relationship" disabled
                                disabledColor="#ffffff" placeholder="请选择与业主关系">
                            </u--input>
                            <u-icon slot="right" name="arrow-right"></u-icon>
                        </u-form-item>
                        <u-form-item class="form-item"
                            v-if="selectDefaultName.relationship && selectDefaultName.relationship =='租户'"
                            labelWidth="110" label="房东名称" prop="landlordName">
                            <u--input border="none" v-model="form.landlordName" placeholder="请输入房东名称">
                            </u--input>
                        </u-form-item>
                        <u-form-item class="form-item"
                            v-if="selectDefaultName.relationship && selectDefaultName.relationship =='租户'"
                            labelWidth="110" label="房东电话" prop="landlordPhone">
                            <u--input border="none" v-model="form.landlordPhone" placeholder="请输入房东电话">
                            </u--input>
                        </u-form-item>
                        <u-form-item class="form-item"
                            v-if="selectDefaultName.relationship && selectDefaultName.relationship =='租户'"
                            labelWidth="110" label="房东身份证" prop="landlordIdCard">
                            <u--input border="none" v-model="form.landlordIdCard" placeholder="请输入房东身份证">
                            </u--input>
                        </u-form-item>
                        <u-form-item @click="showSelectBus('民族','ethnicity')" class="form-item" labelWidth="110"
                            label="民族" prop="ethnicity">
                            <u--input border="none" v-model="selectDefaultName.ethnicityValue" disabled
@@ -96,36 +126,6 @@
                        <u-form-item v-if="volunteerOrg == '其他'" required class="form-item" labelWidth="120"
                            label="其他志愿者组织" prop="volunteerOrg">
                            <u--input border="none" v-model="form.volunteerOrg" placeholder="请输入其他志愿者组织">
                            </u--input>
                        </u-form-item>
                        <u-form-item @click="showSelectBus('与业主关系','relationship')" class="form-item" labelWidth="120"
                            label="与业主关系" required prop="relationship">
                            <u--input border="none" v-model="selectDefaultName.relationship" disabled
                                disabledColor="#ffffff" placeholder="请选择与业主关系">
                            </u--input>
                            <u-icon slot="right" name="arrow-right"></u-icon>
                        </u-form-item>
                        <u-form-item class="form-item"
                            v-if="selectDefaultName.relationship && selectDefaultName.relationship =='租户'"
                            labelWidth="110" label="房东名称" prop="landlordName">
                            <u--input border="none" v-model="form.landlordName" placeholder="请输入房东名称">
                            </u--input>
                        </u-form-item>
                        <u-form-item class="form-item"
                            v-if="selectDefaultName.relationship && selectDefaultName.relationship =='租户'"
                            labelWidth="110" label="房东电话" prop="landlordPhone">
                            <u--input border="none" v-model="form.landlordPhone" placeholder="请输入房东电话">
                            </u--input>
                        </u-form-item>
                        <u-form-item class="form-item"
                            v-if="selectDefaultName.relationship && selectDefaultName.relationship =='租户'"
                            labelWidth="110" label="房东身份证" prop="landlordIdCard">
                            <u--input border="none" v-model="form.landlordIdCard" placeholder="请输入房东身份证">
                            </u--input>
                        </u-form-item>
subPackage/label/form.vue
@@ -3,6 +3,20 @@
        <u-form labelPosition="left" :model="info" :rules="rules" ref="form" labelWidth="120"
            :labelStyle="{fontSize:'28rpx'}">
            <view class="flex j-c-s-b a-i-c bgc-ff" style="padding:24rpx; margin: 20rpx 30rpx;">
                <!-- <view class="box-title" style="width:50%;">
                    <box-title title="房东信息"></box-title>
                </view> -->
                <!-- #ifdef MP-WEIXIN -->
                <ocr-navigator @onSuccess="recognizeSuccess($event)" certificateType="idCard" :opposite="false">
                    <view class="recognize-btn flex a-i-c">
                        <u-icon name="scan" color="#fff" size="24"></u-icon>
                        <text class="f-26 c-ff" style="margin-left: 10rpx;">身份证信息识别</text>
                    </view>
                </ocr-navigator>
                <!-- #endif -->
            </view>
            <view class="content">
                <u-form-item label="场所名称" prop="districtName" borderBottom required>
                    <u-input v-model="info.districtName" border="none" placeholder="请输入" placeholderClass="f-28 c-99"
@@ -238,6 +252,19 @@
            this.$refs.form.setRules(this.rules)
        },
        methods: {
            //识别成功
            recognizeSuccess(e, key) {
                let {
                    detail: {
                        name,
                        id
                    }
                } = e;
                this.info.owner = name.text;
                this.info.idCard = id.text;
            },
            getPlaceDetail(houseCode) {
                getPlaceDetail({
                    houseCode: houseCode
@@ -406,6 +433,13 @@
        background-color: #F5F5F5;
    }
    .recognize-btn {
        padding: 12rpx;
        border-radius: 6rpx;
        background-color: #3c9cff;
        margin-left: 30rpx;
    }
    .content {
        margin: 20rpx 30rpx;
        padding: 0 30rpx;
subPackage/school/security.vue
@@ -10,7 +10,7 @@
        </view>
        <view class="info-row flex j-c-s-b a-i-c bgc-ff" @click="isShowPopup = true" v-if="!from">
            <text class="f-28">校园名称:</text>
            <text class="f-28"><text>* </text> 校园名称:</text>
            <view class="flex">
                <text class="mr-10">{{selectedPlace.placeName}}</text>
                <u-icon name="arrow-right"></u-icon>
@@ -104,10 +104,6 @@
                            <text class="f-28 fw mr-20">{{i.placeName}}</text>
                            <text class="f-26" v-if="i.phoneNumber">{{i.phoneNumber}}</text>
                        </view>
                        <!--
                        <view class="f-28">
                            {{i.townStreetName}}{{i.neiName}}{{i.aoiName}}{{i.address || ""}}
                        </view> -->
                        <view class="check-icon" v-if="i.houseCode == info.houseCode">
                            <u-icon name="checkbox-mark" color="#017BFC" size="30"></u-icon>
                        </view>
@@ -483,6 +479,10 @@
                    this.$showTips("还未完善");
                    return;
                }
                if (!this.selectedPlace.placeName) {
                    this.$showTips("场所名称不能为空");
                    return;
                }
                this.info.taskPlaceRecordVOList = this.getSelected()
@@ -544,6 +544,7 @@
            selectPlace(item) {
                this.selectedPlace = item;
                this.selectedPlace.address = item.location
                this.info.houseCode = item.houseCode;
                this.isShowPopup = false;
            },
subPackage/task/index.vue
@@ -240,7 +240,7 @@
                            } else if (i.name.trim() == "校园纠纷矛盾") {
                                i.count = data.xyjfmd;
                            } else if (i.name.trim() == "校园安全检查") {
                                i.count = data.xyaqyhpc;
                                i.count = data.xyaqjc;
                            } else {
                                i.count = data.qbhs;
                            }
subPackage/user/role/index.vue
@@ -92,6 +92,7 @@
                        icon: "success",
                        duration: 1500,
                        success: () => {
                            uni.removeStorageSync("siteInfo")
                            uni.$emit("refresh")
                            setTimeout(() => {
                                this.$u.func.globalNavigator("/pages/home/index",