Merge branch 'master' of http://git.ringzle.com:3000/htcwl/hotelHomestayWx

components/Tabbares/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-tabbar :value="tabbarValues" @change="name => tabbarValues = name" :fixed="true" :placeholder="true"
+		<u-tabbar :value="tabbarValues" @change="name => tabbarValues = name" :fixed="true" :placeholder="true" activeColor="#007A69"
 			:safeAreaInsetBottom="true" :border="false">
 			<u-tabbar-item :text="item.text" v-for="(item,index) in list" :key="index"
 				@click="changeTabbars(item,index)">
@@ -20,20 +20,20 @@
 			return {
 				tabbarValues: 0,
 				list: [{
-						activeImg: 'https://i.ringzle.com/file/20240106/57895bbc5414416ea5de2a537ed23dc3.png',
+						activeImg: 'https://i.ringzle.com/file/20240320/eb54f2488b4f45c9929d2fa78b104b80.png',
 						inactiveImg: 'https://i.ringzle.com/file/20240106/29bd09ef7eb748f1820c335f86f74c61.png',
 						text: '首页',
 						paths: '/pagesHouse/home/index'
 					},
 					{
-						activeImg: 'https://i.ringzle.com/file/20240106/584d0a4108c44fa5bc566d0d0082e07d.png',
-						inactiveImg: 'https://i.ringzle.com/file/20240106/9561cd3843694891998a34ed41be0ec8.png',
+						activeImg: 'https://i.ringzle.com/file/20240320/df1512af95ff4f639e37b2fa905d7808.png',
+						inactiveImg: 'https://i.ringzle.com/file/20240320/07590c34e1fc45e2af4786607418039b.png',
 						text: '扫码核验',
 						paths: '/pagesHouse/Verification/index'
 					},
 					{
-						activeImg: 'https://i.ringzle.com/file/20240106/daf6362d4d6745c29501cf30a4d99bc2.png',
-						inactiveImg: 'https://i.ringzle.com/file/20240106/8c1f9fc0b5604ef7b966d98f2ffb1d2e.png',
+						activeImg: 'https://i.ringzle.com/file/20240320/319f9665e40b40c7b056e1e50c8e1ce5.png',
+						inactiveImg: 'https://i.ringzle.com/file/20240320/81146a88ac964a8ab1effff76f44c9d1.png',
 						text: '我的',
 						paths: '/pagesHouse/Mine/index'
 					}
@@ -78,8 +78,20 @@
 
 <style lang="less">
 	/deep/.u-page__item__slot-icon {
-		width: 40rpx;
-		height: 40rpx;
+		width: 38rpx;
+		height: 38rpx;
 		margin: 8rpx 0 4rpx;
 	}
+	/deep/.u-tabbar-item__text{
+		color: #007A69;
+	}
+	/deep/.u-tabbar-item {
+		&:nth-child(2){
+			.u-page__item__slot-icon,image {
+				width: 72rpx;
+				height: 54rpx;
+			}
+		}
+		
+	}
 </style>

pages/my/houseList.vue

@@ -49,11 +49,11 @@
 			<!-- 价格信息 -->
 			<view class="priceInfo">
 				<!-- 标题 -->
-				<view class="titleInfo">
+				<!-- <view class="titleInfo">
 					<text style="font-size: 32rpx; font-weight: 700; margin-left: 10rpx;">价格信息</text>
-				</view>
+				</view> -->
 				<!-- 周末周日区分 -->
-				<view class="week">
+				<!-- <view class="week">
 					<view class="weekend">
 						<view>
 							<text style="font-size: 30rpx; ">区分平日周末</text>
@@ -62,9 +62,9 @@
 							<u-switch v-model="weekedChecked" size="50" active-color="#07C160"></u-switch>
 						</view>
 					</view>
-				</view>
+				</view> -->
 				<!-- 平日价格 -->
-				<view class="priceBoxWeek" v-if="!weekedChecked">
+				<!-- <view class="priceBoxWeek" v-if="!weekedChecked">
 					<view class="weekendBox" @scroll="scroll">
 						<view>
 							<text style="font-size: 30rpx; margin-right: 90rpx; ">固定房价</text>
@@ -75,10 +75,10 @@
 								style="width: 210rpx;height: 42rpx; font-size: 30rpx;" />
 						</view>
 					</view>
-				</view>
+				</view> -->
 
 				<!-- 每日价格 -->
-				<view class="priceBoxWeek" v-if="weekedChecked">
+				<!-- <view class="priceBoxWeek" v-if="weekedChecked">
 					<view class="weekendBox">
 						<view>
 							<text style="font-size: 30rpx; margin-right: 90rpx; ">周一</text>
@@ -88,9 +88,9 @@
 								placeholder="请输入价格" style="width: 210rpx;height: 42rpx; font-size: 30rpx;" />
 						</view>
 					</view>
-				</view>
+				</view> -->
 
-				<view class="priceBoxWeek" v-if="weekedChecked">
+				<!-- <view class="priceBoxWeek" v-if="weekedChecked">
 					<view class="weekendBox">
 						<view>
 							<text style="font-size: 30rpx; margin-right: 90rpx; ">周二</text>
@@ -100,9 +100,9 @@
 								placeholder="请输入价格" style="width: 210rpx;height: 42rpx; font-size: 30rpx;" />
 						</view>
 					</view>
-				</view>
+				</view> -->
 
-				<view class="priceBoxWeek" v-if="weekedChecked">
+				<!-- <view class="priceBoxWeek" v-if="weekedChecked">
 					<view class="weekendBox">
 						<view>
 							<text style="font-size: 30rpx; margin-right: 90rpx; ">周三</text>
@@ -112,9 +112,9 @@
 								placeholder="请输入价格" style="width: 210rpx;height: 42rpx; font-size: 30rpx;" />
 						</view>
 					</view>
-				</view>
+				</view> -->
 
-				<view class="priceBoxWeek" v-if="weekedChecked">
+			<!-- 	<view class="priceBoxWeek" v-if="weekedChecked">
 					<view class="weekendBox">
 						<view>
 							<text style="font-size: 30rpx; margin-right: 90rpx; ">周四</text>
@@ -124,9 +124,9 @@
 								placeholder="请输入价格" style="width: 210rpx;height: 42rpx; font-size: 30rpx;" />
 						</view>
 					</view>
-				</view>
+				</view> -->
 
-				<view class="priceBoxWeek" v-if="weekedChecked">
+				<!-- <view class="priceBoxWeek" v-if="weekedChecked">
 					<view class="weekendBox">
 						<view>
 							<text style="font-size: 30rpx; margin-right: 90rpx; ">周五</text>
@@ -136,9 +136,9 @@
 								placeholder="请输入价格" style="width: 210rpx;height: 42rpx; font-size: 30rpx;" />
 						</view>
 					</view>
-				</view>
+				</view> -->
 
-				<view class="priceBoxWeek" v-if="weekedChecked">
+				<!-- <view class="priceBoxWeek" v-if="weekedChecked">
 					<view class="weekendBox">
 						<view>
 							<text style="font-size: 30rpx; margin-right: 90rpx; ">周六</text>
@@ -148,9 +148,9 @@
 								placeholder="请输入价格" style="width: 210rpx;height: 42rpx; font-size: 30rpx;" />
 						</view>
 					</view>
-				</view>
+				</view> -->
 
-				<view class="priceBoxWeek" v-if="weekedChecked">
+				<!-- <view class="priceBoxWeek" v-if="weekedChecked">
 					<view class="weekendBox" style=" border-bottom: 1rpx solid #fff;">
 						<view style="margin-top: 10rpx;">
 							<text style="font-size: 30rpx; margin-right: 90rpx; ">周日</text>
@@ -161,7 +161,7 @@
 								 " />
 						</view>
 					</view>
-				</view>
+				</view> -->
 			</view>
 			<!-- 房间列表 -->
 			<view class="everyHouseList" style="padding-top: 20rpx;">
@@ -237,11 +237,9 @@
 					roomFloor: [{
 						floor: '',
 						roomNumber: ''
-					}]
-
+					}],
+					cover:''
 				},
