优化，修复部分问题

Lou

2023-12-12 7ff75b238bff187a8796d347153493724988a06d

优化，修复部分问题

 common/common.js

@@ -8,7 +8,7 @@
 *  @param {Number} type 回显类型    1普通回显   2上传回显
 */
export const setImageUrl = (str, type = 1) => {
    if (!str) {
    if (str) {
        let strArr = str.split(",")
        let urls = [];
        if (type == 1) {

 common/setting.js

@@ -14,8 +14,8 @@
    // devUrl:'http://192.168.1.50:9528',
    // devUrl: 'http://192.168.0.102:9528',
    // devUrl:'https://srgdjczzxtpt.com:2080/api',
    devUrl: 'http://192.168.0.102:9528',
    // devUrl: 'https://srgdjczzxtpt.com:2080/api',
    // devUrl: 'http://192.168.0.102:9528',
    devUrl: 'https://srgdjczzxtpt.com:2080/api',
    minioBaseUrl: "https://srgdjczzxtpt.com:2080/gminio/jczz/",
    // minioBaseUrl:"http://192.168.0.103:9528/",
    // minioBaseUrl: 'https://srgdjczzxtpt.com:2080/',

 http/api.js

@@ -99,7 +99,7 @@

    //数据中台返回的数据结果
    if (response.statusCode) {
        uni.hideLoading()
        // uni.hideLoading()
        if (response.statusCode !== 200) {
            console.log(response.data.msg)
            uni.showToast({

 pages/circle/index.vue

@@ -1,11 +1,13 @@
<template>
    <view class="">
        <z-paging ref="paging" v-model="list" @query="queryList" loading-more-no-more-text="没有更多了">
        <z-paging ref="paging" v-model="list" @query="queryList" @onRefresh="refreshList"
            loading-more-no-more-text="没有更多了">
        <view class=""  slot="top">
            <u-navbar :autoBack="false">
                <view class="" slot="left" style="width:500rpx">
                    <u-search placeholder="搜索" v-model="keyword" :clearabled="true" animation="true" :showAction="true"
                        @clear="clearSearch" @search="searchList" @custom="searchList"></u-search>
                        <u-search placeholder="搜索" v-model="keyword" :clearabled="true" animation="true"
                            :showAction="true" @clear="clearSearch" @search="searchList"
                            @custom="searchList"></u-search>
                </view>
            </u-navbar>
        </view>
@@ -185,12 +187,13 @@
            },

            setImgUrl(str) {
                let urls = str.split(",");
                let arr = [];
                for (let i of urls) {
                    arr.push(`${minioBaseUrl}${i}`)
                }
                return arr;
                // let urls = str.split(",");
                // let arr = [];
                // for (let i of urls) {
                //     arr.push(`${minioBaseUrl}${i}`)
                // }
                //return arr;
                return this.$setImageUrl(str)
            },

            getCommentList() {
@@ -314,6 +317,7 @@
            width: 100%;
            height: 100%;
        }

        .popup-empty{
            width:100%;
            height:200rpx;

 subPackage/article/communityList.vue

@@ -4,10 +4,13 @@
            <u-tabs :list="tabList" :current="tabIndex" keyName="dictValue" @change="changeTab"
                :inactiveStyle="{color:'#999999'}" :activeStyle="{color:'#017BFC'}"></u-tabs>
        </view> -->
        <z-paging ref="paging" v-model="list" @query="queryList" @onRefresh="refreshList"
            loading-more-no-more-text="没有更多了">
        <view class="list bgc-ff">
            <notice-list :data="list" />
        </view>
        <u-loadmore :status="loadingStatus" loadmoreText="开始加载" loadingText="数据加载中" nomoreText="没有更多了" line />
        </z-paging>
        <!-- <u-loadmore :status="loadingStatus" loadmoreText="开始加载" loadingText="数据加载中" nomoreText="没有更多了" line /> -->
    </view>
</template>

@@ -44,22 +47,26 @@
                    title: "选举调查"
                })
            }
            this.getNoticeList()
            // this.getNoticeList()

        },
        onReachBottom() {
            this.currentPage++
            this.getPageList()
        },
        // onReachBottom() {
        //     this.currentPage++
        //     this.getPageList()
        // },

        methods: {

            refreshList() {
                this.$refs.paging.reload();
            },

            changeTab(e) {
                this.tabIndex = e.index;
                this.tabId = e.dictKey;
                this.list = [];
                this.currentPage = 1;
                this.getNoticeList()
                // this.getNoticeList()
            },

            getCateList() {
@@ -78,6 +85,19 @@
                })
            },

            queryList(pageNo, pageSize) {
                getPage({
                    current: pageNo,
                    size: pageSize,
                    articleType: this.tabId,
                    eventType: this.eventType,
                    houseCode: uni.getStorageSync("siteInfo").houseCode
                }).then(res => {
                    this.$refs.paging.complete(res.data.records);
                })
            },


            async getNoticeList() {
                this.loadingStatus = 'loadingmore'
                const param = {

 subPackage/article/detail.vue

@@ -1,5 +1,6 @@
<template>
    <view class="">
        <view class="wrap">
        <view class="container">
            <view class="f-32 fw">{{detailInfo.title}}</view>
            <view class="row flex j-c-s-b a-i-c c-99">
@@ -117,7 +118,6 @@

        <view class="comment bgc-ff  mt-20" v-if="commentList.length">
            <caption-row title="用户评论" />

            <view class="comment-list ">
                <view class="comment-item flex " v-for="(item,index) in commentList" :key="index">
                    <u-avatar size="45" src="/static/icon/user-01.png"></u-avatar>
@@ -133,6 +133,9 @@
                </view>
            </view>
        </view>
        </view>
		
		
        <view class="footer">
            <u-search searchIcon='edit-pen' :animation="true" placeholder="写评论" disabled
                @click="navToComment"></u-search>
@@ -378,7 +381,9 @@
    page {
        background-color: #f5f5f5;
    }

    .wrap{
        padding:0 0 130rpx;
    }
    .container {
        padding: 0 30rpx;
        background-color: #fff;
@@ -476,7 +481,7 @@

    .comment {
        width: 100%;
        padding: 0 30rpx 160rpx;
        padding: 0 30rpx;
        box-sizing: border-box;
    }


 subPackage/article/list.vue

@@ -1,13 +1,15 @@
<template>
    <view class="">
        <view class="tab" v-if="tabList.length">
        <z-paging ref="paging" v-model="list" :auto="false" @query="queryList"  @onRefresh="refreshList" loading-more-no-more-text="没有更多了">
            <view class="tab"  slot="top">
            <u-tabs :list="tabList" :current="tabIndex" keyName="dictValue" @change="changeTab"
                :inactiveStyle="{color:'#999999'}" :activeStyle="{color:'#017BFC'}"></u-tabs>
        </view>
        <view class="list bgc-ff">
            <notice-list :data="list" />
        </view>
        <u-loadmore :status="loadingStatus" loadmoreText="开始加载" loadingText="数据加载中" nomoreText="没有更多了" line />
        </z-paging>
        <!-- <u-loadmore :status="loadingStatus" loadmoreText="开始加载" loadingText="数据加载中" nomoreText="没有更多了" line /> -->
    </view>
</template>

@@ -46,24 +48,28 @@
                        dictValue: "选举调查"
                    }]
                }
                this.getNoticeList()
                // this.getNoticeList()
            } else {
                this.getCateList()
            }
        },
        onReachBottom() {
            this.currentPage++
            this.getNoticeList()
        },
        // onReachBottom() {
        //     this.currentPage++
        //     this.getNoticeList()
        // },

        methods: {
            refreshList(){
                this.$refs.paging.reload();
            },

            changeTab(e) {
                this.tabIndex = e.index;
                this.tabId = e.dictKey;
                this.list = [];
                this.currentPage = 1;
                this.getNoticeList()
                this.$refs.paging.reload();
                // this.getNoticeList()
            },

            getCateList() {
@@ -78,9 +84,23 @@
                    })
                    this.tabList = data;
                    // this.tabId = data[0].dictKey;
                    this.getNoticeList()
                    // this.getNoticeList()
                    this.$refs.paging.reload();
                })
            },


            queryList(pageNo, pageSize) {
                getPage({
                    current: pageNo,
                    size: pageSize,
                    articleType: this.tabId,
                    eventType: this.eventType
                }).then(res => {
                    this.$refs.paging.complete(res.data.records);
                })
            },


            async getNoticeList() {
                this.loadingStatus = 'loadingmore'
@@ -123,7 +143,7 @@
    .tab {
        width: 100%;
        height: 88rpx;
        position: fixed;
        // position: fixed;
        /*#ifdef H5*/
        top: 88rpx;
        /*#endif*/
@@ -138,7 +158,7 @@
    }

    .list {
        margin-top: 108rpx;
        margin-top: 20rpx;
        padding: 0 30rpx;
    }
</style>

 subPackage/bs/views/rentDetail.vue

@@ -64,7 +64,7 @@
        <!-- <select-bus v-if="typeShow" :show="typeShow" v-model="form[selectBusModel]" type="radio"

            :popupTitle="selectBusTitle" :dataLists="selectBusList" @cancel="typeShow = false" @submit="typeSelect">

        </select-bus> -->

        <u-picker :closeOnClickOverlay="true" v-if="typeShow" :show="typeShow" :columns="[selectBusList]"

        <u-picker  :defaultIndex="[selectDefaultIndex[selectBusKey]]" :closeOnClickOverlay="true" v-if="typeShow" :show="typeShow" :columns="[selectBusList]"

            @close="typeShow = false" @cancel="typeShow = false" keyName="name" @confirm="typeSelect"></u-picker>

        <!--出租时间选择-->

        <u-datetime-picker v-model="currentTime" v-if="rentTimeShow" :closeOnClickOverlay="true"

@@ -221,8 +221,12 @@
                btnControls: {

                    deleteBtn: false,

                    verifyBtn: false

                },

                selectDefaultIndex:{

                    rentalUse:null,

                    relation:null,

                    houseType:null

                }



            }

        },

        onLoad(option) {

@@ -251,6 +255,7 @@
                const [result] = e.value

                this[this.selectBusModel] = result.name

                this.form[this.selectBusKey] = result.value

                this.selectDefaultIndex[this.selectBusKey] = item.indexs[0];

                this.typeShow = !this.typeShow

            },

            rentTimeClick() {

@@ -442,10 +447,24 @@
                })

            },

            findObjValue(value, obj) {

                const res = obj.find(item => {

                    return item.value == value

                })

                return res.name

                // const res = obj.find(item => {

                //     return item.value == value

                // })

                // return res.name

				
                let data = {

                    index: "",

                    name:""

                }

                for(let i =0,ii = obj.length;i<ii;i++){

                    if(value == obj[i].value){

                        data.index = i;

                        data.name = obj[i].name;

                    }

                }

                return data;

				
				
            },

            // 获取租赁相关信息

            async getCurrentRentInfo() {

@@ -486,9 +505,17 @@
                    rentalUseName: rentalUse,

                    images: images

                }

                this.rentalUseName = this.findObjValue(rentalUse, this.dataList.rentalUse)

                this.relationName = this.findObjValue(tenantRelationship, this.dataList.relation)

                this.houseTypeName = this.findObjValue(houseStatus, this.dataList.houseType)

                // this.rentalUseName = this.findObjValue(rentalUse, this.dataList.rentalUse)

                // this.relationName = this.findObjValue(tenantRelationship, this.dataList.relation)

                // this.houseTypeName = this.findObjValue(houseStatus, this.dataList.houseType)

				
                this.rentalUseName = this.findObjValue(rentalUse, this.dataList.rentalUse).name

                this.selectDefaultIndex.rentalUse = this.findObjValue(rentalUse,this.dataList.rentalUse).index;

                this.relationName = this.findObjValue(tenantRelationship, this.dataList.relation).name

                this.selectDefaultIndex.relation = this.findObjValue(tenantRelationship, this.dataList.relation).index;

                this.houseTypeName = this.findObjValue(houseStatus, this.dataList.houseType).name

                this.selectDefaultIndex.houseType = this.findObjValue(houseStatus, this.dataList.houseType).index

				
                this.rentFormNum = householdVOList.length

                this.$nextTick(() => {

                    householdVOList.forEach((item, index) => {

@@ -624,7 +651,7 @@
            // border-top: 1rpx solid #e4e4e4;

            z-index: 999;

            padding: 20rpx;

            padding-bottom: env(safe-area-inset-bottom);

            padding-bottom: calc(env(safe-area-inset-bottom) + 20rpx);



            /deep/ .u-button {

                color: #ffffff;


 subPackage/bs/views/repairList.vue

@@ -1,6 +1,6 @@
<template>
    <view class="container">
        <view v-if="dataList.length>0" class="list">
        <!-- <view v-if="dataList.length>0" class="list">
            <view class="item" v-for="(item,index) in dataList" :key="item.id">
                <view class="line">
                    <view class="label">上报时间</view>
@@ -17,14 +17,33 @@
                    <view class="value">{{item.remark}}</view>
                </view>
            </view>
        </view> -->
<z-paging ref="paging" v-model="dataList" @query="queryList" loading-more-no-more-text="没有更多了">
        <view class="list" >
            <view class="list-item bgc-ff mb-20" v-for="item in dataList" :key="item.id" @click="pushPage(item)">
                <view class="item-title flex a-i-c j-c-s-b mb-20">
                    <text class="f-32 fw">{{ getTypeName(item.type) }}</text>
                    <u-tag class="u_tag" size="mini" plain plainFill :text="getStatusName(item.status)"></u-tag>
                </view>
                <view class="item-row flex a-i-c j-c-s-b">
                    <text class="f-28">时间</text>
                    <text class="f-28 c-66">{{ item.createTime }}</text>
                </view>
                <view class="item-row flex a-i-c j-c-s-b">
                    <text class="f-28">描述</text>
                    <text class="address f-28 c-66">{{ item.remark}}</text>
                </view>
            </view>
        </view>

        <view v-else>

</z-paging>
        <!-- <view v-else>
            <u-empty marginTop="50%" mode="list"></u-empty>
        </view>
        </view> -->

        <u-loading-page :loading="loadingPage"></u-loading-page>
        <u-loading-icon :show="loadingIcon"></u-loading-icon>
        <!--     <u-loading-page :loading="loadingPage"></u-loading-page>
        <u-loading-icon :show="loadingIcon"></u-loading-icon> -->
    </view>
</template>

@@ -46,6 +65,46 @@
                    createUser: uni.getStorageSync("userInfo").user_id,
                    type: "",
                },
                typeList: [{
                        name: "公共维修",
                        type: 1
                    },
                    {
                        name: "居家维修",
                        type: 2
                    },
                    {
                        name: "矛盾纠纷",
                        type: 3
                    },
                    {
                        name: "投诉举报",
                        type: 4
                    },
                    {
                        name: "企业商户上报",
                        type: 5
                    }
                ],

                statusList: [{
                        name: "待处理",
                        status: 1,
                        type: 'warning'
                    },
                    {
                        name: "处理中",
                        status: 2,
                        type: 'success'
                    },
                    {
                        name: "已处理",
                        status: 3,
                        type: 'error'
                    },
                ]


            }
        },
        computed: {
@@ -59,27 +118,52 @@
                })
            }
        },
        created() {

        },
        mounted() {

        },
        onLoad(option) {
            uni.setNavigationBarTitle({
                title: option.title
            })
            this.query.type = option.type
            this.getList()
            // this.query.type = option.type
            this.repairType = option.type;
            // this.getList()
        },
        onShow() {

        },
        onReachBottom() {
            this.page.current += 1
            this.getList()
        },
        // onReachBottom() {
        //     this.page.current += 1
        //     this.getList()
        // },
        methods: {

            getTypeName(type) {
                for (let i of this.typeList) {
                    if (i.type == type) {
                        return i.name
                    }
                }
            },

            getStatusName(status) {
                for (let i of this.statusList) {
                    if (i.status == status) {
                        return i.name;
                    }
                }
            },
			
            refreshList(){
                this.$refs.paging.reload();
            },
			
            queryList(pageNo,pageSize){
                getPage({
                    current:pageNo,
                    size:pageSize,
                    createUser:uni.getStorageSync("userInfo").user_id,
                    type:this.repairType
                }).then(res=>{
                    this.$refs.paging.complete(res.data.records);
                })
            },


            getList() {

                this.page.current == 1 ? this.loadingPage = true : this.loadingIcon = true
@@ -92,26 +176,34 @@
                    this.dataList = this.dataList.concat(data)
                    this.page.current == 1 ? this.loadingPage = false : this.loadingIcon = false
                })
            },

            pushPage(item) {
                const data = JSON.stringify(item)
                // this.$u.func.globalNavigator('/subPackage/workbench/views/reportAudit?id='+id)
                this.$u.func.globalNavigator(`/subPackage/workbench/views/reportAudit?data=${data}&from=record`)
            }

        }
    }
