添加酒店等级显示，首页等级介绍弹窗

packageShang/pages/goods/goods.vue

@@ -194,7 +194,7 @@
 								v-if="item.reviewImgs.indexOf(',') != -1"
 								mode="aspectFill"
 								:lazy-load="true"
-								:src="item.reviewImgs.substring(0, item.reviewImgs.indexOf(','))"
+								:src="item.reviewImgs.substring(0, item.reviewImgs.indexOf(','))"
 								@click="preview(item.reviewImgs.substring(0, item.reviewImgs.indexOf(',')))"
 							></image>
 							<image class="border-radius-xs" v-else mode="aspectFill" :lazy-load="true" :src="item.reviewImgs" @click="preview(item.reviewImgs)"></image>
@@ -390,8 +390,8 @@ export default {
 			favorite: false, //是否收藏
 
 			scrollTop: 0,
-			skuAttrDatas: [] ,//商品属性数组
-			vModelValue:1,//加购数量
+			skuAttrDatas: [], //商品属性数组
+			vModelValue: 1 //加购数量
 		}
 	},
 	watch: {
@@ -545,7 +545,7 @@ export default {
 			})
 
 			//商品评价
-			var data = '?goodsId=' + _self.id+'&curPage=1&pageSize=3'
+			var data = '?goodsId=' + _self.id + '&curPage=1&pageSize=3'
 			pingjia(data).then((res) => {
 				console.log('评价', res)
 				if (res.success) {
@@ -846,12 +846,12 @@ export default {
 		},
 		changeValue(value) {
 			console.log('返回数值：', value)
-			if (value > this.cartSale) {
-				this.$api.msg('购买量不能大于库存');
-				this.vModelValue=this.cartSale
+			if (value > this.cartSale) {
+				this.$api.msg('购买量不能大于库存')
+				this.vModelValue = this.cartSale
 				this.cartNum = this.cartSale
-			} else {
-				this.vModelValue=value
+			} else {
+				this.vModelValue = value
 				this.cartNum = value
 			}
 		}

pages.json

@@ -424,6 +424,13 @@
 						"navigationBarTitleText": "推文详情",
 						"enablePullDownRefresh": false
 					}
+				},
+				{
+					"path": "level/level",
+					"style": {
+						"navigationBarTitleText": "等级介绍",
+						"enablePullDownRefresh": false
+					}
 				}
 			]
 		}

pages/detail/detail.vue

@@ -31,7 +31,12 @@
 			<view class="detail_name">{{ info.hotel_name }}</view>
 
 			<view class="detail_info">
-				<view class="info_left">{{ info.fitupTime }}装修 | {{ info.openTime }}开业</view>
+				<view class="info_left">
+					{{ info.fitupTime }}装修 | {{ info.openTime }}开业 &nbsp;&nbsp;
+					<text class="level" v-if="info.type == 1">银宿级</text>
+					<text class="level" v-if="info.type == 2">金宿级</text>
+					<text class="level" v-if="info.type == 3">白金级</text>
+				</view>
 				<view class="info_right" @click="goPageDetailInfo">
 					设施/详情
 					<img src="../../static/index/right.png" />
@@ -504,9 +509,11 @@ export default {
 				this.rimList.splice(i, 1)
 				if (this.rimList.length) {
 					this.rimList.forEach((ele) => {
-						let lat = ele.hpositionWens.split(',')[0]
-						let lng = ele.hpositionWens.split(',')[1]
-						ele.distance = this.calculateDistance(lat, lng)
+						if (ele.hpositionWens) {
+							let lat = ele.hpositionWens.split(',')[0]
+							let lng = ele.hpositionWens.split(',')[1]
+							ele.distance = this.calculateDistance(lat, lng)
+						}
 					})
 				}
 			}
