From a29e0df3c165dfe2ddd825bb340ed480a64865db Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 02 四月 2026 15:02:30 +0800
Subject: [PATCH] 解决冲突
---
admin/src/views/roomStatus/index.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/admin/src/views/roomStatus/index.vue b/admin/src/views/roomStatus/index.vue
index 0bdccb2..88f0ef1 100644
--- a/admin/src/views/roomStatus/index.vue
+++ b/admin/src/views/roomStatus/index.vue
@@ -288,7 +288,7 @@
</div>
</div>
<div class="xm_house_list_right">
- <template v-for="(child, i) in item.roomsList" :key="i">
+ <template v-for="(child, i) in item.roomsList" >
<div class="xm_house_list_right_row" v-for="(childThree, a) in child" :key="a" :style="{ width: childThree.width + 'px', backgroundColor: ifBackground(childThree.roomStatus) }">
<div class="ft">
<span>{{childThree.roomCode}}</span>
@@ -305,7 +305,6 @@
<div class="xm_house_list_right_row_day" v-if="childThree.roomStatus === 0">鏈嚭绉燂綔绌虹疆{{childThree.freeDayAmount}}澶�</div>
</div>
</template>
-
</div>
</div>
</div>
@@ -498,7 +497,7 @@
<el-table
:data="tableData"
border
- v-lading="loading"
+ v-loading="loading"
style="width: 100%">
<el-table-column
prop="categoryName"
@@ -687,6 +686,7 @@
label: '榛勯噾绯�'
}],
value: '',
+ ids:[],
form: {
name: '',
status: '',
@@ -1246,7 +1246,7 @@
.box_content {
width: 100%;
display: flex;
- align-items: start;
+ align-items: flex-start;
justify-content: space-between;
.left {
width: 300px;
--
Gitblit v1.9.3