Lou
2024-03-04 fb8db39ccdca6ca638b3e133d186cb3fe6a558bc
更新
6 files modified
345 ■■■■■ changed files
subPackage/article/detail.vue 146 ●●●●● patch | view | raw | blame | history
subPackage/article/signature.vue 144 ●●●●● patch | view | raw | blame | history
subPackage/house/roomControl/index.vue 28 ●●●●● patch | view | raw | blame | history
subPackage/task/index.vue 6 ●●●● patch | view | raw | blame | history
subPackage/workbench/views/editExamine.vue 18 ●●●●● patch | view | raw | blame | history
subPackage/workbench/views/examine.vue 3 ●●●●● patch | view | raw | blame | history
subPackage/article/detail.vue
@@ -67,7 +67,7 @@
                    <view class="vote bgc-ff">
                        <view class="mb-20" v-for="(item,index) in voteTopicList" :key="index">
                            <view class="vote-title">
                                <!-- <text class="f-30 fw">{{item.discussContent}}</text> -->
                                <text class="f-30 fw">{{item.discussContent}}</text>
                                <text class="f-26 ml-10">{{item.optionRange == 0?"(单选)":"(多选)"}}</text>
                            </view>
                            <view class="" v-if="item.optionRange == 0">
@@ -153,6 +153,27 @@
                <u-icon name="thumb-up-fill" size="22"  color="#fff"></u-icon>
            </view>
        </view> -->
        <u-popup :show="isShowPopup" @close="isShowPopup = false" mode="center" :round="10" :closeable="true">
            <view class='login-mode'>
                <view class="f-30 fw">
                    安全验证
                </view>
                <view class="f-30 mt-30">
                    {{phone}}
                </view>
                <view class='flex a-i-c login-input'>
                    <input class='f-30 c-33' type='number' placeholder='请输入验证码' v-model="validationCode"
                        placeholder-class='c-aa f-28'></input>
                    <button class='login-input-btn f-24 c-33' @click='getValidationCode'>{{text}}</button>
                </view>
                <!--     <button class='login-btn c-ff f-30' :class='validationCode?"bgc-main":""'
                    :disabled="validationCode?false:true">确定</button> -->
                <button class='login-btn c-ff f-30 bgc-main' @click="confirmValidationCode()">确定</button>
            </view>
        </u-popup>
    </view>
</template>
@@ -188,7 +209,11 @@
                isComplete: false, // 是否完成全部投票
                UParseStyle: {
                    img: 'width: 100%; float: left;'
                }
                },
                isShowPopup: false,
                validationCode: "",
                phone: "",
                text: "获取验证码"
            }
        },
        onLoad(option) {
@@ -205,6 +230,10 @@
            uni.$on('refreshComment', () => {
                this.getAritcleComment()
            })
            let {
                phone
            } = uni.getStorageSync("userInfo")
            this.phone = `${phone.substr(0,4)}****${phone.substr(8)}`
        },
        computed: {
@@ -387,6 +416,12 @@
                return arr;
            },
            confirmValidationCode() {
                this.voteRequest()
            },
            //提交投票
            submitVote() {
                if (this.applyInfo.signatureFlag == 1) {
@@ -394,7 +429,8 @@
                        url: `signature?type=2`
                    })
                } else {
                    this.voteRequest()
                    this.isShowPopup = true;
                    // this.voteRequest()
                }
@@ -425,6 +461,7 @@
                        uni.showToast({
                            title: "操作成功"
                        })
                        this.isShowPopup = false;
                        this.$nextTick(() => {
                            this.getApplyDetail();
                            this.getVoteList();
@@ -438,7 +475,34 @@
                uni.navigateTo({
                    url: `comment?id=${this.params.id}`
                })
            }
            },
            getValidationCode() {
                // let phone_reg = /^1(3|4|5|6|7|8|9)\d{9}$/;
                // if (!phone_reg.test(this.phone)) {
                //     this.$showTips("手机号码有误~");
                //     return false;
                // }
                // this.sendValidationCode();
                let second = 60;
                let time = setInterval(() => {
                    second--
                    this.text = `${second}秒后获取`
                    if (second == 0 || this.data.isLogin) {
                        clearInterval(time);
                        this.text = "获取验证码";
                    }
                }, 1000)
            },
            sendValidationCode() {
            },
        }
    }