@@ -526,9 +533,11 @@ export default {
 				this.rimTotal = res.total
 				if (this.rimList.length) {
 					this.rimList.forEach((ele) => {
-						let lat = ele.jingwei.split(',')[1]
-						let lng = ele.jingwei.split(',')[0]
-						ele.distance = this.calculateDistance(lat, lng)
+						if (ele.jingwei) {
+							let lat = ele.jingwei.split(',')[1]
+							let lng = ele.jingwei.split(',')[0]
+							ele.distance = this.calculateDistance(lat, lng)
+						}
 					})
 				}
 			}
@@ -1017,6 +1026,10 @@ export default {
 			.info_left {
 				color: #999999;
 				font-size: 20rpx;
+
+				.level {
+					margin-left: 20rpx;
+				}
 			}
 
 			.info_right {

pages/home3/home3.vue

@@ -6,10 +6,12 @@
 
 		<!-- 顶部图片区域 -->
 		<view class="header">
-			<img mode="aspectFill" src="https://chtech.ncjti.edu.cn/hotelReservation/image/14.png" />
-			<img class="img" src="https://chtech.ncjti.edu.cn/hotelReservation/image/16.png" />
-			<img class="img2" src="https://chtech.ncjti.edu.cn/hotelReservation/image/17.png" />
-			<view class="header_msg">有一种生活叫靖安</view>
+			<swiper class="header_swiper" circular :interval="3000">
+				<swiper-item v-for="banner in headerImgList" :key="banner.id" @click="handleClickBanner(banner)">
+					<img mode="aspectFill" class="img" :src="banner.imageUrl" />
+					<img mode="aspectFill" class="img2" :src="banner.logoUrl" />
+				</swiper-item>
+			</swiper>
 		</view>
 
 		<!-- 主体内容区域 -->
@@ -78,7 +80,12 @@
 							<image class="item-img" :src="item.coverImg" mode="scaleToFill"></image>
 							<view class="descrition">
 								<text class="title">{{ item.hotel_name }}</text>
-								<text class="type">{{ item.hTypeName }}</text>
+								<text class="type">
+									{{ item.hTypeName }} &nbsp;&nbsp;
+									<text class="type_level" v-if="item.type == 1">银宿级</text>
+									<text class="type_level" v-if="item.type == 2">金宿级</text>
+									<text class="type_level" v-if="item.type == 3">白金级</text>
+								</text>
 								<text class="distance" v-if="showdDistance">距您直线{{ item.distance }}公里</text>
 								<view class="detail">
 									<img class="img" src="../../static/index/hotel.png" />
@@ -197,7 +204,12 @@
 						<image class="item-img" :src="item.coverImg" mode="scaleToFill"></image>
 						<view class="descrition">
 							<text class="title">{{ item.hotel_name }}</text>
-							<text class="type">{{ item.hTypeName }}</text>
+							<text class="type">
+								{{ item.hTypeName }}
+								<text class="type_level" v-if="item.type == 1">银宿级</text>
+								<text class="type_level" v-if="item.type == 2">金宿级</text>
+								<text class="type_level" v-if="item.type == 3">白金级</text>
+							</text>
 							<text class="distance" v-if="showdDistance">距您直线{{ item.distance }}公里</text>
 							<view class="detail">
 								<img class="img" src="../../static/index/hotel.png" />
@@ -252,12 +264,28 @@
 			<view class="popupClass">
 				<img src="../../static/index/popup_bg.png" />
 				<!-- 立即前往区域 -->
-				<!-- <view class="btn_go" @click="handleGo"></view> -->
 				<view class="btn_text">系统处于迭代试用状态，请勿下单预订酒店，如需预订请电联店家老板确认预订渠道。</view>
 				<!-- 关闭按钮区域 -->
 				<view class="btn_close" @click="handleClose"></view>
 			</view>
 		</uv-popup>
+
+		<!-- 等级介绍弹窗区域 -->
+		<uv-popup ref="popup_level" mode="center" :closeOnClickOverlay="false" bgColor="none">
+			<view class="popupLevel">
+				<view class="level_header">
+					<view class="">民宿等级</view>
+					<view class="header_text" @click="handleCloseLevelPop">×</view>
+				</view>
+				<view class="level_body">
+					江西省民宿评定严格按照《民宿基本要求与评价（江西省省地方标准）》进行。民宿等级从高到低分为白金级、金宿级、银宿级三个等级，等级越高表示接待设施与服务品质越高。其中，白金级、金宿级由省里评定，银宿级由设区市评定。
+				</view>
+				<view class="level_btn">
+					<view class="btn notip" @click="handleNoTip">不再提示</view>
+					<view class="btn read" @click="handleCloseLevelPop">已读</view>
+				</view>
+			</view>
+		</uv-popup>
 	</view>
 </template>
 
@@ -343,7 +371,9 @@ export default {
 						}
 					]
 				}
