From 3f6a8867d6be7fb3d049344c1ec14d68b1e0b071 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Wed, 19 Feb 2025 22:55:56 +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

---
 api/api.js                              |  10 +-
 components/list/scenicSpot - 副本.vue | 211 ++++++++++++++++++++++++++++++++
 components/list/scenicSpot.vue          |  22 +---
 pages/index/index.vue                   |  59 +++++++--
 pages_order/service/newsList.vue        |   8 +-
 static/image/home/g8a.png               | Bin 0 -> 873 bytes
 store/store.js                          |  18 ++-
 7 files changed, 286 insertions(+), 42 deletions(-)
 create mode 100644 components/list/scenicSpot - 副本.vue
 create mode 100644 static/image/home/g8a.png

diff --git a/api/api.js b/api/api.js
index 7093644..4c66761 100644
--- a/api/api.js
+++ b/api/api.js
@@ -11,11 +11,11 @@ const config = {
 	// limit : 1000
 	// },
 
-	// getConfig: {
-	// 	url: '/api/getConfig',
-	// 	method: 'GET',
-	// 	limit: 500
-	// },
+	getConfig: {
+		url: '/info/queryConfigList',
+		method: 'GET',
+		limit: 500
+	},
 
 
 	// 微信登录接口
diff --git a/components/list/scenicSpot - 副本.vue b/components/list/scenicSpot - 副本.vue
new file mode 100644
index 0000000..1d0166a
--- /dev/null
+++ b/components/list/scenicSpot - 副本.vue	
@@ -0,0 +1,211 @@
+<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="26rpx"
+							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 {
+		display: flex;
+		flex-wrap: wrap;
+		margin-right: 20rpx;
+		.video-item {
+			background-color: #fff;
+			position: relative;
+			width: calc(50% - 20rpx);
+			margin-left: 20rpx;
+			margin-top: 20rpx;
+			.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: 22rpx;
+				}
+			}
+		}
+		.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/scenicSpot.vue b/components/list/scenicSpot.vue
index 1d0166a..5e78dd3 100644
--- a/components/list/scenicSpot.vue
+++ b/components/list/scenicSpot.vue
@@ -14,18 +14,6 @@
 					<view class="headImage">
 						{{ item.spotName }}
 					</view>
-					
-					<view class="like">
-						<view class="">
-							查看详情
-						</view>
-						
-						<view class=""
-						style="margin-top: 10rpx;">
-							<uv-icon size="26rpx"
-							name="arrow-right"></uv-icon>
-						</view>
-					</view>
 				</view>
 			</view>
 		</view>
@@ -131,20 +119,18 @@
 		flex-wrap: wrap;
 		margin-right: 20rpx;
 		.video-item {
-			background-color: #fff;
 			position: relative;
-			width: calc(50% - 20rpx);
+			width: calc(25% - 20rpx);
 			margin-left: 20rpx;
 			margin-top: 20rpx;
 			.image {
 				position: relative;
 				width: 100%;
-				height: 420rpx;
 				overflow: hidden;
 
 				image {
 					width: 100%;
-					height: 420rpx;
+					height: 120rpx;
 					border-radius: 30rpx;
 				}
 
@@ -166,10 +152,6 @@
 				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;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 3206cca..5d510ae 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -24,7 +24,7 @@
 		<view class="content">
 			<view class="grid">
 				<uv-grid :border="false"
-				:col="4">
+				:col="5">
 					<uv-grid-item 
 					v-for="(item,index) in baseList"
 					@click="$utils.navigateTo(item.path)"
@@ -35,9 +35,18 @@
 				</uv-grid>
 			</view>
 			
+			<view class="index_box">
+				<image :src="config_new_image" class="image" mode="aspectFill"></image>
+				<view class="index_box_grid"
+				@click="$utils.navigateTo('/pages_order/service/carefree')">
+					<text class="text">无忧服务</text>
+					<image class="icon" src="/static/image/home/g8a.png" mode="aspectFill"></image>
+				</view>
+			</view>
+			
 			<view class="video-title">
 				<!-- 视频中的景徳镇 -->
-				景徳镇的景点
+				精彩推荐
 			</view>
 			
 			<scenicSpot ref="videoList"/>
@@ -118,11 +127,11 @@
 						title : '我要帮助',
 						path : '/pages_order/service/help',
 					},
-					{
-						icon : '/static/image/home/g8.png',
-						title : '无忧服务',
-						path : '/pages_order/service/carefree',
-					},
+					// {
+					// 	icon : '/static/image/home/g8.png',
+					// 	title : '无忧服务',
+					// 	path : '/pages_order/service/carefree',
+					// },
 					{
 						icon : '/static/image/home/g6.png',
 						title : '申遗新闻',
@@ -142,8 +151,14 @@
 				],
 				productList: [],
 				keyword : '',
+				config_new_image : '',
 			}
 		},
+		onLoad() {
+			uni.$on('getConfig', state => {
+				this.config_new_image = state.configList.config_new_image
+			})
+		},
 		computed : {
 		},
 		onPullDownRefresh(){
@@ -227,6 +242,36 @@
 				}
 			}
 			