</script>

<style scoped lang="scss">
<style lang="scss">
    page {
        width: 100%;
        height: 100%;
        background-color: #F5F5F5;
    }

    .container {
        position: relative;
        // position: relative;
        width: 100%;
        height: 100%;
        display: flex;
        flex-direction: column;
        background: #F9F9FA;
        // display: flex;
        // flex-direction: column;
        // background: #F9F9FA;

        .list {


            .item {
                background-color: #ffffff;
@@ -130,8 +222,31 @@

                    .value {}
                }


            }

        .list {
            margin: 20rpx 30rpx 0;
        }

        .list-item {
            padding: 0 30rpx 20rpx;
            border-radius: 8rpx;

            .item-title {
                padding: 30rpx 0;
                border-bottom: 1px solid #F5F5F5;
            }

            .item-row {
                padding: 10rpx 0;

                .address {
                    width: 75%;
                    text-align: right;
                }
            }
        }
    }
</style>

 subPackage/bs/views/repairRecord.vue

@@ -4,10 +4,10 @@
            <view class="tab">
                <view class="tab">
                    <u-tabs :list="tabList" :scrollable="false" :current="tabIndex" @click="changeTab"
                        :inactiveStyle="{color:'#999999'}" :activeStyle="{color:'#017BFC'}"></u-tabs>
                        inactiveStyle="{color:'#999999'}" :activeStyle="{color:'#017BFC'}"></u-tabs>
                    <view class="search">
                        <u-search placeholder="请输入需要查询信息的姓名" v-model="keyWord" :clearabled="true" :showAction="true"
                            :animation="true" @search="searchConfirm" @clear="clearConfirm"></u-search>
                            :animation="true" @search="searchConfirm" @clear="clearConfirm"  @custom="searchConfirm"></u-search>
                    </view>
                </view>
            </view>
