From bc927846c17cb1608d7569bcf09714179eb3b45e Mon Sep 17 00:00:00 2001
From: linjinyuan <2841541624@qq.com>
Date: Fri, 9 Sep 2022 16:59:32 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91--?=
 =?UTF-8?q?=20=E5=92=A8=E8=AF=A2=E4=B8=AD=E5=BF=83tabs=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/pages/news/component/news-list.vue | 17 ++++++++++++-----
 app/src/pages/news/news.vue                |  6 ++----
 app/src/pages/search/search.vue            |  5 +++--
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/app/src/pages/news/component/news-list.vue b/app/src/pages/news/component/news-list.vue
index 3f380b2a..6175a21f 100644
--- a/app/src/pages/news/component/news-list.vue
+++ b/app/src/pages/news/component/news-list.vue
@@ -1,5 +1,5 @@
 <template>
-	<z-paging ref="paging" v-model="dataList" v-if="i == index" @query="queryList" :fixed="false" height="100%">
+	<z-paging auto-show-back-to-top :auto="i==index" ref="paging" v-model="dataList" :data-key="i" @query="queryList" :fixed="false" height="100%">
 		<block v-for="(newsItem,newsIndex) in dataList" :key="newsIndex">
 			<news-card :item="newsItem" :newsId="newsItem.id"></news-card>
 		</block>
@@ -7,7 +7,7 @@
 </template>
 
 <script lang="ts" setup>
-	import { ref } from 'vue';
+	import { ref, watch, nextTick } from 'vue';
 	import { getArticleList } from "@/api/news"
 
 	const props = withDefaults(defineProps < {
@@ -19,9 +19,16 @@
 	})
 
 	const paging = ref(null)
-	const dataList = ref([{
-		title: '123'
-	}])
+	const dataList = ref([])
+	const isFirst = ref<boolean>(true)
+	
+	watch(() => props.index, async () => {
+		await nextTick()
+		if( props.i == props.index && isFirst.value ) {
+			isFirst.value = false;
+			paging.value?.reload();
+		}
+	}, { immediate: true })
 
 	const queryList = async (pageNo, pageSize) => {
 		try{
diff --git a/app/src/pages/news/news.vue b/app/src/pages/news/news.vue
index 89aa6110..fb3b0c56 100644
--- a/app/src/pages/news/news.vue
+++ b/app/src/pages/news/news.vue
@@ -1,10 +1,8 @@
 <template>
     <view class="news" >
 		<!-- 搜索 -->
-		<navigator url="/pages/search/search">
-			<view class="news-search px-[24rpx] py-[14rpx] bg-white">
-				<u-search placeholder="请输入关键词搜索" disabled :show-action="false"></u-search>
-			</view>
+		<navigator class="news-search px-[24rpx] py-[14rpx] bg-white" url="/pages/search/search">
+			<u-search placeholder="请输入关键词搜索" disabled :show-action="false"></u-search>
 		</navigator>
 		
 		<!-- 内容 -->
diff --git a/app/src/pages/search/search.vue b/app/src/pages/search/search.vue
index a2ba405b..ceac229c 100644
--- a/app/src/pages/search/search.vue
+++ b/app/src/pages/search/search.vue
@@ -50,8 +50,8 @@
     import cache from "@/utils/cache"
 	
 	interface Search {
-		hot_search: any
-		his_search: any
+		hot_search: string[]
+		his_search:string[]
 		result: any
 		searching: boolean
 	}
@@ -82,6 +82,7 @@
 			search.hot_search = await getHotSearch()
 		}catch(e){
 			//TODO handle the exception
+			console.log('获取热门搜索失败=>', e)
 		}
 	}