From 9da4f30b001a7f5bc42abab2e925f31a4ea2d44a Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Tue, 5 Nov 2024 23:12:06 +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

---
 components/base/navbar.vue              | 17 ++++++++++++++++-
 components/tourGuide/selectionPopup.vue | 11 +++++++++++
 pages_order/service/situation.vue       |  2 +-
 store/store.js                          |  4 ++--
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/components/base/navbar.vue b/components/base/navbar.vue
index 909f33c..5bc527a 100644
--- a/components/base/navbar.vue
+++ b/components/base/navbar.vue
@@ -4,8 +4,14 @@
 		<view class="title"
 		:style="{backgroundColor : bgColor}">
 			<view class="left">
+				
+				<uv-icon name="home"
+				v-if="leftClick && length == 1"
+				@click="toHome"
+				color="#333" size="46rpx"></uv-icon>
+				
 				<uv-icon name="arrow-left"
-				v-if="leftClick"
+				v-else-if="leftClick"
 				@click="$emit('leftClick')"
 				color="#333" size="46rpx"></uv-icon>
 			</view>
@@ -72,9 +78,18 @@
 		},
 		data() {
 			return {
+				length : getCurrentPages().length
 			};
 		},
 		methods : {
+			toHome(){
+				if(this.length != 1){
+					return
+				}
+				uni.reLaunch({
+					url: '/pages/index/index'
+				})
+			}
 		}
 	}
 </script>
diff --git a/components/tourGuide/selectionPopup.vue b/components/tourGuide/selectionPopup.vue
index 1662cf9..e22a3e0 100644
--- a/components/tourGuide/selectionPopup.vue
+++ b/components/tourGuide/selectionPopup.vue
@@ -1,6 +1,10 @@
 <template>
 	<uv-popup ref="popup" :round="30" :customStyle="{height: '60vh'}">
 		<view class="content">
+			<view class="btn"
+			@click="select({spotName : 'all'})">
+				全部
+			</view>
 			<uv-vtabs
 			:chain="chain" 
 			:list="areaList"
@@ -97,6 +101,13 @@
 	/deep/ .uv-vtabs__content{
 		height: 60vh !important;
 	}
+	.btn{
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		padding: 30rpx;
+		border-bottom: 1px solid #00000022;
+	}
 	.category-title{
 		position: relative;
 		display: flex;
diff --git a/pages_order/service/situation.vue b/pages_order/service/situation.vue
index cc571fc..605b748 100644
--- a/pages_order/service/situation.vue
+++ b/pages_order/service/situation.vue
@@ -5,7 +5,7 @@
 		
 		<view class="top-img">
 			<uv-swiper
-			:list="banner.follow" 
+			:list="banner.yc" 
 			indicator
 			height="420rpx"
 			keyName="imageContent"></uv-swiper>
diff --git a/store/store.js b/store/store.js
index 1955352..af82ac1 100644
--- a/store/store.js
+++ b/store/store.js
@@ -96,8 +96,8 @@ const store = new Vuex.Store({
 		// 获取所有页面的轮播图
 		getBanner(state){
 			
-			// 0-首页 1-遗产路径 2-我要跟拍 3-非遗体验 4-无忧服务 5申遗历程
-			let config = ['path', 'follow', 'experience', 'service', 'course']
+			// 0-首页 1-遗产路径 2-我要跟拍 3-非遗体验 4-无忧服务 5申遗历程 6-遗产概况
+			let config = ['path', 'follow', 'experience', 'service', 'course', 'yc']
 			config.forEach((k, i) => {
 				api('queryBannerList', {
 					bannerCategoryType : i + 1,