</script>
@@ -599,4 +663,78 @@
    .mb-30 {
        margin-bottom: 30rpx;
    }
    .login-mode {
        padding: 20rpx;
    }
    .login-input {
        height: 90rpx;
        border-radius: 45rpx;
        background-color: #f0f0f0;
        padding: 0 30rpx 0 40rpx;
        margin-top: 20rpx;
        width: 550rpx;
        box-sizing: border-box;
    }
    .login-input text {
        flex: 1;
    }
    .login-input input {
        height: 90rpx;
        width: 100%;
        // flex: 3
    }
    .login-input-btn {
        width: 200rpx;
        height: 60rpx;
        line-height: 60rpx;
        border-radius: 30rpx;
        padding: 0;
        margin: 0;
        transition: all ease-out .3s;
        border: none;
    }
    .login-input-btn::after {
        border: none;
    }
    .login-input-btn[disabled] {
        background-color: #fff !important;
        color: #aaa !important;
    }
    .login-explain {
        margin-top: 10rpx;
    }
    .login-btn {
        width: 550rpx;
        height: 90rpx;
        line-height: 90rpx;
        border-radius: 45rpx;
        margin-top: 50rpx;
        transition: all ease-out .3s;
    }
    .login-btn[disabled] {
        background-color: #9DB9F7 !important;
        color: #fff !important;
    }
    .c-aa {
        color: #aaa;
    }
    .c-33 {
        color: #333;
    }
    .mt-30 {
        margin-top: 30rpx;
    }
</style>
subPackage/article/signature.vue
@@ -7,6 +7,30 @@
                <image :src="imgUrl" mode="" style="width: 100%;"></image>
            </view>
        </view> -->
        <u-popup :show="isShowPopup" @close="isShowPopup = false" mode="center" :round="10" :closeable="true">
            <view class='login-mode'>
                <view class="f-30 fw">
                    安全验证
                </view>
                <view class="f-30 mt-30">
                    {{phone}}
                </view>
                <view class='flex a-i-c login-input'>
                    <input class='f-30 c-33' type='number' placeholder='请输入验证码' v-model="validationCode"
                        placeholder-class='c-aa f-28'></input>
                    <button class='login-input-btn f-24 bgc-ff c-33' @click='getValidationCode'>{{text}}</button>
                </view>
                <!--     <button class='login-btn c-ff f-30' :class='validationCode?"bgc-main":""'
                    :disabled="validationCode?false:true">确定</button> -->
                <button class='login-btn c-ff f-30 bgc-main' @click="confirmValidationCode()">确定</button>
            </view>
        </u-popup>
    </view>
</template>
@@ -35,12 +59,21 @@
                    url: prodUrl + "/blade-resource/oss/endpoint/put-file",
                    header: {},
                },
                isShowPopup: false,
                validationCode: "",
                phone: "",
                text: "获取验证码",
                imgSrc: ""
            }
        },
        onLoad(option) {
            this.type = option.type;
            this.getHeader()
            let {
                phone
            } = uni.getStorageSync("userInfo")
            this.phone = `${phone.substr(0,4)}****${phone.substr(8)}`
        },
        methods: {
@@ -83,12 +116,45 @@
                if (this.type == 1) {
                    prePage.$vm.applyRequest(src);
                } else {
                    prePage.$vm.voteRequest(src);
                    this.isShowPopup = true;
                    this.imgSrc = src;
                    // prePage.$vm.voteRequest(src);
                }
                uni.navigateBack({
                    delta: 2
                })
            }
            },
            confirmValidationCode() {
                let pages = getCurrentPages();
                let prePage = pages[pages.length - 2];
                prePage.$vm.voteRequest(this.imgUrl);
                this.isShowPopup = false;
            },
            getValidationCode() {
                // let phone_reg = /^1(3|4|5|6|7|8|9)\d{9}$/;
                // if (!phone_reg.test(this.phone)) {
                //     this.$showTips("手机号码有误~");
                //     return false;
                // }
                // this.sendValidationCode();
                let second = 60;
                let time = setInterval(() => {
                    second--
                    this.text = `${second}秒后获取`
                    if (second == 0 || this.data.isLogin) {
                        clearInterval(time);
                        this.text = "获取验证码";
                    }
                }, 1000)
            },
        }
    }
</script>
@@ -104,4 +170,78 @@
        margin: 20rpx;
        color: #aaaaaa;
    }
    .login-mode {
        padding: 20rpx;
    }
    .login-input {
        height: 90rpx;
        border-radius: 45rpx;
        background-color: #f0f0f0;
        padding: 0 30rpx 0 40rpx;
        margin-top: 20rpx;
        width: 550rpx;
        box-sizing: border-box;
    }
    .login-input text {
        flex: 1;
    }
    .login-input input {
        height: 90rpx;
        width: 100%;
        // flex: 3
    }
    .login-input-btn {
        width: 200rpx;
        height: 60rpx;
        line-height: 60rpx;
        border-radius: 30rpx;
        padding: 0;
        margin: 0;
        transition: all ease-out .3s;
        border: none;
    }
    .login-input-btn::after {
        border: none;
    }
    .login-input-btn[disabled] {
        background-color: #fff !important;
        color: #aaa !important;
    }
    .login-explain {
        margin-top: 10rpx;
    }
    .login-btn {
        width: 550rpx;
        height: 90rpx;
        line-height: 90rpx;
        border-radius: 45rpx;
        margin-top: 50rpx;
        transition: all ease-out .3s;
    }
    .login-btn[disabled] {
        background-color: #9DB9F7 !important;
        color: #fff !important;
    }
    .c-aa {
        color: #aaa;
    }
    .c-33 {
        color: #333;
    }
    .mt-30 {
        margin-top: 30rpx;
    }
