Merge remote-tracking branch 'origin/master'

linwei

2024-02-18 844cd94bd795217008dc1ccb5d16e4bb3b4297db

Merge remote-tracking branch 'origin/master'

 src/views/userHouse/houseList.vue

@@ -61,8 +61,8 @@

                <el-dialog title="标签管理" append-to-body :visible.sync="labelFlag" center width="600px">
                    <div id="" class="grid-container2">
                        <div class="grid-item" v-for="(item, index) in labelData" :key="index" @click="changLabel(item)">
                            {{ item.color }}
                        <div class="grid-item" :style="{ backgroundColor: getColor(item.color) }"
                            v-for="(item, index) in labelData" :key="index" @click="changLabel(item)">
                            {{ item.name }}
                        </div>
                    </div>