+			.index_box{
+				display: flex;
+				padding: 30rpx;
+				gap: 30rpx;
+				align-items: center;
+				.image{
+					height: 200rpx;
+					width: 450rpx;
+					border-radius: 10rpx;
+				}
+				.index_box_grid{
+					width: 200rpx;
+					height: 200rpx;
+					background-color: $uni-color;
+					border-radius: 10rpx;
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					justify-content: center;
+					gap: 16rpx;
+					.text{
+						color: #fff;
+					}
+					.icon{
+						width: 100rpx;
+						height: 100rpx;
+					}
+				}
+			}
+			
 			.video-title{
 				padding: 20rpx 30rpx;
 				background-color: $uni-color;
diff --git a/pages_order/service/newsList.vue b/pages_order/service/newsList.vue
index f70d3e8..fb74280 100644
--- a/pages_order/service/newsList.vue
+++ b/pages_order/service/newsList.vue
@@ -10,7 +10,7 @@
 			keyName="imageContent"></uv-swiper>
 		</view>
 
-		<view class="middle-box">
+		<!-- <view class="middle-box">
 			<view class="middle-img">
 				<view 
 				:key="index"
@@ -26,7 +26,7 @@
 					{{ item.name }}
 				</view>
 			</view>
-		</view>
+		</view> -->
 
 		<view class="apply-list">
 			<uv-list @scrolltolower="scrolltolower">
@@ -89,14 +89,14 @@
 		},
 		onLoad(args) {
 			this.keyword = args.keyword
-			this.queryNewsTypeList()
+			this.queryArticleListByType()
 		},
 		methods: {
 			queryArticleListByType(){
 				
 				let query = {
 					...this.queryParams,
-					categoryId : this.articleType
+					// categoryId : this.articleType
 				}
 				
 				if(this.articleType == -1){
diff --git a/static/image/home/g8a.png b/static/image/home/g8a.png
new file mode 100644
index 0000000000000000000000000000000000000000..0636273d7666a0bf9ab74507f96f0b6fe04f86ce
GIT binary patch
literal 873
zcmV-v1D5=WP)<h;3K|Lk000e1NJLTq002z@002!01^@s6;|b}o0009pNkl<Zc%1E=
zk8a!`493maTW+n?C!4gjk4dT8yIgZzNIrwHorzC6secmV{Av?ooYK_P)YR0})YOzq
zg~h3yGvB|Q6NT^tJv^oK9Ao?^3<7sN=XVMrwhR(N`2PCa9t&Cn;YU9@&g~zc32+S!
zj*?|4Az*E`J|kOd{7Z)9l+rKmsSvc3(vu*pQmEa`nF>(F7+<;9hNR~xSXEy<`oKv~
zEob+}^5Dar>d-FpN2^*V`O;}kVDOlm(7xs{eE!H+Nb3((ekS7d;~DvVW4x^oYHv4S
zYI7RucuPcaY$L~VeSpSKDgBNyzTE~nSf`C}w3Gxm4Ige}^sLkF40Q;#F$x%Fqmrg2
zv?KZw&a!Q#lwKO=$37n_^SbzAktqm3jPcKPfo<l)S{!JSe_^)W7~|i8;P&*8eQRiY
zsX2PRWDSlL5NM=nq_OviyUBV^D|HHR-k^~oI5<T;LL+w(SFG0%Xru0$BIBxnE7ofW
zG>b~ZA|K!`1%aEqrsrB(;OfCq>?NE58hM-J)>V$ZG_;!6N?DbxLQ9pya$Z{tgTb#l
zv#xIq%}X>L>DW)nU8~|IK+HMKOSBOHPOiMZv7y|uS?om;nbCATKa1~?x_ow&%I$t!
z`cRtex8}a5h~tadxKnED#NPV7e__C?9BL>3&)~Xu+xCc~;2v(tj&%%dV~J7fC`=J>
z;UwU&tN?n}q)J2H!J!cbWfyt}IWss67^5qa)h`PihW1}*Nh~GTf}wpj7=z%*3AkYu
z5!M3lMBql2koZpoCjd7T*xiZj_Xv28B3jR?!+`a+S}j&0vJkvVBjScf*rL8-ogZ*&
zz({0c#U7k0FcRC1vID0Mj6}Ea^ud_`Bk_GtJ#c2gXvk*qcyOk`XxI+>IB@2`XlPpk
z4;*rw3t%+7mjefPR912Wj8qz6`oXyZMrvI{?cm%2Bh^+b9yrdc+UgtEy8UUqn*(G~
z&=xHHroIp&qaL?wNx(*vOgbT%h0HCP_L7*jk9L4FZ@w|@xorUFqFbr&-{#0l^IcQ6
zWXjzG{A&E2y3X)I*;#slr>3T+rlzK*#6(0NnsPfoG^vF500000NkvXXu0mjfsMe-G

literal 0
HcmV?d00001

diff --git a/store/store.js b/store/store.js
index 62a6cd1..247c5bd 100644
--- a/store/store.js
+++ b/store/store.js
@@ -9,7 +9,7 @@ import Position from '@/utils/position.js'
 //Vuex.Store 构造器选项
 const store = new Vuex.Store({
 	state: {
-		configList: [], //配置列表
+		configList: {}, //配置列表
 		position : {//定位信息
 			latitude : 0,
 			longitude : 0,
@@ -81,11 +81,17 @@ const store = new Vuex.Store({
 	mutations: {
 		// 初始化配置
 		initConfig(state){
-			// api('getConfig', res => {
-			// 	if(res.code == 200){
-			// 		state.configList = res.result
-			// 	}
-			// })
+			api('getConfig', res => {
+				if(res.code == 200){
+					res.result.forEach(n => {
+						state.configList[n.paramCode] = n.paramValueText || 
+						n.paramValueTextarea ||
+						n.paramValueImage 
+						// state.configList[n.keyName + '_keyValue'] = n.keyValue
+					})
+					uni.$emit('getConfig', state)
+				}
+			})
 			
 			let config = ['getPrivacyPolicy', 'getUserAgreement']
 			config.forEach(k => {