</style>
subPackage/house/roomControl/index.vue
@@ -38,6 +38,18 @@
                            @delete="deletePic" uploadIcon="/static/icon/upload.png">
                        </u-upload>
                    </view>
                    <view class="pic">
                        <newBoxTitle title="房产证照片"></newBoxTitle>
                        <u-upload :fileList="propertyCertificateImg" :previewFullImage="uploadConfig.previewFullImage"
                            :accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple"
                            :maxCount="uploadConfig.maxCount" :capture="uploadConfig.capture"
                            @afterRead="afterReadImgs($event,'propertyCertificateImg')"
                            @delete="deletePics($event,'propertyCertificateImg')" uploadIcon="/static/icon/upload.png">
                        </u-upload>
                    </view>
                    <view class=" flex label-btn-box b-c-w" v-if="roleType == 2">
                        <newBoxTitle title="房屋标签"></newBoxTitle>
                        <view class="list">
@@ -199,7 +211,7 @@
                roleType: 1,
                showSelectDate: false,
                serveTime: Number(new Date()),
                propertyCertificateImg: []
            }
        },
        created() {
@@ -278,6 +290,10 @@
                        })
                    }
                    this.propertyCertificateImg = this.$setImageUrl(res.data.propertyCertificateImg, 2)
                    if (userHouseLabelVOList.length > 0) {
                        that.labelBtnList.forEach(e => {
                            userHouseLabelVOList.forEach(f => {
@@ -316,6 +332,16 @@
                    })
                    this.form.imageUrls = urls.join(",")
                }
                if (this.propertyCertificateImg.length > 0) {
                    let urls = []
                    this.propertyCertificateImg.forEach(e => {
                        urls.push(e.name)
                    })
                    this.form.propertyCertificateImg = urls.join(",")
                }
                const {
                    code,
                    data
subPackage/task/index.vue
@@ -213,6 +213,11 @@
                                i.count = data.zfrw;
                            } else if (i.name.trim() == "走访任务") {
                                i.count = data.zfrw;
                            } else if (i.name.trim() == "消防自查") {
                                i.count = data.xfzc;
                            } else if (i.name.trim() == "消防隐患整改") {
                                i.count = data.xfyhzg;
                            }
                        }
                        this.bailCount = data.qbhs
@@ -231,7 +236,6 @@
            navTo(url) {
                if (!url || url == "暂无") {
                    uni.showToast({
                        title: "功能开发中~",
subPackage/workbench/views/editExamine.vue
@@ -23,17 +23,19 @@
                    </u-form-item>
                    <u-form-item class="form-item" label="标准地址" required prop="houseCodeBinds"
                        @click="isShowPopup = true">
                        <u--input v-if="!addressNames" border="none" disabled disabledColor="#ffffff"
                        <u--input v-if="!addressNames.length" border="none" disabled disabledColor="#ffffff"
                            placeholder="请选择标准地址">
                        </u--input>
                        <u-textarea v-if="addressNames" border="none" :disabled="true" disabledColor="#ffffff"
                        <!-- <u-textarea v-if="addressNames" border="none" :disabled="true" disabledColor="#ffffff"
                            v-model="addressNames" placeholder="请选择标准地址">
                        </u-textarea>
                        </u-textarea> -->
                        <view v-if="addressNames.length">
                            <view class="f-28" v-for="i in addressNames">
                                {{i}}
                            </view>
                        </view>
                        <u-icon slot="right" name="arrow-right"></u-icon>
                    </u-form-item>
                </u-form>
            </view>
            <view class="license">
@@ -177,7 +179,7 @@
                placeList: [],
                isShowPopup: false,
                checkedPlace: [],
                addressNames: ""
                addressNames: []
            }
        },
        onShow() {
@@ -213,7 +215,7 @@
                this.$set(this.form, "houseCodeBinds", ids.join(","))
                this.addressNames = names.join(",");
                this.addressNames = names;
subPackage/workbench/views/examine.vue
@@ -9,10 +9,7 @@
        <view class="licence">
            <box-title title="营业执照" class="box-title"></box-title>
            <view class="info">
                <view class="f-30" v-if="!imageObj.imageUrls.length">未完善</view>
                <view class="images-box" v-for="(i,k) in imageObj.imageUrls" :key="k" v-if="imageObj.imageUrls.length">
                    <u-image width="80" height="80" :src="i" @click="preViewImg(i,imageObj.imageUrls)"></u-image>
                </view>