no message

pages.json

@@ -10,7 +10,7 @@
 		{
 			"path": "pages/home/home",
 			"style": {
-				"navigationBarTitleText": "靖安民宿",
+				"navigationBarTitleText": "靖安乡村民宿",
 				"enablePullDownRefresh": true
 			}
 		}, {
@@ -47,7 +47,7 @@
 		}, {
 			"path": "pages/detail/detail",
 			"style": {
-				"navigationBarTitleText": "民宿详情",
+				"navigationBarTitleText": "乡村民宿详情",
 				"enablePullDownRefresh": false
 			}
 		}, {
@@ -66,7 +66,7 @@
 		}, {
 			"path": "pages/affirmOrder/affirmOrder",
 			"style": {
-				"navigationBarTitleText": "民宿名称",
+				"navigationBarTitleText": "填写订单",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}

pages/affirmOrder/affirmOrder.vue

@@ -5,7 +5,7 @@
 			<img src="../../static/my/headerImg.png" />
 
 			<!-- 标题区域 -->
-			<view class="header_title">民宿名称</view>
+			<view class="header_title">填写订单</view>
 			<!-- 返回图标区域 -->
 			<view class="header_icon" @click="handleBack">
 				<img src="../../static/index/left.png" />
@@ -26,7 +26,7 @@
 				</view>
 				<view class="info_msg">{{ info.item.hName }}</view>
 				<view class="info_type">
-					<view class="type_item">普通型</view>
+					<view class="type_item">{{ info.hTypeName }}</view>
 				</view>
 				<view class="info_tag">
 					<view class="tag_item">{{ info.item.hAreas }}㎡</view>

pages/authorization/authorization.vue

@@ -35,11 +35,11 @@ export default {
 				})
 				if (res.code === 200) {
 					let data = JSON.stringify(res.data)
-					uni.navigateTo({
+					uni.reLaunch({
 						url: `/pages/shopInfo/shopInfo?type=1&data=${data}`
 					})
 				} else {
-					uni.navigateTo({
+					uni.reLaunch({
 						url: '/pages/shop/shop'
 					})
 				}
@@ -53,11 +53,11 @@ export default {
 				})
 				if (res.code === 200) {
 					let data = JSON.stringify(res.data)
-					uni.navigateTo({
+					uni.reLaunch({
 						url: `/pages/shopInfo/shopInfo?type=2&data=${data}`
 					})
 				} else {
-					uni.navigateTo({
+					uni.reLaunch({
 						url: '/pages/shop2/shop2'
 					})
 				}

pages/detail/detail.vue

@@ -2,7 +2,7 @@
 	<view class="container" :style="'overflow:' + (showPage ? 'hidden' : 'visible')" v-if="info">
 		<!-- 顶部民宿图片区域 -->
 		<view class="banner">
-			<img class="img" :src="info.coverImg" />
+			<img class="img" mode="aspectFill" :src="info.hotelFileInfoList[0].url" />
 			<view class="slogan">
 				<img src="../../static/index/slogan.png" />
 			</view>
@@ -62,14 +62,24 @@
 			</view>
 
 			<!-- 日历组件 -->
-			<uv-calendars ref="calendar" range title="选择日期" start-text="住店" end-text="离店" color="#096562" confirmColor="#096562" @confirm="handleConfirm" />
+			<uv-calendars
+				ref="calendar"
+				range
+				title="选择日期"
+				start-text="住店"
+				end-text="离店"
+				color="#096562"
+				confirmColor="#096562"
+				:startDate="startTime"
+				@confirm="handleConfirm"
+			/>
 
 			<!-- 房型列表区域 -->
 			<view class="body_content" v-if="list.length">
 				<!-- 每一个房型盒子区域 -->
 				<view class="body_box" v-for="item in list" :key="item.id" @click="handleLookDetail(item)">
 					<view class="box_left">
-						<img :src="item.fileInfoList[0].url" />
+						<img mode="aspectFill" :src="item.fileInfoList[0].url" />
 					</view>
 
 					<view class="box_center">
@@ -312,7 +322,8 @@ export default {
 						item: item,
 						queryStartTime: this.startTime,
 						queryEndTime: this.endTime,
-						dayList: this.dayList
+						dayList: this.dayList,
+						hTypeName: this.info.hTypeName
 					})
 					uni.navigateTo({
 						url: `/pages/affirmOrder/affirmOrder?info=${info}`

pages/detailInfo/detailInfo.vue

@@ -16,7 +16,7 @@
 			<view class="header_info">{{ detailInfo.openTime }}开业 I {{ detailInfo.fitupTime }}装修 I {{ detailInfo.roomNumber }}间客房</view>
 			<!-- 类型区域 -->
 			<view class="header_types">
-				<view class="types_item">{{ detailInfo.htype }}型</view>
+				<view class="types_item">{{ detailInfo.hTypeName }}</view>
 			</view>
 		</view>
 

pages/orderDetail/orderDetail.vue

@@ -14,7 +14,7 @@
 			<view class="header_type" v-if="info.orderStatus === '1'">待支付</view>
 			<view class="header_time" v-if="info.orderStatus === '1'">
 				剩余
-				<uv-count-down :time="info.countDownTime" format="mm:ss" @finish="finish(info)"></uv-count-down>
+				<uv-count-down v-if="info.countDownTime" :time="info.countDownTime" format="mm:ss" @finish="finish(info)"></uv-count-down>
 			</view>
 			<view class="header_info" v-if="info.orderStatus === '1'">超时后，订单将会自动取消</view>
 			<view class="header_type" v-if="info.orderStatus === '2'">已支付</view>
@@ -78,7 +78,7 @@
 			<!-- 民宿信息区域 -->
 			<view class="body_box">
 				<view class="box_info">
-					<img src="../../static/index/banner.png" />
+					<img mode="aspectFill" :src="info.houseFileInfoList[0].url" />
 					<view class="info_msg">
 						<view class="msg_name">{{ info.hotelName }}</view>
 						<view class="msg_address">{{ info.hotelHposition }}</view>
@@ -172,7 +172,9 @@ export default {
 				this.info = res.data
 				// 计算出倒计时时间（毫秒）
 				let temLockTime = this.info.lockTime ? this.info.lockTime * 1 : 15
-				this.info.countDownTime = new Date(this.info.createTime.slice(0, 19)).getTime() + temLockTime * 60 * 1000 - new Date().getTime()
+				// 兼容ios部分系统转换时间格式
+				let createTime = this.info.createTime.slice(0, 19).replace(/-/g, '/')
+				this.info.countDownTime = new Date(createTime).getTime() + temLockTime * 60 * 1000 - new Date().getTime()
 			}
 		},
 		// 点击复制文字回调

pages/orderManage/orderManage.vue

@@ -16,7 +16,7 @@
 						<view class="title">{{ item.hotelName }}</view>
 						<view class="type type2" v-if="item.orderStatus === '1'">
 							待支付，剩余
-							<uv-count-down :time="item.countDownTime" format="mm:ss" @finish="finish(item)"></uv-count-down>
+							<uv-count-down v-if="item.countDownTime" :time="item.countDownTime" format="mm:ss" @finish="finish(item)"></uv-count-down>
 						</view>
 						<view class="type" v-if="item.orderStatus === '2'">已支付</view>
 						<view class="type" v-if="item.orderStatus === '3'">待入住</view>
@@ -31,7 +31,7 @@
 
 					<!-- 酒店信息区域 -->
 					<view class="box_info">
-						<img class="img" :src="item.imgUrl || '../../static/index/banner.png'" />
+						<img class="img" mode="aspectFill" :src="item.houseFileInfoList[0].url" />
 						<view class="info_right">
 							<view class="info_right_item">{{ item.houseOrderNumber }}间，{{ item.houseName }}</view>
 							<view class="info_right_item">{{ (item.orderStartTime || '').slice(0, 10) }} - {{ (item.orderEndTime || '').slice(0, 10) }}</view>
@@ -41,7 +41,7 @@
 
 					<!-- 按钮区域 -->
 					<view class="box_btn" v-if="item.orderStatus === '1' || item.orderStatus === '6'">
-						<view class="btn_item" v-if="item.orderStatus === '1'" @click.stop="goPagePay(item)">预定</view>
+						<view class="btn_item pay" v-if="item.orderStatus === '1'" @click.stop="goPagePay(item)">去支付</view>
 						<view class="btn_item" v-if="item.orderStatus === '6'" @click.stop="goPageDetail(item)">再次预定</view>
 					</view>
 				</view>
@@ -117,7 +117,9 @@ export default {
 				this.orderList.forEach((ele) => {
 					if (ele.orderStatus === '1') {
 						let temLockTime = ele.lockTime ? ele.lockTime * 1 : 15
-						ele.countDownTime = new Date(ele.createTime.slice(0, 19)).getTime() + temLockTime * 60 * 1000 - new Date().getTime()
+						// 兼容ios部分系统转换时间格式
+						let createTime = ele.createTime.slice(0, 19).replace(/-/g, '/')
+						ele.countDownTime = new Date(createTime).getTime() + temLockTime * 60 * 1000 - new Date().getTime()
 					}
 				})
 			}
@@ -391,6 +393,12 @@ export default {
 				font-size: 28rpx;
 				border: 1rpx solid #808080;
 			}
+
+			.pay {
+				color: #fff;
+				border: none;
+				background-color: #096562;
+			}
 		}
 	}
 

pages/pay/pay.vue

@@ -2,7 +2,7 @@
 	<view class="container" v-if="info">
 		<view class="countDown">
 			交易剩余时间
-			<uv-count-down :time="info.countDownTime" format="mm:ss" @finish="finish"></uv-count-down>
+			<uv-count-down v-if="info.countDownTime" :time="info.countDownTime" format="mm:ss" @finish="finish"></uv-count-down>
 		</view>
 		<view class="price">
 			<text>¥</text>
@@ -12,17 +12,17 @@
 		<view class="title">住房信息</view>
 		<view class="info">
 			<view class="info_time">
-				{{ getTime((info.orderStartTime || '').slice(0, 19)) }}
+				{{ getTimes((info.orderStartTime || '').slice(0, 19)) }}
 				<text class="gap">{{ getWeek((info.orderStartTime || '').slice(0, 19)) }}</text>
 				<view class="time_line"></view>
 				<view class="time_num">{{ info.orderLiveTime }}</view>
 				<view class="time_line"></view>
-				<view class="gap">{{ getTime((info.orderEndTime || '').slice(0, 19)) }}</view>
+				<view class="gap">{{ getTimes((info.orderEndTime || '').slice(0, 19)) }}</view>
 				<text>{{ getWeek((info.orderEndTime || '').slice(0, 19)) }}</text>
 			</view>
-			<view class="info_msg">{{ info.houseName }}房</view>
+			<view class="info_msg">{{ info.houseName }}</view>
 			<view class="info_type">
-				<view class="type_item">普通型</view>
+				<view class="type_item">{{ info.hotelType }}</view>
 			</view>
 			<view class="info_tag">
 				<view class="tag_item" v-if="info.hAreas">{{ info.hAreas }}㎡</view>
@@ -72,7 +72,9 @@ export default {
 				this.info = res.data
 				// 计算出倒计时时间（毫秒）
 				let temLockTime = this.info.lockTime ? this.info.lockTime * 1 : 15
-				this.info.countDownTime = new Date(this.info.createTime.slice(0, 19)).getTime() + temLockTime * 60 * 1000 - new Date().getTime()
+				// 兼容ios部分系统转换时间格式
+				let createTime = this.info.createTime.slice(0, 19).replace(/-/g, '/')
+				this.info.countDownTime = new Date(createTime).getTime() + temLockTime * 60 * 1000 - new Date().getTime()
 			}
 		},
 		// 点击确认支付按钮回调
@@ -154,7 +156,9 @@ export default {
 			})
 		},
 		getWeek(time) {
-			let date = new Date(time)
+			// 兼容ios部分系统转换时间格式
+			let rgTime = time.replace(/-/g, '/')
+			let date = new Date(rgTime)
 			// 获取星期
 			let week = date.getDay()
 			let weekList = ['日', '一', '二', '三', '四', '五', '六']
@@ -162,8 +166,10 @@ export default {
 			let res = '周' + weekList[week]
 			return res
 		},
-		getTime(time) {
-			let date = new Date(time)
+		getTimes(time) {
+			// 兼容ios部分系统转换时间格式
+			let rgTime = time.replace(/-/g, '/')
+			let date = new Date(rgTime)
 			// 获取月份
 			let M = date.getMonth() + 1
 			// 获取日期

pages/search/search.vue

@@ -3,7 +3,7 @@
 		<!-- 轮播图区域 -->
 		<swiper class="banner" indicator-dots indicator-color="rgba(255, 255, 255, 0.5)" indicator-active-color="#1E7DFB" autoplay circular>
 			<swiper-item v-for="item in lunbo" :key="item.id">
-				<img :src="item" />
+				<img mode="aspectFill" :src="item" />
 			</swiper-item>
 		</swiper>
 
@@ -13,7 +13,7 @@
 
 			<view class="search_box">
 				<!-- 每一个图标区域 -->
-				<view class="box_item" v-for="item in iconsList" :key="item.id">
+				<view class="box_item" v-for="item in iconsList" :key="item.id" @click="handleTip">
 					<img :src="item.imgUrl"></img>
 					<view class="item_text">
 						{{item.text}}
@@ -32,11 +32,11 @@
 		
 			<view class="trave_box">
 				<!-- 每一个图标区域 -->
-				<view class="box_item" v-for="item in traveList" :key="item.id">
+				<view class="box_item" v-for="item in traveList" :key="item.id" @click="handleTip">
 					<view style="height: 218rpx;">
 						<img :src="item.imgUrl"></img>
 						<view class="trave_dian">
-							<img src="../../static/search/trave_map.png"></img>
+							<img mode="aspectFill" src="../../static/search/trave_map.png"></img>
 							<view class="trave_length">{{item.juli}}</view>
 						</view>
 					</view>
@@ -59,14 +59,14 @@
 		
 			<view class="techan_box">
 				<view class="techan_list" v-for="item in techanList" :key="item.id">
-					<img :src="item.imgUrl" class="techan_img"></img>
+					<img :src="item.imgUrl" class="techan_img" mode="aspectFill"></img>
 					<view>
 						<text class="techan_name">{{item.name}}</text>
 						<text class="techan_type">{{item.type}}</text>
 						<text class="techan_liang">{{item.liang}}</text>
 						<text class="techan_price">{{item.price}}</text>
 					</view>
-					<img src="../../static/search/gouwuche.png" class="techan_jiagou"></img>
+					<img src="../../static/search/gouwuche.png" class="techan_jiagou" @click="handleTip"></img>
 					<view class="techan_line"></view>
 				</view>
 			</view>
@@ -121,7 +121,8 @@ export default {
 			],
 			// 景区导览
 			traveList:[
-				{id:1,imgUrl:'https://jtishfw.ncjti.edu.cn/homestay/scenicguide/中部梦幻城.png',juli:'45.96km',name:'中部梦幻城',jibie:'4A'},
+				{id:1,
+				imgUrl:'https://jtishfw.ncjti.edu.cn/homestay/scenicguide/中部梦幻城.png',juli:'45.96km',name:'中部梦幻城',jibie:'4A'},
 				{id:2,imgUrl:'https://jtishfw.ncjti.edu.cn/homestay/scenicguide/中华传统文化园.png',juli:'45.96km',name:'中华传统文化园',jibie:'4A'},
 				{id:3,imgUrl:'https://jtishfw.ncjti.edu.cn/homestay/scenicguide/靖安宝峰寺.png',juli:'45.96km',name:'靖安宝峰寺',jibie:'4A'},
 				{id:4,imgUrl:'https://jtishfw.ncjti.edu.cn/homestay/scenicguide/九岭森林温泉度假村.png',juli:'45.96km',name:'九岭森林温泉度假村',jibie:'4A'},
@@ -131,9 +132,23 @@ export default {
 				{id:1,imgUrl:'https://jtishfw.ncjti.edu.cn/homestay/productpicture/靖安木耳.png',name:'靖安木耳',type:'手工产品 营养丰富',liang:'500kg',price:'¥200',},
 				{id:1,imgUrl:'https://jtishfw.ncjti.edu.cn/homestay/productpicture/靖安白茶.jpg',name:'靖安白茶',type:'经典茶品 营养丰富',liang:'500kg',price:'¥400',},
 				{id:1,imgUrl:'https://jtishfw.ncjti.edu.cn/homestay/productpicture/靖安椪柑.jpg',name:'靖安椪柑',type:'汁水丰富 营养丰富',liang:'500kg',price:'¥80',},
-				{id:1,imgUrl:'https://jtishfw.ncjti.edu.cn/homestay/productpicture/猕猴桃糕.jpg',name:'猕猴桃糕',type:'手工制作 回味无穷',liang:'500kg',price:'¥50',}
+				{
+					id:1,
+					imgUrl:'https://jtishfw.ncjti.edu.cn/homestay/productpicture/猕猴桃糕.jpg',
+					name:'猕猴桃糕',
+					type:'手工制作 回味无穷',
+					liang:'500kg',
+					price:'¥50',}
 			],
 		}
+	},
+	methods:{
+		handleTip(){
+			uni.showToast({
+				title: '功能开发中',
+				icon: 'none'
+			})
+		}
 	}
 }
 </script>

pages/setMeal/setMeal.vue

@@ -4,44 +4,93 @@
 		<view class="setMeal_box" v-for="item in list" :key="item.id">
 			<!-- 图片区域 -->
 			<view class="box_img">
-				<img :src="item.img" />
+				<img mode="aspectFill" :src="item.img" />
 			</view>
 
 			<!-- 套餐信息区域 -->
 			<view class="box_info">
-				<view class="info_msg">{{item.title}}</view>
+				<view class="info_msg">{{ item.title }}</view>
 				<view class="info_price">
 					<view class="new">
-						{{item.price}}
+						{{ item.price }}
 						<text>起</text>
 					</view>
 
-					<view class="old">市场价{{item.outprice}}</view>
+					<view class="old">市场价{{ item.outprice }}</view>
 				</view>
 				<view class="info_btn">
-					<view class="btn_count">已售{{item.number}}张</view>
+					<view class="btn_count">已售{{ item.number }}张</view>
 
-					<view class="btn_pay">立即抢购</view>
+					<view class="btn_pay" @click="handleTip">立即抢购</view>
 				</view>
 			</view>
-		</view>
-		
+		</view>
 	</view>
 </template>
 
 <script>
 export default {
 	data() {
-		return {
-			// 套餐
-			list:[
-				{id:1,img:'https://jtishfw.ncjti.edu.cn/homestay/setmeal/1.jpg',title:'新店开业：端午周末不加价|靖安双溪抱朴小院3天2晚含门票|三爪仑漂流双人|中华传统文化园套票|特色小吃2份',price:'¥180',outprice:'¥400',number:1151,},
-				{id:1,img:'https://jtishfw.ncjti.edu.cn/homestay/setmeal/2.png',title:'新店开业：国庆中秋大优惠|靖安双溪抱朴小院6天5晚含门票|三爪仑漂流三人|中华传统文化园套票|特色小吃3份',price:'¥240',outprice:'¥520',number:188,},
-				{id:1,img:'https://jtishfw.ncjti.edu.cn/homestay/setmeal/3.png',title:'新店开业：国庆中秋大优惠|靖安双溪抱朴小院6天5晚含门票|三爪仑漂流双人|中华传统文化园套票|特色小吃2份',price:'¥180',outprice:'¥400',number:58,},
-				{id:1,img:'https://jtishfw.ncjti.edu.cn/homestay/setmeal/4.png',title:'新店开业：暑期限定特惠|靖安双溪抱朴小院3天2晚含门票|三爪仑漂流五人人|中华传统文化园套票|特色小吃5份',price:'¥900',outprice:'¥1700',number:88,},
-				{id:1,img:'https://jtishfw.ncjti.edu.cn/homestay/setmeal/5.png',title:'新店开业：暑期限定特惠|靖安双溪抱朴小院3天2晚含门票|三爪仑漂流双人|中华传统文化园套票|特色小吃2份',price:'¥180',outprice:'¥400',number:88,},
-				{id:1,img:'https://jtishfw.ncjti.edu.cn/homestay/setmeal/6.jpg',title:'新店开业：端午周末不加价|靖安双溪抱朴小院3天2晚含门票|三爪仑漂流三人|中华传统文化园套票|特色小吃3份',price:'¥240',outprice:'¥520',number:72,},
-			],
+		return {
+			// 套餐
+			list: [
+				{
+					id: 1,
+					img: 'https://jtishfw.ncjti.edu.cn/homestay/setmeal/1.jpg',
+					title: '周末不加价|靖安双溪抱朴小院3天2晚含门票|三爪仑漂流双人',
+					price: '¥180',
+					outprice: '¥400',
+					number: 1151
+				},
+				{
+					id: 1,
+					img: 'https://jtishfw.ncjti.edu.cn/homestay/setmeal/2.png',
+					title: '新店开业：国庆中秋大优惠|靖安双溪抱朴小院6天5晚含门票|特色小吃3份',
+					price: '¥240',
+					outprice: '¥520',
+					number: 188
+				},
+				{
+					id: 1,
+					img: 'https://jtishfw.ncjti.edu.cn/homestay/setmeal/3.png',
+					title: '中华传统文化园套票|特色小吃2份',
+					price: '¥180',
+					outprice: '¥400',
+					number: 58
+				},
+				{
+					id: 1,
+					img: 'https://jtishfw.ncjti.edu.cn/homestay/setmeal/4.png',
+					title: '三爪仑漂流五人人|中华传统文化园套票|特色小吃5份',
+					price: '¥900',
+					outprice: '¥1700',
+					number: 88
+				},
+				{
+					id: 1,
+					img: 'https://jtishfw.ncjti.edu.cn/homestay/setmeal/5.png',
+					title: '三爪仑漂流双人|中华传统文化园套票',
+					price: '¥180',
+					outprice: '¥400',
+					number: 88
+				},
+				{
+					id: 1,
+					img: 'https://jtishfw.ncjti.edu.cn/homestay/setmeal/6.jpg',
+					title: '中华传统文化园套票|特色小吃3份',
+					price: '¥240',
+					outprice: '¥520',
+					number: 72
+				}
+			]
+		}
+	},
+	methods: {
+		handleTip() {
+			uni.showToast({
+				title: '功能开发中',
+				icon: 'none'
+			})
 		}
 	}
 }