From 2eecabb03e7bc51868a40e3acbffdb326e45ce33 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Fri, 3 Jan 2025 23:06:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                    |   2 +-
 components/list/videoList - 副本 (2).vue | 206 +++++++++++++++++++++++++++++
 components/list/videoList.vue              |  11 +-
 components/tourGuide/locations.vue         |  18 ++-
 pages.json                                 |   3 +
 pages_order/service/areaDetail.vue         |  84 ++++++++++++
 pages_order/service/situation.vue          |   6 +-
 store/store.js                             |   1 +
 8 files changed, 324 insertions(+), 7 deletions(-)
 create mode 100644 components/list/videoList - 副本 (2).vue
 create mode 100644 pages_order/service/areaDetail.vue

diff --git a/App.vue b/App.vue
index e92ef80..2f6b8dd 100644
--- a/App.vue
+++ b/App.vue
@@ -1,10 +1,10 @@
 <script>
 	export default {
 		onLaunch: function() {
+			this.$store.commit('getBanner')
 		},
 		onShow: function() {
 			this.$store.commit('initConfig')
-			this.$store.commit('getBanner')
 			this.$store.commit('getPosition')
 			this.$store.commit('getSpotList')
 			
diff --git a/components/list/videoList - 副本 (2).vue b/components/list/videoList - 副本 (2).vue
new file mode 100644
index 0000000..ea94935
--- /dev/null
+++ b/components/list/videoList - 副本 (2).vue	
@@ -0,0 +1,206 @@
+<template>
+	<scroll-view 
+	scroll-y="true" 
+	:style="{height: height}"
+	@scrolltolower="loadMoreData">
+		<view class="videoList">
+			<view class="video-item" v-for="(item, index) in spotListWord" :key="index"
+			>
+				<view class="image" @click="showVideo(item, index)">
+					<image :src="item.spotImage && item.spotImage.split(',')[0]" mode="aspectFill">
+					</image>
+				</view>
+				<view class="bottom">
+					<view class="headImage">
+						{{ item.spotName }}
+					</view>
+					
+					<view class="like">
+						<view class="">
+							查看详情
+						</view>
+						
+						<view class=""
+						style="margin-top: 10rpx;">
+							<uv-icon size="30rpx"
+							name="arrow-right"></uv-icon>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</scroll-view>
+</template>
+
+<script>
+	import { mapState } from 'vuex'
+	export default {
+		props : {
+			height : {
+				default : 'auto'
+			},
+			roleId : {
+			}
+		},
+		data() {
+			return {
+				queryParams: {
+					pageNo: 1,
+					pageSize: 10,
+				},
+				total : 0,
+				list : [],
+			}
+		},
+		computed : {
+			...mapState(['spotList']),
+			spotListWord(){
+				return this.spotList.filter(n => n.categoryId == 0)
+			},
+		},
+		methods: {
+			showVideo(item, current){
+				// this.$utils.hanldePreview
+				
+				// uni.previewMedia({
+				// 	current : item.videoContent
+				// })
+				
+				this.$utils.navigateTo(`/pages_order/service/articleDetail?id=${item.id}&type=Inheritance`)
+				
+				return
+				
+				let sources = []
+				
+				this.list.forEach(n => {
+					sources.push({
+						url : n.travelVideo.videoContent,
+						type : 'video'
+					})
+				})
+				
+				wx.previewMedia({
+					sources, // 需要预览的资源列表
+					current, // 当前显示的资源序号
+					// url: url // 当前预览资源的url链接
+				})
+			},
+			queryVideoList(){
+				
+				if(this.roleId){
+					this.queryParams.roleInfoId = this.roleId
+				}
+				
+				if(uni.getStorageSync('token')){
+					this.queryParams.token = uni.getStorageSync('token')
+				}
+				
+				this.$api('queryVedioById', this.queryParams, res => {
+					if(res.code == 200){
+						this.list = res.result
+						// this.total = res.result.total
+					}
+				})
+			},
+			loadMoreData(){
+				if(this.queryParams.pageSize <= this.list.length){
+					this.queryParams.pageSize += 10
+					this.queryVideoList()
+				}
+			},
+			addThumpup(videoId){
+				this.$api('addThumpup', {
+					videoId
+				}, res => {
+					if(res.code == 200){
+						this.queryVideoList()
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.videoList {
+		.video-item {
+			margin: 20rpx;
+			background-color: #fff;
+			position: relative;
+			.image {
+				position: relative;
+				width: 100%;
+				height: 420rpx;
+				overflow: hidden;
+
+				image {
+					width: 100%;
+					height: 420rpx;
+					border-radius: 30rpx;
+				}
+
+				.icon {
+					position: absolute;
+					right: 30rpx;
+					top: 30rpx;
+					width: 60rpx;
+					height: 60rpx;
+					background-color: #ffffffaa;
+					border-radius: 50%;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+				}
+			}
+
+			.bottom {
+				font-size: 30rpx;
+				display: flex;
+				justify-content: space-between;
+				position: absolute;
+				bottom: 0;
+				left: 0;
+				background-color: #ffffffaa;
+				width: calc(100% - 40rpx);
+				padding: 30rpx;
+				font-weight: 900;
+				align-items: center;
+
+				.headImage {
+					display: flex;
+					align-items: center;
+
+					image {
+						width: 50rpx;
+						height: 50rpx;
+						border-radius: 50%;
+						margin-right: 6rpx;
+					}
+				}
+
+				.like {
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					font-weight: 500;
+					font-size: 26rpx;
+				}
+			}
+		}
+		.showVideo{
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 100%;
+			width: 1000%;
+			video{
+				// width: 100%;
+				// height: 100%;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/list/videoList.vue b/components/list/videoList.vue
index ea94935..1d0166a 100644
--- a/components/list/videoList.vue
+++ b/components/list/videoList.vue
@@ -22,7 +22,7 @@
 						
 						<view class=""
 						style="margin-top: 10rpx;">
-							<uv-icon size="30rpx"
+							<uv-icon size="26rpx"
 							name="arrow-right"></uv-icon>
 						</view>
 					</view>
@@ -127,10 +127,15 @@
 
 <style scoped lang="scss">
 	.videoList {
+		display: flex;
+		flex-wrap: wrap;
+		margin-right: 20rpx;
 		.video-item {
-			margin: 20rpx;
 			background-color: #fff;
 			position: relative;
+			width: calc(50% - 20rpx);
+			margin-left: 20rpx;
+			margin-top: 20rpx;
 			.image {
 				position: relative;
 				width: 100%;
@@ -187,7 +192,7 @@
 					align-items: center;
 					justify-content: center;
 					font-weight: 500;
-					font-size: 26rpx;
+					font-size: 22rpx;
 				}
 			}
 		}
diff --git a/components/tourGuide/locations.vue b/components/tourGuide/locations.vue
index aa41ebb..91751c4 100644
--- a/components/tourGuide/locations.vue
+++ b/components/tourGuide/locations.vue
@@ -43,6 +43,7 @@
 				v-if="spotGuideIndex == 0 && area">
 				<image 
 				class="main-image"
+				@click.stop="clickAreaDetail(area.id)"
 				:src="area.areaImage" 
 				mode="aspectFill"></image>
 				
@@ -178,6 +179,9 @@
 				this.currentArea = index
 				this.$store.commit('setAreaId', this.areaList[index].id)
 				this.$emit('getData')
+				this.$nextTick(() => {
+					this.selectArea()
+				})
 			},
 			// 修改前选择的菜单，0-景点 1-美食店铺 2-民宿 3-厕所
 			setSpotGuideIndex(index){
@@ -210,7 +214,8 @@
 			markertap(e) {
 				console.log("markertap===你点击了标记点===", e)
 				
-				let spot = this.spotGuideMarkers[e.markerId]
+				let spot = this.spotGuide[e.markerId]
+				// let spot = this.spotGuideMarkers[e.markerId]
 				
 				this.toUrl(spot)
 				
@@ -254,12 +259,16 @@
 				})
 			},
 			toUrl(item){
+				console.log(item);
 				if(item.categoryId == 0){
 					this.$utils.navigateTo(`/pages_order/service/articleDetail?id=${item.id}&type=Inheritance`)
 				}
 			},
 			queryAreaList(){
-				this.$api('queryAreaList', res => {
+				this.$api('queryAreaList', {
+					pageNo: 1,
+					pageSize: 99999999,
+				}, res => {
 					if(res.code == 200){
 						this.areaList = res.result.records
 						
@@ -293,6 +302,11 @@
 					this.moveTolocation(item.spotLatitude, item.spotLongitude)
 				}
 			},
+			clickAreaDetail(id){
+				uni.navigateTo({
+					url: '/pages_order/service/areaDetail?id=' + id
+				})
+			},
 		}
 	}
 </script>
diff --git a/pages.json b/pages.json
index 0a95375..930b39c 100644
--- a/pages.json
+++ b/pages.json
@@ -137,6 +137,9 @@
 			},
 			{
 				"path": "mine/collect"
+			},
+			{
+				"path": "service/areaDetail"
 			}
 		]
 	}],
diff --git a/pages_order/service/areaDetail.vue b/pages_order/service/areaDetail.vue
new file mode 100644
index 0000000..c9dc68c
--- /dev/null
+++ b/pages_order/service/areaDetail.vue
@@ -0,0 +1,84 @@
+<template>
+	<!-- 景区详情 -->
+	<view class="page">
+		<navbar 
+		:title="detail.areaName" 
+		leftClick 
+		@leftClick="$utils.navigateBack" />
+		
+		
+		<view class=""
+		style="padding: 20rpx;">
+			<uv-parse :content="detail.areaDetail"></uv-parse>
+		</view>
+		
+		
+		<!-- <StudyAndPathDetailSubmit
+		article
+		submiitTitle="线上预约"
+		v-if="type == 'experience'"
+		:detail="detail" 
+		@getData="queryArticleById"
+		@submit="toPayUrl(detail, type)"
+		:collectonFlag="collectonFlag"
+		:collectType="dict.collectType"
+		/> -->
+	</view>
+</template>
+
+<script>
+	import StudyAndPathDetailSubmit from '../components/submit/StudyAndPathDetailSubmit.vue'
+	export default {
+		components : {
+			StudyAndPathDetailSubmit,
+		},
+		data() {
+			return {
+				detail : {},
+				id : 0,
+				type : '',
+				dict : {},
+				collectonFlag : false,
+			}
+		},
+		onLoad(args) {
+			this.id = args.id
+			// this.type = args.type
+			// this.dict = this.$config.dict[args.type]
+		},
+		onShow() {
+			this.queryArticleById()
+		},
+		onPullDownRefresh(){
+			this.queryArticleById()
+		},
+		methods: {
+			queryArticleById(){
+				let data = {
+					areaId : this.id,
+				}
+				if(uni.getStorageSync('token')){
+					data.token = uni.getStorageSync('token')
+				}
+				this.$api('queryAreaListById', data, res => {
+					uni.stopPullDownRefresh()
+					if(res.code == 200){
+						this.detail = res.result.travelExperience || res.result
+						this.collectonFlag = res.result.collectonFlag
+					}
+				})
+			},
+			toPayUrl(item, dictKey){
+				uni.navigateTo({
+					url: `/pages_order/order/orderSubscribe?type=${dictKey}&id=${item.id}`
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.page{
+	
+}
+</style>
diff --git a/pages_order/service/situation.vue b/pages_order/service/situation.vue
index f18c026..b3845e4 100644
--- a/pages_order/service/situation.vue
+++ b/pages_order/service/situation.vue
@@ -109,8 +109,12 @@
 				}
 			},
 			toUrl(id){
+				// uni.navigateTo({
+				// 	url: '/pages/index/tourGuide?areaId=' + id
+				// })
+				
 				uni.navigateTo({
-					url: '/pages/index/tourGuide?areaId=' + id
+					url: '/pages_order/service/areaDetail?id=' + id
 				})
 			},
 		}
diff --git a/store/store.js b/store/store.js
index 6014004..62a6cd1 100644
--- a/store/store.js
+++ b/store/store.js
@@ -58,6 +58,7 @@ const store = new Vuex.Store({
 				list.push({
 					latitude: n.spotLatitude,
 					longitude: n.spotLongitude,
+					categoryId : n.categoryId,
 					width: 20, //图标icon 宽度
 					height: 28 ,//图标icon 高度
 					iconPath: `/static/image/tourGuide/${n.categoryId}.png`,  //图标