-			]
+			],
+			// 顶部轮播图图片数组
+			headerImgList: []
 		}
 	},
 	created() {
@@ -389,6 +419,7 @@ export default {
 		this.hotelList = []
 		this.page = 1
 		this.getLocation()
+		this.getHeaderImgList()
 		this.getResidueCount()
 		this.getBestNews()
 		this.getNews()
@@ -398,6 +429,8 @@ export default {
 		}, 1000)
 	},
 	onLoad() {
+		// 获取顶部轮播图数据
+		this.getHeaderImgList()
 		// 获取乡镇列表
 		this.getResidueCount()
 		// 获取定位
@@ -408,8 +441,21 @@ export default {
 		this.getNews()
 		// 获取特产列表
 		this.getGoodsList()
+
+		let isTip = uni.getStorageSync('isTip')
+
+		!isTip && this.$refs.popup_level.open()
 	},
 	methods: {
+		async getHeaderImgList() {
+			const res = await this.$myRequest({
+				url: '/mhotel/advertiseopenList.action'
+			})
+			// console.log(res)
+			if (res.code == 200) {
+				this.headerImgList = res.data
+			}
+		},
 		async getBestNews() {
 			const res = await this.$myRequest({
 				url: '/mhotel/articlequeryMaxArticleLike.action'
@@ -705,10 +751,6 @@ export default {
 		handleClose() {
 			this.$refs.popup_sale.close()
 		},
-		// 立即前往按钮回调
-		handleGo() {
-			console.log(111)
-		},
 		// 计算两个点之间的距离
 		calculateDistance(lat, lng) {
 			let centerLat = lat
@@ -756,6 +798,60 @@ export default {
 		},
 		changeDot(e) {
 			this.current = e.detail.current
+		},
+		handleCloseLevelPop() {
+			this.$refs.popup_level.close()
+		},
+		handleNoTip() {
+			uni.setStorageSync('isTip', true)
+			this.$refs.popup_level.close()
+		},
+		// 点击顶部轮播图广告回调
+		handleClickBanner(banner) {
+			// console.log(banner)
+			switch (banner.jumpWay) {
+				case '网页':
+					uni.navigateTo({
+						url: `/pagesSub/web/web?url=${banner.jumpPoint}`
+					})
+					break
+				case '小程序':
+					if (banner.jumpDirection == '民宿') {
+						uni.navigateTo({
+							url: `/pages/detail/detail?id=${banner.jumpPoint}&distance=&town=${banner.townId}`
+						})
+					} else if (banner.jumpDirection == '商品') {
+						if (banner.jumpPoint == '首页') {
+							uni.navigateTo({
+								url: '/packageShang/pages/tabbar/home'
+							})
+						} else {
+							uni.navigateTo({
+								url: `/packageShang/pages/goods/goods?id=${banner.jumpPoint}`
+							})
+						}
+					} else if (banner.jumpDirection == '攻略') {
+						if (banner.jumpPoint == '首页') {
+							uni.navigateTo({
+								url: '/pages/community/community'
+							})
+						} else {
+							uni.navigateTo({
+								url: `/pagesSub/tweetDetail/tweetDetail?id=${banner.jumpPoint}&townId=${banner.townId}`
+							})
+						}
+					} else if (banner.jumpDirection == '优惠券') {
+						uni.navigateTo({
+							url: `/pagesSub/couponCenter/couponCenter?id=${banner.jumpPoint}`
+						})
+					}
+					break
+				default:
+					uni.previewImage({
+						urls: [banner.imageUrl]
+					})
+					break
+			}
 		}
 	}
 }
@@ -773,41 +869,24 @@ export default {
 		position: relative;
 		height: 505rpx;
 
-		img {
+		.header_swiper {
 			width: 100%;
 			height: 100%;
-			border-radius: 0 0 20rpx 20rpx;
-		}
-
-		.img {
-			position: absolute;
-			top: 135rpx;
-			left: 61rpx;
-			width: 160rpx;
-			height: 40rpx;
-		}
 
-		.img2 {
-			position: absolute;
-			top: 193rpx;
-			left: 38rpx;
-			width: 268rpx;
-			height: 88rpx;
-		}
+			.img {
+				width: 100%;
+				height: 100%;
+				border-radius: 0 0 20rpx 20rpx;
+			}
 
-		.header_msg {
-			position: absolute;
-			top: 283rpx;
-			left: 38rpx;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			width: 291rpx;
-			height: 65rpx;
-			font-size: 31rpx;
-			color: #fff;
-			border-radius: 16rpx;
-			background: rgba(255, 255, 255, 0.2);
+			.img2 {
+				position: absolute;
+				top: 175rpx;
+				left: 38rpx;
+				width: 200rpx;
+				height: 200rpx;
+				border: 1rpx solid skyblue;
+			}
 		}
 	}
 
@@ -1124,6 +1203,10 @@ export default {
 							height: 40rpx;
 							font-size: 24rpx;
 							color: #a6a6a6;
+
+							.type_level {
+								margin-left: 20rpx;
+							}
 						}
 
 						.distance {
@@ -1350,15 +1433,6 @@ export default {
 			height: 665rpx;
 		}
 
-		.btn_go {
-			position: absolute;
-			top: 415rpx;
-			left: 40rpx;
-			width: 396rpx;
-			height: 76rpx;
-			border-radius: 43rpx;
-		}
-
 		.btn_text {
 			position: absolute;
 			top: 265rpx;
@@ -1383,5 +1457,56 @@ export default {
 			border-radius: 50%;
 		}
 	}
+
+	.popupLevel {
+		box-sizing: border-box;
+		padding: 20rpx;
+		width: 580rpx;
+		height: 495rpx;
+		border-radius: 20rpx;
+		background-color: #fff;
+
+		.level_header {
+			display: flex;
+			justify-content: space-between;
+			height: 70rpx;
+
+			.header_text {
+				color: #c5c5c0;
+			}
+		}
+
+		.level_body {
+			font-size: 26rpx;
+		}
+
+		.level_btn {
+			margin-top: 80rpx;
+			display: flex;
+			justify-content: flex-end;
+			align-items: center;
+			height: 80rpx;
+
+			.btn {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				width: 150rpx;
+				height: 60rpx;
+				font-size: 26rpx;
+				border-radius: 10rpx;
+			}
+
+			.notip {
+				margin-right: 20rpx;
+				border: 1rpx solid #e7e7e7;
+			}
+
+			.read {
+				color: #fff;
+				background-color: #1890ff;
+			}
+		}
+	}
 }
 </style>

pages/my/my.vue

@@ -104,6 +104,11 @@
 						<img class="box_img" src="../../static/my/help.png" />
 						<view class="box_text">操作手册</view>
 					</view>
+
+					<view class="item_box" @click="handleGoPageLevel">
+						<img class="box_img" src="../../static/my/level.png" />
+						<view class="box_text">等级介绍</view>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -284,6 +289,11 @@ export default {
 			uni.navigateTo({
 				url: '/pagesSub/web/web?url=https://www.jinganrenjiams.com/app/'
 			})
+		},
+		handleGoPageLevel() {
+			uni.navigateTo({
+				url: '/pagesSub/level/level'
+			})
 		}
 	}
 }

pagesSub/addPlace/addPlace.vue

@@ -31,7 +31,7 @@
 						<view class="detail_leave" v-if="item.type===3">
 							白金级
 						</view>
-						<view class="detail_rate">
+						<view class="detail_rate" v-if="item.score">
 							{{item.score.toFixed(1)}}分
 						</view>
 					</view>
@@ -107,7 +107,7 @@
 					this.hotelList.forEach(ele=>{
 						this.$set(ele,'isCheck',false)
 					})
-					this.hotelList.forEach((ele)=>{
+					this.hotelList.forEach(ele=>{
 				         this.oldList.forEach((item)=>{
 				         	if(item.id ===ele.id){
 								ele.isCheck = true

pagesSub/couponCenter/couponCenter.vue

@@ -69,10 +69,15 @@ export default {
 			// 总条数
 			total: null,
 			// 指定民宿信息
-			hotels: ''
+			hotels: '',
+			// 通过广告跳转进来时传递的数据id
+			bannerId: ''
 		}
 	},
-	onLoad() {
+	onLoad(options) {
+		if (options.id) {
+			this.bannerId = options.id
+		}
 		this.getData()
 	},
 	onReachBottom() {
@@ -101,8 +106,13 @@ export default {
 				res.page.pageList.forEach((ele) => {
 					ele.hotelIds = ele.hotelIds.split(',')
 				})
-				this.list = [...this.list, ...res.page.pageList]
-				this.total = res.page.total
+				if (this.bannerId) {
+					const result = res.page.pageList.find((ele) => ele.id == this.bannerId)
+					this.list = result || []
+				} else {
+					this.list = [...this.list, ...res.page.pageList]
+					this.total = res.page.total
+				}
 			}
 		},
 		// 点击指定民宿tag回调

pagesSub/detailInfo/detailInfo.vue

@@ -19,6 +19,9 @@
 			<!-- 类型区域 -->
 			<view class="header_types" :style="{ paddingTop: statusBarH * 2 + 200 + 'rpx' }">
 				<view class="types_item">{{ detailInfo.hTypeName }}</view>
+				<view v-if="detailInfo.type == 1" class="types_item">银宿级</view>
+				<view v-if="detailInfo.type == 2" class="types_item">金宿级</view>
+				<view v-if="detailInfo.type == 3" class="types_item">白金级</view>
 			</view>
 		</view>
 

pagesSub/level/level.vue

@@ -0,0 +1,24 @@
+<template>
+	<view class="container">
+		江西省民宿评定严格按照《民宿基本要求与评价（江西省省地方标准）》进行。民宿等级从高到低分为白金级、金宿级、银宿级三个等级，等级越高表示接待设施与服务品质越高。其中，白金级、金宿级由省里评定，银宿级由设区市评定。
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {}
+	},
+	methods: {}
+}
+</script>
+
+<style lang="scss" scoped>
+.container {
+	box-sizing: border-box;
+	padding: 20rpx;
+	height: 100vh;
+	line-height: 48rpx;
+	background: #fff;
+}
+</style>

pagesSub/newsList/newsList.vue

@@ -10,16 +10,16 @@
 		</view>
 
 		<!-- 资讯列表区域 -->
-		<scroll-view class="list" scroll-y @scrolltolower="handleLower" v-show="showPage">
+		<scroll-view class="list" scroll-y @scrolltolower="handleLower" v-if="list.length">
 			<!-- 每一条资讯区域 -->
 			<view class="box" v-for="item in list" :key="item.id" @click="handleGoDetail(item)">
-				<uv-image width="253rpx" height="190rpx" radius="8rpx" mode="aspectFill" :src="item.url" />
+				<uv-image width="253rpx" height="190rpx" radius="8rpx" mode="aspectFill" :src="item.first_img || ''" />
 				<view class="box_detail">
 					<view class="detail_title">{{ item.title }}</view>
 					<view class="detail_time">{{ item.update_time }}</view>
 				</view>
 				<!-- 富文本区域 -->
-				<mp-html v-if="item.showHtml" @load="htmlLoad(item)" :ref="item.id + 'html'" :content="item.content" />
+				<!-- <mp-html v-if="item.showHtml" @load="htmlLoad(item)" :ref="item.id + 'html'" :content="item.content" /> -->
 			</view>
 		</scroll-view>
 
@@ -44,9 +44,9 @@ export default {
 			// 每页多少条
 			rowsNews: 8,
 			// 总条数
-			totalNews: null,
+			totalNews: null
 			// 控制页面显示隐藏
-			showPage: false
+			// showPage: false
 		}
 	},
 	onLoad() {
@@ -60,21 +60,22 @@ export default {
 				data: {
 					page: this.pageNews,
 					rows: this.rowsNews,
-					title: this.keywords
+					key: this.keywords
 				}
 			})
 			// console.log(res)
 			if (res.code === 200) {
 				this.list = [...this.list, ...res.rows]
-				this.list.forEach((ele) => {
-					this.$set(ele, 'showHtml', true)
-				})
+
+				// this.list.forEach((ele) => {
+				// 	this.$set(ele, 'showHtml', true)
+				// })
 				this.totalNews = res.total
 			}
 		},
 		// 点击搜索按钮回调
 		searchHandler() {
-			this.showPage = false
+			// this.showPage = false
 			this.list = []
 			this.pageNews = 1
 			this.getNews()
@@ -97,18 +98,18 @@ export default {
 			uni.navigateTo({
 				url: `/pagesSub/newsDetail/newsDetail?info=${info}`
 			})
-		},
-		// 获取富文本信息回调
-		htmlLoad(item) {
-			let id = item.id + 'html'
-			let ctx = this.$refs[id][0]
-			let imgs = ctx.imgList[0]
-			item.showHtml = false
-			item.url = imgs
-			if (!this.showPage) {
-				this.showPage = true
-			}
 		}
+		// 获取富文本信息回调
+		// htmlLoad(item) {
+		// 	let id = item.id + 'html'
+		// 	let ctx = this.$refs[id][0]
+		// 	let imgs = ctx.imgList[0]
+		// 	item.showHtml = false
+		// 	item.url = imgs
+		// 	if (!this.showPage) {
+		// 		this.showPage = true
+		// 	}
+		// }
 	}
 }
 </script>

pagesSub/tweetDetail/tweetDetail.vue

@@ -46,7 +46,7 @@
 					<view class="detail_leave" v-if="item.type === 2">金宿级</view>
 					<view class="detail_leave" v-if="item.type === 3">白金级</view>
 					<view class="detail_num">
-						<view class="num_rate">{{ item.score.toFixed(1) }}分</view>
+						<view class="num_rate" v-if="item.score">{{ item.score.toFixed(1) }}分</view>
 						<view class="num_comment">{{ item.comment }}条评论</view>
 						<view class="num_price">
 							¥{{ item.price }}
@@ -213,7 +213,7 @@
 							<view class="detail_leave" v-if="item.type === 2">金宿级</view>
 							<view class="detail_leave" v-if="item.type === 3">白金级</view>
 							<view class="detail_num">
-								<view class="num_rate">{{ item.score.toFixed(1) }}分</view>
+								<view class="num_rate" v-if="item.score">{{ item.score.toFixed(1) }}分</view>
 								<view class="num_comment">{{ item.comment }}条评论</view>
 								<view class="num_price">
 									¥{{ item.price }}