1

pages/house/index.vue

@@ -11,8 +11,7 @@
 				:class="indexArr[i]!=key.split('-')[0]?'mg0 fixedItem':'fixedItem'">
 				<view class="head" v-if="indexArr[i]==key.split('-')[0]" style="margin-top: 16rpx;">
 					<!-- <text>{{key.split('-')[0]}}F</text> -->
-					<view class="roomType" :style="{'left':scrollLeft+'px'}" v-if="key.split('-')[2]">{{key.split('-')[1]}}-{{key.split('-')[2]}}</view>
-					<view class="roomType" :style="{'left':scrollLeft+'px'}" v-else>{{key.split('-')[1]}}</view>
+					<view class="roomType" :style="{'left':scrollLeft+'px'}">{{key.split('-')[0]}}-{{indexHouseNameArr[i]}}</view>
 					<view class="rightIcon" @click="open(i,key.split('-')[0],false)" v-if="opens[i]">
 						<text>收起</text>
 						<u-icon name="arrow-up-fill" size="18" style="margin-left: 10rpx;"></u-icon>
@@ -63,8 +62,7 @@
 					<view v-for="(item,key,i) in leftData" :key="i">
 						<view class="head" v-if="indexArr[i]==key.split('-')[0]" style="opacity: 0;">
 							<!-- <text>{{key.split('-')[0]}}F</text> -->
-							<view class="roomType" :style="{'left':scrollLeft+'px'}" v-if="key.split('-')[2]">{{key.split('-')[1]}}-{{key.split('-')[2]}}</view>
-							<view class="roomType" :style="{'left':scrollLeft+'px'}" v-else>{{key.split('-')[1]}}</view>
+							<view class="roomType" :style="{'left':scrollLeft+'px'}">{{key.split('-')[0]}}-{{indexHouseNameArr[i]}}</view>
 							<view class="rightIcon" @click="open(i,key.split('-')[0],false)" v-if="opens[i]">
 								<text>收起</text>
 								<u-icon name="arrow-up-fill" size="18" style="margin-left: 10rpx;"></u-icon>
@@ -160,6 +158,7 @@
 				leftData: [], //横向列，
 				indexArr: [], //楼层索引,
 				indexHouseBaseIdArr:[],
+				indexHouseNameArr:[],
 				indexNameArr: [], //楼层Id索引,
 				opens: [],
 				statusTxt: {
@@ -352,23 +351,18 @@
 			getLeftData() {
 				this.$api.get(`/merchant/hotel/room/state/getHouseCategoryData/${this.homestayId}`).then(res => {
 					if (res.data.code == 0) {
-						// for (let i; i < res.data.data.length; i++) {
-						// 	res.data.data[i].open = true;
-						// }
 						for (let i in res.data.data) {
-							console.log(i)
-							console.log(res.data.data)
-							
 							let F = i.split('-')[0];
 							let houseBaseId=res.data.data[i][0].houseBaseId;
-							//indexNameArr
-							if (this.indexArr.indexOf(F)||this.indexHouseBaseIdArr.indexOf(houseBaseId) < 0) {
+							let name=res.data.data[i][0].name;
+							if (this.indexHouseBaseIdArr.indexOf(houseBaseId) < 0) {
 								this.indexArr.push(F);
 								this.indexHouseBaseIdArr.push(houseBaseId)
+								this.indexHouseNameArr.push(name)
 								this.opens.push(true)
 							} else {
 								this.indexArr.push('');
-								this.indexHouseBaseIdArr.push('')
+								this.indexHouseNameArr.push('')
 								this.opens.push(true)
 							}
 						}
@@ -607,9 +601,9 @@
 
 
 
-					&:last-child {
-						border: 0;
-					}
+					// &:last-child {
+					// 	border: 0;
+					// }
 
 					//已预订
 					&.s2 {
@@ -711,8 +705,8 @@
 		}
 
 		.year {
-			min-width: 130rpx;
-			width: 130rpx;
+			min-width: 140rpx;
+			width: 140rpx;
 			height: 136rpx;
 			display: flex;
 			flex-direction: column;
@@ -733,11 +727,12 @@
 				display: flex;
 				align-items: center;
 				border-bottom: 1rpx solid #E9F0F5;
-				width: 130rpx;
+				width: 140rpx;
 				background-color: #fff;
 				box-shadow: 3px 0 10px #efefef;
 				box-sizing: border-box;
 				justify-content: center;
+				text-align: center;
 				// &:first-child{height: 84rpx;border-top: 1rpx solid #E9F0F5;}
 			}
 		}