1

pages/house/index.vue

@@ -1,9 +1,17 @@
 <template>
-	<view class="page" :style="{'height':(h-th)+'px','padding-top':mt+'px'}">
+	<scroll-view class="page" scroll-x="true" scroll-y="true" :style="{'height':(h-th)+'px','padding-top':mt+'px'}" @scroll="scroll" id="page" >
 		<c-nav-bar title="房态" :showIcon="false" :titleStyle="titleStyle"></c-nav-bar>
 		<view class="content" v-if="xdata.length!=0">
+			<view class="tj">
+				<text>房间总数：</text>
+				<text>{{info.totalRooms}}</text>
+				<text>在入住房间数：</text>
+				<text>{{info.checkinRooms}}</text>
+				<text>待入住房间数：</text>
+				<text>{{info.bookRooms}}</text>
+			</view>
 			<view class="date">
-				<view class="item">
+				<view class="item" :style="{'left':scrollLeft+'px'}">
 					<u-icon name="calendar-fill" color="#B9C2D2" size="40" style="margin-bottom:10rpx;"></u-icon>
 					<text style="font-size: 24rpx;">2024</text>
 				</view>
@@ -14,8 +22,10 @@
 				</view>
 			</view>
 			<view class="floorData" v-if="leftData.length!=0">
-				<view v-for="(item,key,i) in leftData" :key="i" style="margin-bottom: 16rpx;padding-top: 108rpx;position: relative;" :class="indexArr[i]==key.split('-')[0]?'big':opens[i]?'small':'pd0'">
-					<view class="head" v-if="indexArr[i]==key.split('-')[0]">
+				<view v-for="(item,key,i) in leftData" :key="i"
+					style="margin-bottom: 16rpx;padding-top: 108rpx;position: relative;"
+					:class="indexArr[i]==key.split('-')[0]?'big':opens[i]?'small':'pd0'">
+					<view class="head" v-if="indexArr[i]==key.split('-')[0]" :style="{'left':scrollLeft+'px'}">
 						<text>{{key.split('-')[0]}}F</text>
 						<view class="rightIcon" @click="open(i,key.split('-')[0],false)" v-if="opens[i]">
 							<text>收起</text>
@@ -27,10 +37,10 @@
 						</view>
 					</view>
 					<template v-if="opens[i]">
-						<view class="roomType">{{key.split('-')[1]}}</view>
+						<view class="roomType":style="{'left':scrollLeft+'px'}">{{key.split('-')[1]}}</view>
 						<view class="table">
 							<view class="tr" v-for="(item2,index2) in item" :key="index2">
-								<view class="td">{{item2.roomNumber}}</view>
+								<view class="td" :style="{'left':scrollLeft+'px'}">{{item2.roomNumber}}</view>
 								<view class="td" v-for="(roomData,ind) in xdata" :key="ind"
 									:class="'s'+delDataStatus(item2.roomNumber,item2.houseBaseId,roomData.roomDataList,'status')">
 									<!-- 空置房-->
@@ -70,7 +80,7 @@
 		<u-picker :itemHeight="88" :immediateChange="true" :show="areaShow" :columns="areaTxt" title="房态选择"
 			:defaultIndex="passengerDefault" @cancel="areaShow=false;clearData();"
 			@confirm="passengerConfirm"></u-picker>
-	</view>
+	</scroll-view>
 </template>
 
 <script>
