feat: 订单bug

pages/home/details.vue

@@ -11,10 +11,14 @@
 			</view>
 			<view v-if="list.length>0" class="t_item" v-for="(item,index) in list" :key="index">
 				<view class="b_grey b_rb">{{item.houseBaseName}}</view>
-				<view class="b_rb" :class="(index==list.length-1||index==list.length-2)?'b_grey':''">{{item.totalNums}}</view>
-				<view class="b_rb" :class="(index==list.length-1||index==list.length-2)?'b_grey':''">{{item.saleNums}}</view>
-				<view class="b_rb" :class="(index==list.length-1||index==list.length-2)?'b_grey':''">{{item.occupyNums}}</view>
-				<view class="b_rb" :class="(index==list.length-1||index==list.length-2)?'b_grey':''">{{item.unSaleNums}}</view>
+				<view class="b_rb" :class="(index==list.length-1||index==list.length-2)?'b_grey':''">{{item.totalNums}}
+				</view>
+				<view class="b_rb" :class="(index==list.length-1||index==list.length-2)?'b_grey':''">{{item.saleNums}}
+				</view>
+				<view class="b_rb" :class="(index==list.length-1||index==list.length-2)?'b_grey':''">{{item.occupyNums}}
+				</view>
+				<view class="b_rb" :class="(index==list.length-1||index==list.length-2)?'b_grey':''">{{item.unSaleNums}}
+				</view>
 			</view>
 		</view>
 	</view>
