merge

Lou

2023-11-30 fdbeea6f950181bd09fd712889e6760733673e96

merge

 pages/home/index.vue

@@ -141,8 +141,6 @@
    } from "@/common/setting"

    import noticeList from "@/components/noticeList/noticeList";

    import captionRow from "@/components/caption/caption.vue"

    import taskListVue from "../../subPackage/task/taskList.vue";



    export default {

        components: {

            noticeList,


 subPackage/house/member/householdLabel.vue

@@ -234,6 +234,7 @@
                        householdId: this.householdInfo.id,

                        labelId: id,

                        remark: this.remark,

                        lableType: 1,

                        color,

                        houseCode: this.houseCode,

                        userId: this.householdInfo.associatedUserId


 subPackage/house/roomControl/index.vue

@@ -37,10 +37,9 @@
                        <newBoxTitle title="房屋标签"></newBoxTitle>

                        <view class="list">

                            <view v-for="(item, index) in labelBtnList" :key="index">

                                <u-button size="mini" type="primary"
                                    :color="item.color"

                                    :style="{color: item.color && '#fff'}"

                                    :text="item.name" @click="showLabelPopup(item)"></u-button>

                                <u-button size="mini" type="primary" :color="item.color"

                                    :style="{color: item.color && '#fff'}" :text="item.name"

                                    @click="showLabelPopup(item)"></u-button>

                            </view>

                        </view>

                    </view>

@@ -86,9 +85,9 @@
        getLabelListByParentId

    } from "@/api/label/label.js";

    import {

        updateHouseLabel,

        removeHouseLabel

    } from "@/api/house/houseLabel.js";

        saveOrUpdateHouseholdLabel,

        removeHouseholdLabel

    } from "@/api/house/householdLabel.js";

    import {

        getHouseDetail,

        saveOrUpdateHouse

@@ -221,7 +220,7 @@
                        propertyPrice,

                        serviceDue,

                        imageUrls,

                        houseLabelVOList

                        userHouseLabelVOList

                    } = res.data

                    if (imageUrls && imageUrls.length > 0) {

                        const urls = imageUrls.split(',')

@@ -234,9 +233,9 @@
                        })

                    }



                    if (houseLabelVOList.length > 0) {

                    if (userHouseLabelVOList.length > 0) {

                        that.labelBtnList.forEach(e => {

                            houseLabelVOList.forEach(f => {

                            userHouseLabelVOList.forEach(f => {

                                if (Number(e.id) == f.labelId) {

                                    e['color'] = f.color

                                    e['remark'] = f.remark

@@ -339,7 +338,7 @@
                            labelId: id,

                            houseCode: this.houseCode

                        }

                        res = await removeHouseLabel(data)

                        res = await removeHouseholdLabel(data)

                    } else {

                        uni.showToast({

                            title: "无可撤销项",

@@ -349,10 +348,11 @@
                        return

                    }

                } else {

                    res = await updateHouseLabel({

                    res = await saveOrUpdateHouseholdLabel({

                        houseCode: this.houseCode,

                        labelId: id,

                        remark: this.remark,

                        lableType: 2,

                        color

                    })

                }

@@ -429,6 +429,7 @@
                    background-color: #ffffff;

                    padding: 30rpx;

                    margin-top: 20rpx;


                    /deep/ .u-upload__button {
                        border: 1rpx solid #EEEEEE;
                        background-color: #fff;