@@ -100,7 +100,7 @@
        },
        
        onLoad(option){
            this.tabIndex = option.type;
            this.tabIndex = Number(option.type);
            this.tabStatus = option.type == 0?'':option.type
        },
        

 subPackage/house/roomDetails/index.vue

@@ -36,7 +36,7 @@
                            <view class="info">

                                <view>姓名：{{item.name}}</view>

                                <view class="flex">

                                    手机：{{item.phoneNumber}}

                                    手机：{{item.phoneNumber || "" }}

                                    <!-- <u-icon name="phone-fill" color="#4586FE"></u-icon> -->

                                </view>

                                <view class="flex">


 subPackage/workbench/views/examine.vue

@@ -24,7 +24,7 @@
                </view>

            </view>

        </view>

        <view class="personnel">

        <view class="personnel"  v-if="placePersonList.length">

            <box-title title="从业人员" class="box-title"></box-title>

            <view class="info">

                <view class="person-box" v-for="(item, index) in placePersonList" :key="item.id">


 subPackage/workbench/views/patrol.vue

@@ -36,9 +36,12 @@
        <u-datetime-picker ref="datetimePicker" :show="showSelectDate" v-model="patrolTime" mode="datetime"
            :formatter="formatter" @confirm="confirmDate" @cancel="showSelectDate = false"></u-datetime-picker>

        <view class="footer">
    <!--     <view class="footer">
            <button class="footer-btn" @click="submitInfo">提交</button>
        </view>
        </view> -->
		
        <footer-btn  @click="submitInfo"></footer-btn>
		

    </view>


 subPackage/workbench/views/rental.vue