@@ -24,45 +28,92 @@
 	export default {
 		data() {
 			return {
-				title:'',
-				item:null,
-				list:[]
+				title: '',
+				item: null,
+				list: []
 			}
 		},
 		onLoad(option) {
-			if(option.item){
+			if (option.item) {
 				this.item = JSON.parse(decodeURIComponent(option.item));
-				this.title = this.item.dateDay+'房情表';
+				this.title = this.item.dateDay + '房情表';
 				this.getList();
-			} 
+			}
 		},
 		methods: {
-			getList(){
-				this.$api.get('/merchant/hotel/home/getRoomConditionList',{
-					homestayId:uni.getStorageSync('homestayId'),
-					dateDay:this.item.dateDay
-				}).then(res=>{
-					if(res.data.code===0){
-						this.list = res.data.data.splice(0,res.data.data.length-3);
-						let totalNums = this.list.reduce((cur,pre)=>cur+pre.totalNums,0);
-						let saleNums = this.list.reduce((cur,pre)=>cur+pre.saleNums,0);
-						let occupyNums = this.list.reduce((cur,pre)=>cur+pre.occupyNums,0);
-						let unSaleNums = this.list.reduce((cur,pre)=>cur+pre.unSaleNums,0);
-						this.list.push({
-							houseBaseName:'占房屋总数的比例',
-							totalNums:'-',
-							saleNums:(saleNums/totalNums*100).toFixed(2)+'%',
-							occupyNums:(occupyNums/totalNums*100).toFixed(2)+'%',
-							unSaleNums:(unSaleNums/totalNums*100).toFixed(2)+'%'
-						})
-						this.list.push({
-							houseBaseName:'总计',
-							totalNums:totalNums,
-							saleNums:saleNums,
-							occupyNums:occupyNums,
-							unSaleNums:unSaleNums
-						})
-					}else this.$showToast(res.data.msg)
+			getList() {
+				this.$api.get('/merchant/hotel/home/getRoomConditionList', {
+					homestayId: uni.getStorageSync('homestayId'),
+					dateDay: this.item.dateDay
+				}).then(res => {
+					if (res.data.code === 0) {
+						if (res.data.data.length > 6 || res.data.data.length == 6) {
+							this.list = res.data.data.splice(0, res.data.data.length - 3);
+							console.log('000000', this.list);
+							let totalNums = this.list.reduce((cur, pre) => cur + pre.totalNums, 0);
+							let saleNums = this.list.reduce((cur, pre) => cur + pre.saleNums, 0);
+							let occupyNums = this.list.reduce((cur, pre) => cur + pre.occupyNums, 0);
+							let unSaleNums = this.list.reduce((cur, pre) => cur + pre.unSaleNums, 0);
+							this.list.push({
+								houseBaseName: '占房屋总数的比例',
+								totalNums: '-',
+								saleNums: (saleNums / totalNums * 100).toFixed(2) + '%',
+								occupyNums: (occupyNums / totalNums * 100).toFixed(2) + '%',
+								unSaleNums: (unSaleNums / totalNums * 100).toFixed(2) + '%'
+							})
+							this.list.push({
+								houseBaseName: '总计',
+								totalNums: totalNums,
+								saleNums: saleNums,
+								occupyNums: occupyNums,
+								unSaleNums: unSaleNums
+							})
+						} else if (res.data.data.length == 3) {
+							this.list = res.data.data.splice(0, res.data.data.length - 2);
+							console.log('1111', this.list);
+							let totalNums = this.list.reduce((cur, pre) => cur + pre.totalNums, 0);
+							let saleNums = this.list.reduce((cur, pre) => cur + pre.saleNums, 0);
+							let occupyNums = this.list.reduce((cur, pre) => cur + pre.occupyNums, 0);
+							let unSaleNums = this.list.reduce((cur, pre) => cur + pre.unSaleNums, 0);
+							this.list.push({
+								houseBaseName: '占房屋总数的比例',
+								totalNums: '-',
+								saleNums: (saleNums / totalNums * 100).toFixed(2) + '%',
+								occupyNums: (occupyNums / totalNums * 100).toFixed(2) + '%',
+								unSaleNums: (unSaleNums / totalNums * 100).toFixed(2) + '%'
+							})
+							this.list.push({
+								houseBaseName: '总计',
+								totalNums: totalNums,
+								saleNums: saleNums,
+								occupyNums: occupyNums,
+								unSaleNums: unSaleNums
+							})
+						} else {
+							this.list = res.data.data.splice(0, res.data.data.length - 2);
+							console.log('2222', this.list);
+							let totalNums = this.list.reduce((cur, pre) => cur + pre.totalNums, 0);
+							let saleNums = this.list.reduce((cur, pre) => cur + pre.saleNums, 0);
+							let occupyNums = this.list.reduce((cur, pre) => cur + pre.occupyNums, 0);
+							let unSaleNums = this.list.reduce((cur, pre) => cur + pre.unSaleNums, 0);
+							this.list.push({
+								houseBaseName: '占房屋总数的比例',
+								totalNums: '-',
+								saleNums: (saleNums / totalNums * 100).toFixed(2) + '%',
+								occupyNums: (occupyNums / totalNums * 100).toFixed(2) + '%',
+								unSaleNums: (unSaleNums / totalNums * 100).toFixed(2) + '%'
+							})
+							this.list.push({
+								houseBaseName: '总计',
+								totalNums: totalNums,
+								saleNums: saleNums,
+								occupyNums: occupyNums,
+								unSaleNums: unSaleNums
+							})
+						}
+
+
+					} else this.$showToast(res.data.msg)
 				})
 			}
 		}
@@ -70,18 +121,21 @@
 </script>
 
 <style scoped lang="less">
-	.page{
+	.page {
 		background: #F9FAFC;
-		.table{
+
+		.table {
 			width: 100%;
 			border-top: 1rpx solid #D1D1D1;
 			border-left: 1rpx solid #D1D1D1;
 			margin-top: 20rpx;
-			.t_th{
+
+			.t_th {
 				display: flex;
 				align-items: center;
 				justify-content: space-around;
-				&>view{
+
+				&>view {
 					width: 25%;
 					display: flex;
 					align-items: center;
@@ -94,12 +148,13 @@
 					color: #1F2425;
 				}
 			}
-		
-			.t_item{
+
+			.t_item {
 				display: flex;
 				align-items: center;
 				justify-content: space-around;
-				&>view{
+
+				&>view {
 					width: 25%;
 					height: 106rpx;
 					display: flex;
@@ -115,12 +170,12 @@
 				}
 			}
 		}
-		
-		.b_grey{
+
+		.b_grey {
 			background: #FAFAFA !important;
 		}
-		
-		.b_rb{
+
+		.b_rb {
 			border-right: 1rpx solid #D1D1D1;
 			border-bottom: 1rpx solid #D1D1D1;
 		}

pages/my/houseList.vue

@@ -31,7 +31,7 @@
 			 -->
 			<view class="uploadPic">
 				<view style=" margin-left: 30rpx;">
-					<text style="font-size: 32rpx; font-weight: 700; ">封面图片(0/1)</text>
+					<text style="font-size: 32rpx; font-weight: 700; ">封面图片({{fileList.length}}/1)</text>
 
 				</view>
 				<view style="margin-top: 20rpx; margin-left: 30rpx; color: #777; font-size: 24rpx;">
@@ -70,8 +70,8 @@
 							<text style="font-size: 30rpx; margin-right: 90rpx; ">固定房价</text>
 						</view>
 						<view style="display: flex;">
-							<text style="font-size: 30rpx;">￥</text> <input v-model="form.price" type="text"
-								placeholder="请输入价格" style="width: 210rpx;height: 42rpx; font-size: 30rpx;" />
+							<text style="font-size: 30rpx;">￥</text> <input v-model="form.price" placeholder="请输入价格"
+								style="width: 210rpx;height: 42rpx; font-size: 30rpx;" />
 						</view>
 					</view>
 				</view>
@@ -166,7 +166,7 @@
 			<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>
+					<text style="font-size: 24rpx; color: #777;">共{{form.roomFloor.length}}个房间</text>
 				</view>
 				<!-- 房间号 -->
 				<view class="priceBoxWeek" v-for="(room,index) in form.roomFloor" :key="index">

pagesMy/stayInfo/roomPosition.vue

@@ -4,7 +4,8 @@
 		<!-- <c-nav-bar title="位置定位" :showIcon="true"></c-nav-bar> -->
 		<view class="content">
 			<view class="card">
-				<view class="card1" @tap="open()">
+				<!-- <view class="card1" @tap="open()"> -->
+				<view class="card1">
 					<text style="font-size: 30rpx; color: #333; font-weight: Regular; ">
 						<text>所属城市</text>
 						<text style="margin-left: 30rpx; text-align: right; width: 100%;"
@@ -44,9 +45,9 @@
 				<view class="card1">
 					<text>地图位置</text>
 				</view>
-				<view style="margin-top: 20rpx;" class="collapseTitle">
+				<!-- <view style="margin-top: 20rpx;" class="collapseTitle">
 					点击地图可调整至更精确位置
-				</view>
+				</view> -->
 				<view style="margin-top: 20rpx;">
 					<view class="content-map">
 						<map style="width: 100%;height: 100%;" :latitude="latitude" :longitude="longitude" :scale="16"