-
-
 			}
 
 		},
@@ -292,7 +290,8 @@
 							let data = JSON.parse(res.data) //最终传给的是字符串，这里需要转换格式
 							this.fileList.push({
 								url: data.data.url
-							})
+							})
+							this.form.cover = data.data.url;
 							resolve(data.data.url)
 						}
 					});
@@ -307,7 +306,7 @@
 						this.form.isPutaway = 1
 					} else {
 						this.form.isPutaway = 0
-					}
+					}
 					this.$api.post('/merchant/hotel/mine/addHouseBase', this.form).then(res => {
 						// console.log(res)
 						if (res.data.code === 0) {
@@ -327,7 +326,7 @@
 						this.form.isPutaway = 1
 					} else {
 						this.form.isPutaway = 0
-					}
+					}
 					this.$api.put('/merchant/hotel/mine/updHouseBase', this.form).then(res => {
 						// console.log('修改成功')
 						if (res.data.code === 0) {

pagesHouse/HotelMerchandise/index.vue

@@ -252,22 +252,69 @@
 				Selected: false,
 				showPricing: false,
 				areaShow: false,
-				list1: [{
+				//餐饮
+				list: [{
 						name: '创建时间',
-						id: 1,
+						key: 'createDate',
+						value: 1
+					},
+					{
+						name: '上架时间',
+						key: 'updateDate',
+						value: 1
+					},
+					{
+						name: '销量从高到低',
+						key: 'salesVolume',
+						value: 1
 					},
 					{
 						name: '价格从高到低',
-						id: 2,
+						key: 'discountPrice',
+						value: 1
 					},
 					{
 						name: '价格从低到高',
-						id: 4,
+						key: 'discountPrice',
+						value: 0
+					},
+					// {
+					// 	name: '库存从高到低',
+					// 	key: 'price',
+					// 	value: 1
+					// },
+					// {
+					// 	name: '库存从低到高',
+					// 	key: 'price',
+					// 	value: 0
+					// },
+				],
+				//渔家乐
+				list1: [{
+						name: '创建时间',
+						key: 'createDate',
+						value: 1
+					},
+					{
+						name: '上架时间',
+						key: 'updateDate',
+						value: 1
 					},
 					{
 						name: '销量从高到低',
-						id: 2,
+						key: 'salesVolume',
+						value: 1
 					},
+					{
+						name: '价格从高到低',
+						key: 'discountPrice',
+						value: 1
+					},
+					{
+						name: '价格从低到高',
+						key: 'discountPrice',
+						value: 0
+					}
 				],
 				areaShowIndex: null,
 				fromData: {
@@ -662,12 +709,28 @@
 			},
 			// 区域筛选
 			clickareaShow(e, i) {
-
 				this.areaShowIndex = i;
 				this.areaShow = false;
-				this.fromData.sortType = e.id;
-				this.fromData.page = 1;
-				this.getRepast();
+				// this.fromData.sortType = e.id;
+				// this.fromData.page = 1;
+				//this.getRepast();
+				this.sortPrice(e)
+
+			},
+			sortPrice(item) {
+				// if (item.val == 1) {
+				// 	this.pricesort = 1
+				// } else {
+				// 	this.pricesort = 2
+				// }
+				//let val = this.pricesort;
+				this.roomType.sort(function(a, b) {
+					if (item.value == 1) { //降序
+						return b[item.key] - a[item.key];
+					} else {
+						return a[item.key] - b[item.key]; //	升序
+					}
+				});
 			},
 			// 上架时间
 			areaShowed() {

pagesHouse/Mine/PersonalEditing/PersonalEditing.vue

@@ -7,7 +7,7 @@
 					店铺标志
 				</view>
 				<view class="image">
-					<image :src="dto.shopSign">
+					<image :src="list.shopSign">
 					</image>
 					<u-icon @click="more()" name="arrow-right" color="#AAA"></u-icon>
 				</view>
@@ -17,7 +17,7 @@
 					店铺名称
 				</view>
 				<view class="right">
-					<input type="text" v-model="dto.name" border="none" placeholder="请输入手机号" style="height: 48rpx;" />
+					<input type="text" v-model="list.name" border="none" placeholder="请输入手机号" style="height: 48rpx;" />
 				</view>
 			</view>
 			<view class="one-mobile">
@@ -25,7 +25,7 @@
 					联系电话
 				</view>
 				<view class="right">
-					<input type="text" v-model="dto.phone" border="none" placeholder="请输入手机号" style="height: 48rpx;" />
+					<input type="text" v-model="list.phone" border="none" placeholder="请输入手机号" style="height: 48rpx;" />
 				</view>
 			</view>
 			<view class="one-mobile">
@@ -33,7 +33,7 @@
 					商家地址
 				</view>
 				<view class="right">
-					<input type="text" v-model="dto.areaDetail" border="none" placeholder="请输入" style="height: 48rpx;" />
+					<input type="text" v-model="list.areaDetail" border="none" placeholder="请输入" style="height: 48rpx;" />
 				</view>
 
 			</view>
@@ -65,7 +65,7 @@
 
 		</view> -->
 		<view class="from-content1">
-			<button class="tenant-button" @click="merchant">
+			<button class="tenant-button" @click="save">
 				立即保存
 			</button>
 		</view>
@@ -87,6 +87,14 @@
 					idCode: '', // 证件号
 					id: '',
 					areaDetail: ''
+				},
+				list:{
+					name: '黄沙村渔家乐', //昵称
+					phone: '18755113256', //手机号
+					shopSign: '', // 头像
+					idCode: '', // 证件号
+					id: '',
+					areaDetail: ''
 				},
 				shopImgs: [],
 			}
@@ -100,13 +108,11 @@
 				this.$api.get('/api/merchant/food/merchant/' + uni.getStorageSync('merchantId')).then(res => {
 					console.log(res)
 					if (res.data.code == 0) {
-						this.dto = res.data.data;
+						this.list = res.data.data;
 						if (!res.data.data.shopSign) {
-							this.dto.shopSign =
+							this.list.shopSign =
 								'https://i.ringzle.com/file/20240225/26feb8cc8f744123a980211ebdfb8d40.png';
 						}
-						//this.shopImgs = res.data.data.split(',');
-						console.log(this.shopImgs)
 					}
 				})
 			},
@@ -136,9 +142,26 @@
 				});
 
 			},
-			save() {
-				this.$api.put('/merchant/merchantFisherman/home', this.dto).then(res => {
-
+			save() {
+				this.dto.idCardFront = this.list.idCardFront
+				this.dto.name = this.list.name
+				this.dto.companyName = this.list.companyName
+				this.dto.merchantType = this.list.merchantType
+				this.dto.companyType = this.list.companyType
+				this.dto.legalPerson = this.list.legalPerson
+				this.dto.idCard = this.list.idCard
+				this.dto.creditCode = this.list.creditCode
+				this.dto.idCardReverse = this.list.idCardReverse
+				this.dto.licensePic = this.list.licensePic
+				// this.dto.usccl = this.list.usccl
+				this.dto.storeFrontPic = this.list.storeFrontPic
+				this.dto.shopImgs = this.list.shopImgs
+				this.dto.linkName = this.list.linkName
+				this.dto.phone = this.list.phone
+				this.dto.areaDetail = this.list.areaDetail
+				this.dto.id = uni.getStorageSync('merchantId')
+				this.dto.id = uni.getStorageSync('merchantId')
+				this.$api.put('/api/merchant/food/updateMerchantInfo',this.dto).then(res => {
 				})
 			}
 		}
@@ -146,19 +169,25 @@
 </script>
 
 <style lang="scss" scoped>
-	//保存样式
-	.tenant-button {
-		position: fixed;
-		bottom: 0;
-		background: #007A69;
-		border-radius: 40rpx;
-		font-weight: bold;
-		font-size: 28rpx;
-		color: #FFFFFF;
-		width: 92%;
-		box-sizing: border-box;
-		// padding-bottom: 30rpx;
-		margin-bottom: 30rpx;
+	//保存样式
+	.from-content1{
+		position: fixed;
+		bottom: 30rpx;
+		padding: 0 24rpx;
+		left: 0;
+		z-index: 10;
+		    width: 100%;
+		    box-sizing: border-box;
+	}
+	.tenant-button {
+		background: #007A69;
+		border-radius: 40rpx;
+		font-weight: bold;
+		font-size: 28rpx;
+		color: #FFFFFF;
+		height: 88rpx;
+		line-height: 88rpx;
+		
 	}
 
 	.page {

pagesHouse/Mine/ordersList/details/details.vue

@@ -163,17 +163,17 @@
 			</template> -->
 
 		</view>
-		<view class="btns" v-if="merchantType==10&&infoMation.status==1">
-			<view class="detail del" @tap="hexiao()" v-if="infoMation.status==1">
+		<!-- <view class="btns" v-if="merchantType==10&&infoMation.status==1"> -->
+		<!-- 	<view class="detail del" @tap="hexiao()" v-if="infoMation.status==1">
 				核销订单
-			</view>
+			</view> -->
 			<!-- <template v-else>
 				<view class="detail" @tap="Detail(list)">
 					删除订单
 				</view>
 			</template> -->
 
-		</view>
+	<!-- 	</view> -->
 	</view>
 
 </template>
@@ -340,7 +340,7 @@
 		box-sizing: border-box;
 		// height: 100%;
 		background-color: #007A69;
-		padding-bottom: 170rpx;
+		padding-bottom: 40rpx;
 	}
 
 	.foods {

pagesHouse/Mine/ordersList/index.vue

@@ -33,11 +33,11 @@
 						</view>
 					</view>
 					<!-- 待使用 -->
-					<view class="bottom" @click="hexiao(item)" v-if="item.status==1">
+				<!-- 	<view class="bottom" @click="hexiao(item)" v-if="item.status==1">
 						<view class="detail s1">
 							核销订单
 						</view>
-					</view>
+					</view> -->
 					<!-- <view class="bottom" @click="Detail(item)" v-else>
 					<view class="detail">
 						删除订单

pagesHouse/Verification/check.vue

@@ -38,6 +38,16 @@
 					v-if="i.remark!='book'"></u-icon>
 			</view>
 		</view>
+		<view class="list">
+			<view class="tit">选择渔船</view>
+			<view class="typeItem">
+				<view class="txt" v-for="(t,i) in types" :key="i" @click="typeIndex=i" :class="typeIndex==i?'on':''">
+				{{t}}
+				<image v-if="typeIndex==i" src="https://i.ringzle.com/file/20240320/b458b03f8f654a51a921656b8aa955de.png"></image>
+				</view>
+			
+			</view>
+		</view>
 		<view class="btn">
 			<text @click="hexiao">开始发船</text>
 		</view>
@@ -49,6 +59,18 @@
 	export default {
 		data() {
 			return {
+				typeIndex:null,
+				types: ['浙嵊渔休30015',
+					'浙嵊渔休30016',
+					'浙嵊渔休30017',
+					'浙嵊渔休30018',
+					'浙嵊渔休30019',
+					'浙嵊渔休30020',
+					'浙嵊渔休30021',
+					'浙嵊渔休30022',
+					'浙嵊渔休30023',
+					'浙嵊渔休30025',
+				],
 				date: new Date().Format('yyyy-MM-dd'),
 				show: false,
 				data: [],
@@ -85,7 +107,9 @@
 						this.orderInfo = res.data.data;
 						this.keyName = this.orderInfo.playDate + this.orderInfo.playTime + this.boatNo;
 						console.log(uni.getStorageSync(this.keyName))
-						this.data = JSON.parse(uni.getStorageSync(this.keyName)) || [];
+						if(uni.getStorageSync(this.keyName)){
+							this.data = JSON.parse(uni.getStorageSync(this.keyName)) || [];
+						}
 						console.log(this.data)
 					}
 				})
@@ -141,11 +165,16 @@
 			},
 			hexiao() {
 				if (this.data.length == 0) {
-					this.$showToast('请选择核销人')
+					return this.$showToast('请选择核销人')
+				}
+				if (this.typeIndex==null) {
+					return this.$showToast('请选择渔船')
 				}
+				let boatCode=this.types[this.typeIndex];
 				this.$api.post('/scenic/order/sailWriteOff', {
 					orderType: this.orderInfo.orderType,
-					touristList: this.data
+					touristList: this.data,
+					boatCode:boatCode
 				}).then(res => {
 					if (res.data.code == 0) {
 						uni.redirectTo({
@@ -202,6 +231,7 @@
 			display: flex;
 			gap: 36rpx;
 			justify-content: space-between;
+			
 
 			.n {
 				margin-bottom: 20rpx;
@@ -232,7 +262,7 @@
 			background-color: #fff;
 			color: #333;
 			padding: 0 24rpx 36rpx;
-			margin: 20rpx 0;
+			margin: 20rpx 0 0;
 			background: #fff;
 			border-radius: 16rpx;
 
@@ -284,6 +314,7 @@
 		padding: 0 24rpx 0;
 		border-radius: 16rpx;
 		background-color: #fff;
+		margin-top: 20rpx;
 
 		.tit {
 			font-size: 36rpx;
@@ -291,7 +322,39 @@
 			color: #111;
 			padding: 36rpx 0 17rpx;
 		}
-
+		.typeItem{
+			display: flex;
+			justify-content: space-between;
+			flex-wrap: wrap;
+			gap:20rpx 0;
+			padding-bottom: 50rpx;
+			.txt{
+				display: inline-block;
+				width: 316rpx;
+				height: 80rpx;
+				background: #fff;
+				border-radius: 16rpx;
+				text-align: center;
+				line-height: 80rpx;
+				border: 2rpx solid #EFEFEF;
+				color:#333;
+				position: relative;
+				&.on{
+					color:#007A69 ;
+					background: rgba(0,122,105,0.06);
+					border: 2rpx solid #007A69;
+					image{
+						position: absolute;
+						bottom: 0;
+						right: 0;
+						width: 34rpx;
+						height: 26rpx;
+						z-index: 11;
+					}
+				}
+				
+			}
+		}
 		.item {
 			display: flex;
 			justify-content: space-between;

pagesHouse/Verification/index.vue

@@ -7,6 +7,7 @@
 				<text>核销</text>
 			</view>
 		</view>
+		<Tabbares :tabbarid="1" :value="1"></Tabbares>
 	</view>
 </template>
 

pagesHouse/Verification/record.vue

@@ -2,26 +2,41 @@
 	<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">
-				<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>
+			<view style="display: flex;align-items: center;">
+				<view class="time" @click="show=true">
+					<u-icon name="calendar" :label="dateStr" labelPos="right" labelColor="#666" color="#666" space="3px"
+						size="25px"></u-icon>
+					<u-icon name="arrow-right" color="#999" size="32rpx" style="margin:2rpx 0 0 20rpx;"></u-icon>
+				</view>
+				<view style="margin: 0 14rpx 0 10rpx;font-size: 30rpx;color: #666;">至</view>
+				<view class="time" @click="show2=true">
+					<u-icon :label="dateStr2" labelPos="right" labelColor="#666" color="#666" space="3px"
+						size="25px"></u-icon>
+					<u-icon name="arrow-right" color="#999" size="32rpx"></u-icon>
+				</view>
 			</view>
 			<view class="right">共{{totalNum}}单 收入¥{{totalAmount}}</view>
 		</view>
 		<view class="list">
-			<view class="item" v-for="(item,index) in data" :key="index" @tap="toDetails(item)">
-				<image :src="item.goodsType==2?'../../static/bao.png':'../../static/pin.png'"></image>
-				<view class="mid">
-					<text>{{item.playDate}} {{item.playTime}}出发/{{item.goodsType==2?'包船':'拼船'}}/{{item.boatNo}}</text>
-					<text>{{item.num}}人 · 出游{{item.playLength}}小时</text>
-					<text>核销时间：{{item.updateDate}}</text>
+			<block v-if="data.length>0">
+				<view class="item" v-for="(item,index) in data" :key="index" @tap="toDetails(item)">
+					<image :src="item.orderType==2?'../../static/bao.png':'../../static/pin.png'"></image>
+					<view class="mid">
+						<text>{{item.playDate}} {{item.playTime}}出发/{{item.orderType==2?'包船':'拼船'}}/{{item.boatNo}}</text>
+						<text>{{item.num}}人 · 出游{{item.playLength}}小时</text>
+						<text>上船时间：{{item.updateDate}}</text>
+					</view>
+					<view class="price">¥{{item.realPrice}}</view>
 				</view>
-				<view class="price">¥{{item.realPrice}}</view>
-			</view>
+			</block>
+			<block v-else>
+				<NoData/>
+			</block>
 		</view>
 		<u-datetime-picker @confirm="confirmDate" @cancel="show=false" :show="show" v-model="value1"
-			visibleItemCount="6" mode="year-month"></u-datetime-picker>
+			visibleItemCount="6" mode="date"></u-datetime-picker>
+		<u-datetime-picker @confirm="confirmDate2" @cancel="show2=false" :show="show2" v-model="value2"
+			visibleItemCount="6" mode="date"></u-datetime-picker>
 	</view>
 </template>
 
@@ -29,12 +44,16 @@
 	export default {
 		data() {
 			return {
-				dateStr: new Date().Format('yyyy年-MM月'),
-				date: new Date().Format('yyyy-MM'),
+				dateStr: new Date().Format('yyyy-MM-dd'),
+				dateStr2: new Date().Format('yyyy-MM-dd'),
+				date: new Date().Format('yyyy-MM-dd'),
+				date2: new Date().Format('yyyy-MM-dd'),
 				show: false,
+				show2: false,
 				k: '',
 				data: [],
 				value1: Number(new Date()),
+				value2: Number(new Date()),
 				merchantId: uni.getStorageSync('merchantId'),
 				totalAmount: 0,
 				totalNum: 0
@@ -49,14 +68,15 @@
 					limit:50,
 					page:1,
 					merchantId: this.merchantId,
-					queryDate: this.date
+					// queryDate: this.date,
+					startDate: this.date,
+					endDate: this.date2
 				}).then(res => {
 					if (res.data.code == 0) {
 						this.totalAmount = res.data.data.totalAmount;
 						this.totalNum = res.data.data.totalNum;
 						this.data=res.data.data.pageData.list;
 					}
-					console.log(res)
 				})
 			},
 			confirmDate(e) {
@@ -68,12 +88,37 @@
 				const day = ('0' + date.getDate()).slice(-2);
 				// 格式化时间
 				let formattedTime = "";
-				formattedTime = `${year}-${month}`;
-				this.dateStr = `${year}年-${month}月`
+				formattedTime = `${year}-${month}-${day}`;
+				
+				if(Date.parse(formattedTime) - Date.parse(this.date2)>0){
+					return this.$showToast('开始日期不能大于结束日期');
+				}
+				
+				this.dateStr = `${year}-${month}-${day}`
 				this.date = formattedTime;
 				this.show = false;
 				this.getdata()
 			},
+			confirmDate2(e) {
+				// 创建一个Date对象并传入时间戳
+				const date = new Date(e.value);
+				// 使用Date对象的方法获取年、月、日、小时、分钟和秒
+				const year = date.getFullYear();
+				const month = ('0' + (date.getMonth() + 1)).slice(-2);
+				const day = ('0' + date.getDate()).slice(-2);
+				// 格式化时间
+				let formattedTime = "";
+				formattedTime = `${year}-${month}-${day}`;
+				
+				if(Date.parse(formattedTime) - Date.parse(this.date)<0){
+					return this.$showToast('结束日期不能小于开始日期');
+				}
+				
+				this.dateStr2 = `${year}-${month}-${day}`
+				this.date2 = formattedTime;
+				this.show2 = false;
+				this.getdata()
+			},
 			toDetails(item){
 				uni.navigateTo({
 					url:'/pagesHouse/Verification/recordDetails?orderCode='+item.orderCode
@@ -84,14 +129,15 @@
 </script>
 
 <style lang="less" scoped>
+	/deep/ .uicon-arrow-right{
+		margin-top: 4rpx !important;
+	}
+	
 	.page{
 		box-sizing: border-box;
 	}
 	.top {
 		padding: 24rpx 30rpx;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
 
 		.time {
 			display: flex;
@@ -102,7 +148,8 @@
 		.right {
 			color: #999;
 			font-size: 24rpx;
-
+			margin-top: 10rpx;
+			margin-left: 6rpx;
 		}
 
 	}

pagesHouse/Verification/recordCy.vue

@@ -10,14 +10,19 @@
 			<view class="right">共{{totalNum}}单 收入¥{{totalAmount}}</view>
 		</view>
 		<view class="list">
-			<view class="item" v-for="(item,index) in data" :key="index">
-				<image :src="item.productImg|delArr"></image>
-				<view class="mid">
-					<text>{{item.productName}}</text>
-					<text>核销时间：{{item.writeOffTime}}</text>
+			<block v-if="data.length>0">
+				<view class="item" v-for="(item,index) in data" :key="index">
+					<image :src="item.productImg|delArr"></image>
+					<view class="mid">
+						<text>{{item.productName}}</text>
+						<text>核销时间：{{item.writeOffTime}}</text>
+					</view>
+					<view class="price">¥{{item.realityPay}}</view>
 				</view>
-				<view class="price">¥{{item.realityPay}}</view>
-			</view>
+			</block>
+			<block v-else>
+				<NoData/>
+			</block>
 		</view>
 		<u-datetime-picker @confirm="confirmDate" @cancel="show=false" :show="show" v-model="value1"
 			visibleItemCount="6" mode="year-month"></u-datetime-picker>

pagesHouse/Verification/recordDetails.vue

@@ -12,6 +12,9 @@
 			<view class="st_info">
 				<text>出游时间：{{item.orderEntity.playLength}}小时</text>
 			</view>
+			<view class="st_info">
+				<text>联系号码：{{item.orderEntity.linkPhone}}</text>
+			</view>
 		</view>
 		<view class="box person_info">
 			<view class="hx_title">预约人员信息(<span v-if="item&&item.bookList">{{item.bookList.length}}</span>)</view>

pagesHouse/home/index.vue

@@ -1,6 +1,6 @@
 <template>
 
-	<view class="page" :style="{'min-height':(h-th)+'px'}">
+	<view class="page" :style="{'min-height':(h)+'px'}">
 		<u-navbar bgColor="transparent">
 			<view class="u-nav-slot" slot="left" style="display: flex;" @tap="shShow=true">
 				<text>{{name}}</text>

pagesMy/stayInfo/roomPosition.vue

@@ -1,7 +1,7 @@
 <template>
 	<!-- <view class="pages" :style="{'height':(h)+'px','padding-top':mt+'px'}"> -->
 <view class="pages" :style="{'height':(h-th)+'px','padding-top':mt+'px'}">
-		<c-nav-bar title="位置定位" :showIcon="true"></c-nav-bar>
+		<c-nav-bar title="酒店民宿信息" :showIcon="true"></c-nav-bar>
 		<view class="content">
 			<view class="card">
 				<!-- <view class="card1" @tap="open()"> -->
@@ -181,7 +181,8 @@
 				})
 			},
 			// 确定保存
-			save() {
+			save() {
+				if(!this.latitude||!this.longitude) return this.$showToast('请进行地图标点')
 				// if (!this.$u.test.mobile(this.stayInfo.landlinePhone)) {
 				// 	this.$showToast('请输入正确手机号');
 				// 	return