@@ -78,7 +88,7 @@
 	export default {
 		data() {
 			return {
-				homestayId:this.$store.state.moduleHouse.homestayId,
+				homestayId: this.$store.state.moduleHouse.homestayId,
 				areaShow: false,
 				passengerDefault: [0],
 				areaTxt: [
@@ -120,7 +130,8 @@
 				checkDataDate: [],
 				checkPrice: [],
 				checkDataRoomId: [],
-				checkStatus: ''
+				checkStatus: '',
+				scrollLeft:0
 			}
 		},
 		onLoad() {
@@ -148,6 +159,10 @@
 				this.getData();
 				this.$forceUpdate();
 			},
+			scroll(e){
+				//this.scrollLeft = e.detail.scrollLeft; // div 到左边的距离
+				//console.log(e)
+			},
 			//关房
 			tabCli(roomNumber, id, roomId) {
 				this.clearData();
@@ -159,10 +174,10 @@
 						}
 					}
 					//已预订，已入住
-					if (obj.status == 1 || obj.status == 2|| obj.status == -1) {
-						let orderId= obj.orderId;
+					if (obj.status == 1 || obj.status == 2 || obj.status == -1) {
+						let orderId = obj.orderId;
 						uni.navigateTo({
-							url:"/pages/house/orderInfo?orderId="+orderId
+							url: "/pages/house/orderInfo?orderId=" + orderId
 						})
 						//到详情
 					} else {
@@ -357,10 +372,10 @@
 
 	.date {
 		display: flex;
-
+		position: relative;
 		border: 1rpx solid #E9F0F5;
 		margin-bottom: 30rpx;
-
+		padding-left: 130rpx;
 		.item {
 			min-width: 130rpx;
 			width: 130rpx;
@@ -376,6 +391,12 @@
 			&:last-child {
 				border: 0;
 			}
+			&:first-child {
+				position: absolute;
+				left:0;
+				top: 0;
+				width: 130rpx;
+			}
 
 			text {
 				&:nth-child(2) {
@@ -391,13 +412,15 @@
 		.roomType {
 			padding: 0 30rpx;
 			display: flex;
+			width: 400rpx;
 			// justify-content: space-between;
 		}
 
 		.head {
 			position: absolute;
-			top:0;
-			left:0;
+			top: 0;
+			left: 0;
+
 			&>text {
 				&:first-child {
 					font-size: 32rpx;
@@ -410,15 +433,15 @@
 				align-items: center;
 				font-size: 24rpx;
 				color: #1F2425;
-				
+
 			}
 		}
 
 		.roomType {
 			position: absolute;
-			top:40rpx;
-			left:0;
-			
+			top: 40rpx;
+			left: 0;
+
 			color: #333;
 			font-size: 24rpx;
 			// position: relative;
@@ -448,7 +471,8 @@
 				align-items: center;
 				background-color: #fff;
 				position: relative;
-			
+				padding-left:130rpx;
+
 				&:last-child {
 					border: 0;
 				}
@@ -457,9 +481,10 @@
 					&:first-child {
 						position: absolute;
 						left: 0;
-						top:0;
+						top: 0;
 						z-index: 1;
 					}
+
 					display: flex;
 					align-items: center;
 					justify-content: center;
@@ -475,7 +500,7 @@
 					.tdP,
 					.cellBox {
 						display: flex;
-						width:100%;
+						width: 100%;
 						height: 100%;
 						flex-direction: column;
 						align-items: center;
@@ -562,13 +587,22 @@
 			}
 		}
 	}
-	.small{
-		padding-top: 68rpx!important;
-		.roomType{
-			top:0!important;
+
+	.small {
+		padding-top: 68rpx !important;
+
+		.roomType {
+			top: 0 !important;
 		}
 	}
-	.pd0{
-		padding: 0!important;
+
+	.pd0 {
+		padding: 0 !important;
+	}
+	::v-deep.el-time-spinner__wrapper{
+		width: 50%;
+		&:last-child{
+			display: none;
+		}
 	}
 </style>

pages/my/houseList.vue

@@ -1,253 +1,280 @@
 <template>
-	<view class="page" :style="{'height':(h-th)+'px','padding-top':mt+'px'}">
-			<c-nav-bar title="房间列表" :showIcon="false" :titleStyle="titleStyle"></c-nav-bar>
+	<view class="page" :style="{'height':(h)+'px','padding-top':mt+'px'}">
+		<c-nav-bar title="房间列表" :showIcon="true" :titleStyle="titleStyle"></c-nav-bar>
 		<view class="body">
 			<!-- 房型信息 -->
-			
+
 			<view class="typeInfo">
 				<view class="titleInfo">
 					<text style="font-size: 32rpx; font-weight: 700;">房型信息</text>
 				</view>
 				<view class="cellBox">
 					<text style="font-size: 30rpx; margin-right: 30rpx;">房型名称</text>
-					<input v-model="form.name" type="text" placeholder="请输入房型"  style="width: 210rpx;height: 42rpx; font-size: 30rpx;"/>
+					<input v-model="form.name" type="text" placeholder="请输入房型"
+						style="width: 210rpx;height: 42rpx; font-size: 30rpx;" />
 				</view>
 				<view class="bigRoom">
 					<text style="font-size: 30rpx;color: black; margin-right: 90rpx;">简称</text>
-					<input v-model="form.shortName" type="text" placeholder="请输入简称"  style="width: 210rpx;height: 42rpx; font-size: 30rpx;"/>
+					<input v-model="form.shortName" type="text" placeholder="请输入简称"
+						style="width: 210rpx;height: 42rpx; font-size: 30rpx;" />
 				</view>
 			</view>
 			<view class="shelves">
 				<view style="margin-left: 30rpx;">
-					<text style="font-size: 30rpx; " >是否上架</text>
+					<text style="font-size: 30rpx; ">是否上架</text>
 				</view>
 				<view style="margin-right: 30rpx;">
-					<u-switch v-model="checked" size="50" @change="change(status)" active-color="#07C160" ></u-switch>
+					<u-switch v-model="checked" size="50" @change="change(status)" active-color="#07C160"></u-switch>
 				</view>
 			</view>
 			<!-- 图片上传
 			 -->
-			 <view class="uploadPic">
-			 	<view style=" margin-left: 30rpx;">
+			<view class="uploadPic">
+				<view style=" margin-left: 30rpx;">
 					<text style="font-size: 32rpx; font-weight: 700; ">封面图片(0/1)</text>
-			 		
-			 	</view>
+
+				</view>
 				<view style="margin-top: 20rpx; margin-left: 30rpx; color: #777; font-size: 24rpx;">
 					<text>仅能上传1张，需展示房间内容</text>
 				</view>
 				<view class="pic">
 					<!-- 图片 -->
-					<view v-show="false" >
-						<u-upload :action="action" :file-list="fileList" >
-							<!-- <img src="https://img.51miz.com/Element/00/77/24/47/cd39208d_E772447_a1d65d72.png" style="width: 190rpx; height: 120rpx;" /> -->
-						</u-upload>
+					<u-upload :fileList="fileList" multiple :maxCount="1" :maxSize="1 * 1024 * 1024"
+						@afterRead="afterRead" @oversize="overSize" width="120" height="120">
 						
-					</view>
+					</u-upload>
+				</view>
+
+			</view>
+			<!-- 价格信息 -->
+			<view class="priceInfo">
+				<!-- 标题 -->
+				<view class="titleInfo">
+					<text style="font-size: 32rpx; font-weight: 700; margin-left: 10rpx;">价格信息</text>
 				</view>
-				
-			 </view>
-			 <!-- 价格信息 -->
-			 <view class="priceInfo">
-				 <!-- 标题 -->
-			 	<view class="titleInfo">
-			 		<text style="font-size: 32rpx; font-weight: 700; margin-left: 10rpx;">价格信息</text>
-			 	</view>
 				<!-- 周末周日区分 -->
-					<view class="week">
-						<view class="weekend">
-							<view >
-								<text style="font-size: 30rpx; " >区分平日周末</text>
-							</view>
-							<view >
-								<u-switch v-model="weekedChecked" size="50"  active-color="#07C160" ></u-switch>
-							</view>
+				<view class="week">
+					<view class="weekend">
+						<view>
+							<text style="font-size: 30rpx; ">区分平日周末</text>
+						</view>
+						<view>
+							<u-switch v-model="weekedChecked" size="50" active-color="#07C160"></u-switch>
 						</view>
 					</view>
-					
+				</view>
+
 				<!-- 每日价格 -->
-					<view class="priceBoxWeek">
-						<view class="weekendBox">
-							<view >
-								<text style="font-size: 30rpx; margin-right: 90rpx; " >周一</text>
-							</view>
-							<view style="display: flex;">
-								<text style="font-size: 30rpx;">￥</text> <input v-model="form.mondayPrice" type="text" placeholder="请输入价格"   style="width: 210rpx;height: 42rpx; font-size: 30rpx;"/> 
-							</view>
+				<view class="priceBoxWeek">
+					<view class="weekendBox">
+						<view>
+							<text style="font-size: 30rpx; margin-right: 90rpx; ">周一</text>
+						</view>
+						<view style="display: flex;">
+							<text style="font-size: 30rpx;">￥</text> <input v-model="form.mondayPrice" type="text"
+								placeholder="请输入价格" style="width: 210rpx;height: 42rpx; font-size: 30rpx;" />
 						</view>
 					</view>
-					
-					<view class="priceBoxWeek">
-						<view class="weekendBox">
-							<view >
-								<text style="font-size: 30rpx; margin-right: 90rpx; " >周二</text>
-							</view>
-							<view style="display: flex;">
-								<text style="font-size: 30rpx;">￥</text> <input v-model="form.tuesdayPrice" type="text" placeholder="请输入价格"   style="width: 210rpx;height: 42rpx; font-size: 30rpx;"/> 
-							</view>
+				</view>
+
+				<view class="priceBoxWeek">
+					<view class="weekendBox">
+						<view>
+							<text style="font-size: 30rpx; margin-right: 90rpx; ">周二</text>
+						</view>
+						<view style="display: flex;">
+							<text style="font-size: 30rpx;">￥</text> <input v-model="form.tuesdayPrice" type="text"
+								placeholder="请输入价格" style="width: 210rpx;height: 42rpx; font-size: 30rpx;" />
 						</view>
 					</view>
-					
-					<view class="priceBoxWeek">
-						<view class="weekendBox">
-							<view >
-								<text style="font-size: 30rpx; margin-right: 90rpx; " >周三</text>
-							</view>
-							<view style="display: flex;">
-								<text style="font-size: 30rpx;">￥</text> <input v-model="form.wednesdayPrice" type="text" placeholder="请输入价格"   style="width: 210rpx;height: 42rpx; font-size: 30rpx;"/> 
-							</view>
+				</view>
+
+				<view class="priceBoxWeek">
+					<view class="weekendBox">
+						<view>
+							<text style="font-size: 30rpx; margin-right: 90rpx; ">周三</text>
+						</view>
+						<view style="display: flex;">
+							<text style="font-size: 30rpx;">￥</text> <input v-model="form.wednesdayPrice" type="text"
+								placeholder="请输入价格" style="width: 210rpx;height: 42rpx; font-size: 30rpx;" />
 						</view>
 					</view>
-					
-					<view class="priceBoxWeek">
-						<view class="weekendBox">
-							<view >
-								<text style="font-size: 30rpx; margin-right: 90rpx; " >周四</text>
-							</view>
-							<view style="display: flex;">
-								<text style="font-size: 30rpx;">￥</text> <input v-model="form.thursdayPrice" type="text" placeholder="请输入价格"   style="width: 210rpx;height: 42rpx; font-size: 30rpx;"/> 
-							</view>
+				</view>
+
+				<view class="priceBoxWeek">
+					<view class="weekendBox">
+						<view>
+							<text style="font-size: 30rpx; margin-right: 90rpx; ">周四</text>
+						</view>
+						<view style="display: flex;">
+							<text style="font-size: 30rpx;">￥</text> <input v-model="form.thursdayPrice" type="text"
+								placeholder="请输入价格" style="width: 210rpx;height: 42rpx; font-size: 30rpx;" />
 						</view>
 					</view>
-					
-					<view class="priceBoxWeek">
-						<view class="weekendBox">
-							<view >
-								<text style="font-size: 30rpx; margin-right: 90rpx; " >周五</text>
-							</view>
-							<view style="display: flex;">
-								<text style="font-size: 30rpx;">￥</text> <input v-model="form.fridayPrice" type="text" placeholder="请输入价格"   style="width: 210rpx;height: 42rpx; font-size: 30rpx;"/> 
-							</view>
+				</view>
+
+				<view class="priceBoxWeek">
+					<view class="weekendBox">
+						<view>
+							<text style="font-size: 30rpx; margin-right: 90rpx; ">周五</text>
+						</view>
+						<view style="display: flex;">
+							<text style="font-size: 30rpx;">￥</text> <input v-model="form.fridayPrice" type="text"
+								placeholder="请输入价格" style="width: 210rpx;height: 42rpx; font-size: 30rpx;" />
 						</view>
 					</view>
-					
-					<view class="priceBoxWeek">
-						<view class="weekendBox">
-							<view >
-								<text style="font-size: 30rpx; margin-right: 90rpx; " >周六</text>
-							</view>
-							<view style="display: flex;">
-								<text style="font-size: 30rpx;">￥</text> <input v-model="form.saturdayPrice" type="text" placeholder="请输入价格"   style="width: 210rpx;height: 42rpx; font-size: 30rpx;"/> 
-							</view>
+				</view>
+
+				<view class="priceBoxWeek">
+					<view class="weekendBox">
+						<view>
+							<text style="font-size: 30rpx; margin-right: 90rpx; ">周六</text>
+						</view>
+						<view style="display: flex;">
+							<text style="font-size: 30rpx;">￥</text> <input v-model="form.saturdayPrice" type="text"
+								placeholder="请输入价格" style="width: 210rpx;height: 42rpx; font-size: 30rpx;" />
 						</view>
 					</view>
-					
-					<view class="priceBoxWeek">
-						<view class="weekendBox" style=" border-bottom: 1rpx solid #fff;">
-							<view  style="margin-top: 10rpx;">
-								<text style="font-size: 30rpx; margin-right: 90rpx; " >周日</text>
-							</view>
-							<view style="display: flex; margin-top: 10rpx;">
-								<text style="font-size: 30rpx;">￥</text> <input v-model="form.sundayPrice" type="text" placeholder="请输入价格"   style="width: 210rpx;height: 42rpx; font-size: 30rpx;
+				</view>
+
+				<view class="priceBoxWeek">
+					<view class="weekendBox" style=" border-bottom: 1rpx solid #fff;">
+						<view style="margin-top: 10rpx;">
+							<text style="font-size: 30rpx; margin-right: 90rpx; ">周日</text>
+						</view>
+						<view style="display: flex; margin-top: 10rpx;">
+							<text style="font-size: 30rpx;">￥</text> <input v-model="form.sundayPrice" type="text"
+								placeholder="请输入价格" style="width: 210rpx;height: 42rpx; font-size: 30rpx;
 								
-								 "/> 
-							</view>
+								 " />
 						</view>
 					</view>
-			 </view>
-			 <!-- 房间列表 -->
-			 <view class="everyHouseList" style="padding-top: 20rpx;">
-			 	 <view class="HouseListTitleInfo" >
-			 	 	<text style="font-size: 32rpx; font-weight: 700;">房间列表</text>
+				</view>
+			</view>
+			<!-- 房间列表 -->
+			<view class="everyHouseList" style="padding-top: 20rpx;">
+				<view class="HouseListTitleInfo">
+					<text style="font-size: 32rpx; font-weight: 700;">房间列表</text>
 					<text style="font-size: 24rpx; color: #777;">共8个房间</text>
-			 	 </view>
-				 <!-- 房间号 -->
-				 <view class="priceBoxWeek">
-				 	<view class="weekendBox" style="display: flex; justify-content: space-between;">						
+				</view>
+				<!-- 房间号 -->
+				<view class="priceBoxWeek">
+					<view class="weekendBox" style="display: flex; justify-content: space-between;">
 						<view style="display: flex;">
-							<text> 楼层：</text><input style="width: 50rpx;" v-model="form.roomFloor[0].floor" type="text" />
+							<text> 楼层：</text><input style="width: 50rpx;" v-model="form.roomFloor[0].floor"
+								type="text" />
 						</view>
 						<view style="display: flex;">
-								<text > 房间号：</text><input style="width: 50rpx;"  v-model="form.roomFloor[0].roomNumber" type="text" />
+							<text> 房间号：</text><input style="width: 50rpx;" v-model="form.roomFloor[0].roomNumber"
+								type="text" />
 						</view>
-						
-				 		<view style="display: flex; margin-top: 10rpx;">
+
+						<view style="display: flex; margin-top: 10rpx;">
 							<u-icon name="trash"></u-icon>
-				 		</view>
-				 	</view>
-				 </view>
-				 
-				
-			 </view>
-			 
-			 <!-- 添加按钮 -->
-			 <view class="submit">
-			 	<u-icon name="plus-circle" color=" #1372FF"></u-icon>
+						</view>
+					</view>
+				</view>
+
+
+			</view>
+
+			<!-- 添加按钮 -->
+			<view class="submit">
+				<u-icon name="plus-circle" color=" #1372FF"></u-icon>
 				<text style="color: #1372FF; font-size: 30rpx;">添加房间</text>
-			 </view>
-			 
-			 <!-- 确定添加按钮 -->
-			 <view class="addSubmit" @click="addNewRoom">
-				 
-			 	<text style="line-height: 96rpx; margin-left:310rpx; font-size: 32rpx; color: #fff;">确定</text>
-			 </view>
-		</view>
-			
 			</view>
+
+			<!-- 确定添加按钮 -->
+			<view class="addSubmit" @click="addNewRoom">
+
+				<text style="line-height: 96rpx; margin-left:310rpx; font-size: 32rpx; color: #fff;">确定</text>
+			</view>
+		</view>
+
+	</view>
 </template>
 
 <script>
-	export default{
-		data(){
-			return{
-				checked:false,
-				weekedChecked:false,
-				action: '',//图片服务器地址
-							fileList: [
-								{
-									url: '',
-								}
-							],
-				
-				form:{
-					homestayId:'',
-					mondayPrice:'',
-					tuesdayPrice:'',
-					wednesdayPrice:'',
-					thursdayPrice:'',
-					fridayPrice:'',
-					saturdayPrice:'',
-					sundayPrice:'',
-					name:'',
-					shortName:'',
-					roomFloor:[
-					{	floor:'',
-						roomNumber:''}
-					]
-					
+	export default {
+		data() {
+			return {
+				checked: false,
+				weekedChecked: false,
+				action: '', //图片服务器地址
+				fileList: [],
+
+				form: {
+					homestayId: '',
+					mondayPrice: '',
+					tuesdayPrice: '',
+					wednesdayPrice: '',
+					thursdayPrice: '',
+					fridayPrice: '',
+					saturdayPrice: '',
+					sundayPrice: '',
+					name: '',
+					shortName: '',
+					roomFloor: [{
+						floor: '',
+						roomNumber: ''
+					}]
+
 				},
-					
-				
+
+
 			}
-			
+
 		},
-		onLoad({id}){
-			this.form.homestayId=id
+		onLoad({
+			id
+		}) {
+			this.form.homestayId = id
 			console.log(this.form.homestayId)
-			
+
 		},
-		methods:{
-			// change(status) {
-			// 				console.log(status);
-			// 			},
-			addNewRoom(){
-				this.$api.post('/merchant/hotel/mine/addHouseBase',this.form).then(res=>{
-					console.log(res)
-					if(res.data.code===0){
-						this.$showToast('添加成功');
-						setTimeout(()=>{
-							uni.reLaunch({
-								url:'/pages/my/roomType'
+		methods: {
+			// 删除图片
+			deletePic(event) {
+				this.fileList.splice(event.index, 1)
+			},
+			// 新增图片
+			async afterRead(event) {
+					const result = await this.uploadFilePromise(event.file[0].url);
+					//图片路径
+					console.log(result)
+			},
+			// 图片大小超出最大允许大小
+			overSize(e) {
+				uni.$u.toast('上传图片大小不能超过10MB!')
+			},
+			//上传图片
+			uploadFilePromise(url) {
+				console.log(url)
+				return new Promise((resolve, reject) => {
+					let a = uni.uploadFile({
+						url: 'https://i.ringzle.com/island-cloud-server/oss/file/upload', 
+						filePath: url,
+						name: 'file',
+						header: {
+							token: wx.getStorageSync('access_token')
+						},
+						success: (res) => {
+							console.log(res)
+							let data = JSON.parse(res.data) //最终传给的是字符串，这里需要转换格式
+							this.fileList.push({
+								url: data.data.url
 							})
-						},1500)
-					}
+							resolve(data.data.url)
+						}
+					});
 				})
-			}
+			},
 		}
-		
+
 	}
 </script>
 
-<style lang="scss"> 
+<style lang="scss">
 	.page {
 		background: #F3F4F4;
 		padding-bottom: 260rpx;
@@ -255,41 +282,48 @@
 		overflow-y: auto;
 		overflow-x: auto;
 	}
+
 	.body {
 		padding-top: 20rpx;
 		padding-left: 30rpx;
 		padding-right: 30rpx;
 	}
-	.typeInfo{
+
+	.typeInfo {
 		background-color: #fff;
-		width: 650rpx;
-		height: 290rpx;
-		border-radius: 10rpx;
-		padding-top: 30rpx;
-		padding-left: 15rpx;
-		padding-right: 30rpx;
+		width: 100%;
+		height: 145px;
+		border-radius: 5px;
+		padding-top: 15px;
+		padding-left: 7px;
+		padding-right: 15px;
+		box-sizing: border-box;
 	}
-	.titleInfo{
-	// margin-top: 30rpx;
-	margin-left: 20rpx;
-	margin-bottom: 40rpx;
+
+	.titleInfo {
+		// margin-top: 30rpx;
+		margin-left: 20rpx;
+		margin-bottom: 40rpx;
 	}
-	.cellBox{
+
+	.cellBox {
 		margin-left: 20rpx;
 		display: flex;
 		padding-bottom: 40rpx;
 		border-bottom: 1rpx solid #E1E1E1;
 	}
-	.bigRoom{
+
+	.bigRoom {
 		margin-left: 20rpx;
 		width: 100%;
 		height: 102rpx;
 		display: flex;
 		// justify-content: center;
 		align-items: center;
-		
+
 	}
-	.shelves{
+
+	.shelves {
 		width: 695rpx;
 		height: 102rpx;
 		background-color: #fff;
@@ -301,27 +335,31 @@
 		// padding-left: 30rpx;
 		// padding-right: 30rpx;
 	}
-	.uploadPic{
+
+	.uploadPic {
 		padding-top: 28rpx;
 		width: 690rpx;
-		height: 293rpx;
+		// height: 293rpx;
 		background-color: #fff;
 		border-radius: 10rpx;
 		margin-top: 20rpx;
 	}
-	.pic{
-		margin-left: 30rpx;
-		margin-top: 20rpx;
-		width: 190rpx;
-		height: 120rpx;
-		background-color: pink;
+
+	.pic {
+		// margin-left: 30rpx;
+		// margin-top: 20rpx;
+		// width: 190rpx;
+		// height: 120rpx;
+		margin:20rpx 30rpx;
+		padding-bottom: 20rpx;
 	}
+
 	// .custom-upload-button{
 	// 	width: 190rpx;
 	// 	height: 120rpx;
-	
+
 	// }
-	.priceInfo{
+	.priceInfo {
 		width: 690rpx;
 		height: 908rpx;
 		background-color: #fff;
@@ -329,19 +367,22 @@
 		margin-top: 20rpx;
 		padding-top: 30rpx;
 	}
-	.week{
-		
+
+	.week {
+
 		padding-left: 30rpx;
 		padding-right: 30rpx;
 		margin-bottom: 20rpx;
 	}
-	.weekend{
+
+	.weekend {
 		display: flex;
 		justify-content: space-between;
 		border-bottom: 1rpx solid #E1E1E1;
 		padding-bottom: 30rpx;
 	}
-	.everyDay{
+
+	.everyDay {
 		padding-left: 30rpx;
 		padding-right: 30rpx;
 		width: 100%;
@@ -350,29 +391,33 @@
 		display: flex;
 		align-items: center;
 	}
-	.days{
+
+	.days {
 		display: flex;
 		align-items: center;
 		border-bottom: 1rpx solid #E1E1E1;
 		padding-bottom: 30rpx;
 	}
-	.priceBoxWeek{
+
+	.priceBoxWeek {
 		display: flex;
 		align-items: center;
 		height: 102rpx;
-	   padding-left: 30rpx;
-	  padding-right: 30rpx;
+		padding-left: 30rpx;
+		padding-right: 30rpx;
 	}
-	.weekendBox{
-	width: 630rpx;
-	display: flex;
-	margin-top: 20rpx;
-	// margin-right: 90rpx;
-	// justify-content: space-between;
-	border-bottom: 1rpx solid #E1E1E1;
-	padding-bottom: 32rpx;
+
+	.weekendBox {
+		width: 630rpx;
+		display: flex;
+		margin-top: 20rpx;
+		// margin-right: 90rpx;
+		// justify-content: space-between;
+		border-bottom: 1rpx solid #E1E1E1;
+		padding-bottom: 32rpx;
 	}
-	.everyHouseList{
+
+	.everyHouseList {
 		// padding-right: 30rpx;
 		width: 690rpx;
 		// height: 908rpx;
@@ -381,14 +426,16 @@
 		margin-top: 20rpx;
 		// padding-top: 30rpx;
 	}
-	.HouseListTitleInfo{
+
+	.HouseListTitleInfo {
 		margin-right: 30rpx;
 		margin-left: 20rpx;
 		margin-bottom: 40rpx;
 		display: flex;
 		justify-content: space-between;
 	}
-	.submit{
+
+	.submit {
 		margin-top: 20rpx;
 		border-radius: 10rpx;
 		width: 690rpx;
@@ -398,16 +445,21 @@
 		justify-content: center;
 		align-items: center;
 	}
-	.addSubmit{
-		  position: fixed;  /* 固定定位 */  
-		    bottom: 20rpx;         /* 底部对齐 */  
-		    left: 0;            /* 可选：左对齐 */  
-		    width: 690rpx;         /* 可选：宽度为 100% */  
-			height: 96rpx;
-			margin-left: 30rpx;
-			// padding-top: 20rpx;
-			margin-top: 30rpx;
-		    background-color: #1372FF;
-			border-radius: 48rpx;
+
+	.addSubmit {
+		position: fixed;
+		/* 固定定位 */
+		bottom: 20rpx;
+		/* 底部对齐 */
+		left: 0;
+		/* 可选：左对齐 */
+		width: 690rpx;
+		/* 可选：宽度为 100% */
+		height: 96rpx;
+		margin-left: 30rpx;
+		// padding-top: 20rpx;
+		margin-top: 30rpx;
+		background-color: #1372FF;
+		border-radius: 48rpx;
 	}
 </style>

pages/my/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="page" :style="{'height':(h-th)+'px'}">
+	<view class="page" :style="{'height':(h)+'px'}">
 		<c-nav-bar title="我的" bgColor="transparent" :titleStyle="titleStyle" :showIcon="false"></c-nav-bar>
 		<view class="bg" :style="{'padding-top':(mt+30)+'px'}">
 			<view class="account">

pages/my/roomType.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="page" :style="{'height':(h-th)+'px','padding-top':mt+'px'}">
-			<c-nav-bar title="房型列表" :showIcon="false" :titleStyle="titleStyle"></c-nav-bar>
+			<c-nav-bar title="房型列表" :showIcon="true" :titleStyle="titleStyle"></c-nav-bar>
 			<!-- 房型数量 -->
 			<view class="typeNum">
 					<text style="font-size: 24rpx; color: #777;">共3个房型</text>