@@ -206,8 +206,8 @@
        methods: {

            

            showStatus(status){

                let data = this.tabsList;

                // data.splice(0,1);	
                let data = JSON.parse(JSON.stringify(this.tabsList))

                data.splice(0,1);	
                for(let i of data){

                    if(i.value == status){

                        return i.name


 subPackage/workbench/views/reportAudit.vue

@@ -41,9 +41,12 @@
                </u-form>

            </view>

        </view>

        <view class="bottom"  v-if="from == 'list'">

        <!-- <view class="bottom"  v-if="from == 'list'">

            <u-button type="primary" @click="submit">提交处理</u-button>

        </view>

        </view> -->

		
        <footer-btn  @click="submit"  v-if="from == 'list'"></footer-btn>

		
        <u-picker :defaultIndex="[defaultColums]" :closeOnClickOverlay="true" @close="isPickerShow = false" :show="isPickerShow" ref="uPicker"

            :columns="columns" keyName="name" @cancel="isPickerShow = false" @confirm="handleConfirm"></u-picker>

    </view>

@@ -205,14 +208,14 @@
                        item.value = this.findObjValue(item.value, this.typeList, 'type').name || '未完善'
                    }
                })

                if(this.defaultData.imageUrls){

                    let list = this.defaultData.imageUrls.split(",")

                    let arr = []

                    for(let i of list){

                        arr.push(`${minioBaseUrl}${i}`);

                    }

                    this.imgUrls = arr;

                }
                this.imgUrls = this.$setImageUrl(this.defaultData.imageUrls);

                //if(this.defaultData.imageUrls){

                    // let list = this.defaultData.imageUrls.split(",")

                    // let arr = []

                    // for(let i of list){

                    //     arr.push(`${minioBaseUrl}${i}`);

                    // }

                //}
                
                let columns = this.columns[0]
                this.defaultColums = columns.findIndex(item => item.status == this.defaultData.confirmFlag)