feat: 订单bug

pages/HotelMerchandise/record.vue

@@ -2,10 +2,11 @@
 	<view class="page" :style="{'min-height':(h)+'px','padding-top':mt+'px'}">
 		<c-nav-bar title="核销记录"></c-nav-bar>
 		<view class="top">
-			<view class="time" @click="show=true">
+			<!-- <view class="time" @click="show=true"> -->
+			<view class="time">
 				<u-icon name="calendar" :label="dateStr" labelPos="right" labelColor="#666" color="#666" space="7px"
 					size="25px"></u-icon>
-				<u-icon name="arrow-down" color="#999" size="20px" style="margin-left: 20rpx;"></u-icon>
+				<!-- <u-icon name="arrow-down" color="#999" size="20px" style="margin-left: 20rpx;"></u-icon> -->
 			</view>
 			<view class="right">共{{totalNum}}单 收入¥{{totalAmount}}</view>
 		</view>
@@ -55,6 +56,7 @@
 					page: 1,
 					homestayId: uni.getStorageSync('homestayId'),
 					orderStatus: 2,
+					orderType: 201
 
 				}).then(res => {
 					if (res.data.code == 0) {

pages/my/roomType.vue

@@ -89,8 +89,7 @@
 						每天价格
 					</view>
 
-					<u-radio-group @change="selectType" size="32" iconSize="24" v-model="fromData.comboType"
-						placement="row" activeColor='#1372FF'>
+					<u-radio-group @change="selectType" size="32" iconSize="24" placement="row" activeColor='#1372FF'>
 						<u-radio labelSize='30' label="固定设置" :name='1'></u-radio>
 						<u-radio labelSize='30' label="按天设置" :name='2' v-if="tabIndex==0"></u-radio>
 					</u-radio-group>
@@ -100,15 +99,15 @@
 					<view class="hander-three-text">
 						起始日期
 					</view>
-					<view class="hander-three-input">
-						<u--input placeholder="请选择" border="none" fontSize='26' v-model="value"
-							@change="change"></u--input>
+					<view class="hander-three-input" @click="show=true">
+						<u--input placeholder="请选择" border="none" disabledColor='#fff' fontSize='26' v-model="valueTime"
+							disabled='false'></u--input>
 					</view>
 					<view class="hander-three-icon">
 						<u-icon name="arrow-right"></u-icon>
 					</view>
 				</view>
-				<view class="hander-four">
+				<view class="hander-four" v-if="typeIndex==1">
 					<view class="hander-three-text" style="">
 						<view class="">
 							价格
@@ -118,17 +117,62 @@
 						</view>
 					</view>
 					<view class="hander-three-input">
-						<u--input placeholder="请输入价格" fontSize='26' border="none" v-model="value"
+						<u--input placeholder="请输入价格" fontSize='26' border="none" v-model="fromData.price"
 							@change="change"></u--input>
 					</view>
 					<view class="hander-three-icon">
 						<u-icon name="close-circle-fill"></u-icon>
 					</view>
 				</view>
-
+				<view class="" v-else>
+					<view class="hander-four">
+						<view class="hander-three-text" style="">
+							<view class="">
+								周五-周六
+							</view>
+							<view class="">
+								￥
+							</view>
+						</view>
+						<view class="hander-three-input">
+							<u--input placeholder="请输入价格" fontSize='26' border="none"
+								v-model="fromData.friToSatdayPrice" @change="change"></u--input>
+						</view>
+						<view class="hander-three-icon">
+							<u-icon name="close-circle-fill"></u-icon>
+						</view>
+					</view>
+					<view class="hander-four">
+						<view class="hander-three-text" style="">
+							<view class="">
+								周日-周四
+							</view>
+							<view class="">
+								￥
+							</view>
+						</view>
+						<view class="hander-three-input">
+							<u--input placeholder="请输入价格" fontSize='26' border="none"
+								v-model="fromData.sunToThursdayPrice" @change="change"></u--input>
+						</view>
+						<view class="hander-three-icon">
+							<u-icon name="close-circle-fill"></u-icon>
+						</view>
+					</view>
+				</view>
+				<view class="btn-btn" @click='addTime()'>
+					<view class="btn">
+						确定
+					</view>
+				</view>
 			</view>
 		</u-popup>
 
+		<!-- <u-calendar :show="show" :mode="mode" @confirm="confirm"></u-calendar> -->
+		<!-- 选择入驻时间 -->
+		<u-calendar class="u-time" confirmDisabledText="确定" :show="show" :mode="mode" @confirm="confirm"
+			@close="closeDate" :closeOnClickOverlay="true" color="#007A69"></u-calendar>
+
 	</view>
 </template>
 
@@ -141,11 +185,24 @@
 				isSelect: false,
 				Selected: false,
 				showPricing: false,
+				show: false,
 				selectedTags: [],
 				ids: [],
 				from: {},
 				tabIndex: 0,
+				typeIndex: 1,
+				mode: 'range',
+				valueTime: '',
+				fromData: {
+					homestayId: uni.getStorageSync('homestayId'),
+					houseBaseIdList: [],
+					friToSatdayPrice: '',
+					sunToThursdayPrice: '',
+					price: '',
+					rentDateEnd: '',
+					rentDateStart: '',
 
+				}
 			}
 		},
 		onLoad() {
@@ -153,6 +210,33 @@
 			this.getHomestayId()
 		},
 		methods: {
+			addTime() {
+
+				this.$api.post('/merchant/hotel/room/state/batchDefineRoomPrice', this.fromData).then(res => {
+					console.log(res.data);
+					if (res.data.code == 0) {
+						this.$showToast('定价成功')
+						setTimeout(() => {
+							this.showPricing = false
+							this.fromData = {}
+							this.getHomestayId()
+						}, 1000)
+
+					} else this.$showToast(res.data.msg)
+				})
+			},
+			confirm(e) {
+				console.log(e);
+				this.show = false
+				this.valueTime = e[0] + '~' + e[e.length - 1]
+				console.log(this.valueTime);
+				this.fromData.rentDateStart = e[0]
+				this.fromData.rentDateEnd = e[e.length - 1]
+
+			},
+			closeDate() {
+				this.show = false
+			},
 			selectType(type) {
 				console.log(type);
 				this.typeIndex = type;
@@ -174,11 +258,11 @@
 				} else {
 					console.log('2222');
 					this.selectedTags.push(e);
-					this.ids.push(e.houseBaseId)
-					this.from = {
-						idList: this.ids,
-						status: e.status == 1 ? 0 : 1
-					}
+					this.fromData.houseBaseIdList.push(e.houseBaseId)
+					// this.from = {
+					// 	idList: this.ids,
+					// 	status: e.status == 1 ? 0 : 1
+					// }
 				}
 			},
 
@@ -225,6 +309,31 @@
 </script>
 
 <style lang="scss">
+	.u-reset-button,
+	.u-button--active {
+		width: 100% !important;
+	}
+
+	.data-v-b73440ae {
+		height: 500rpx !important;
+	}
+
+	.u-slide-up-enter-active {
+		height: 75vh !important;
+	}
+
+	.u-time {
+		height: 75vh !important;
+	}
+
+	.u-calendar-month__days__day {
+		height: 130rpx !important;
+	}
+
+	.u-square {
+		background-color: #fff !important;
+	}
+
 	.u-input__content {
 		margin-top: 22rpx !important;
 	}