From 692eaad26cc7ae7c5ddb191cfaa981cdfccaa11c Mon Sep 17 00:00:00 2001
From: zhangkai <847704969@qq.com>
Date: Fri, 30 May 2025 17:25:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/AppNews.vue      |  2 +-
 components/AppRegiment.vue  |  2 +-
 components/AppSearchdel.vue | 40 +++++++++++++++++++++++++------------
 pages/index.vue             |  2 +-
 4 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/components/AppNews.vue b/components/AppNews.vue
index 3343860..57cf5d5 100644
--- a/components/AppNews.vue
+++ b/components/AppNews.vue
@@ -112,7 +112,7 @@ const toSearch =() => {
     emit('toSwpe',9);
     emitter.emit('inputSea', {
         keywords:inputSearch.value,
-        type: 2,
+        type: 1,
     });
 }
 const getPageList = async () => {
diff --git a/components/AppRegiment.vue b/components/AppRegiment.vue
index 6a6194e..6abdc52 100644
--- a/components/AppRegiment.vue
+++ b/components/AppRegiment.vue
@@ -98,7 +98,7 @@ const toSearch =() => {
     emit('toSwpe',9);
     emitter.emit('inputSea', {
         keywords:inputSearch.value,
-        type: 2,
+        type: 3,
     });
 }
 const getPageList = async () => {
diff --git a/components/AppSearchdel.vue b/components/AppSearchdel.vue
index 63ebdaf..33ec47c 100644
--- a/components/AppSearchdel.vue
+++ b/components/AppSearchdel.vue
@@ -23,7 +23,7 @@
                     <div class="re_box">
                         <div class="re_box_item"  >
                             <div class='re_mian'>找到结果{{Newsdetailist.length}}条</div>
-                            <div v-for=" item,index in Newsdetailist" :key="index" @click="gotoDetail(item.id)">
+                            <div v-for=" item,index in Newsdetailist" :key="index" @click="gotoDetail(item.id)" style="width: 100%;">
                                     <div class="re_title">{{ item.title }}</div>
                                 <!-- <div class="re_content">
                                     {{  }}
@@ -40,7 +40,7 @@
                     <n-tabs :bar-width="0" type="line" 
                     class="custom-tabs" pane-style="background-color: #ffffff;">
                         <n-tab-pane name="oasis" tab="热门推荐" style="padding: 30px;">
-                            <div class="flex flex-row" v-for="item,index in remList" :key="index" style="padding-bottom:30px;">
+                            <div class="flex flex-row" v-for="item,index in remList" :key="index" style="padding-bottom:30px;cursor: pointer;" @click="gotoDetails(item.id)">
                                 <div class="number_t" v-if="index == 0 || index == 1 || index == 2">
                                     {{index+1 > 10 ? index + 1 : '0'+(index+1) }}
                                 </div>
@@ -61,7 +61,7 @@
                             </div>
                         </n-tab-pane>
                         <n-tab-pane name="jay chou" tab="精选文章" style="padding: 30px;">
-                         <div class="flex flex-row" v-for="item,index in jinxList" :key="index" style="padding-bottom:30px;">
+                         <div class="flex flex-row" v-for="item,index in jinxList" :key="index" style="padding-bottom:30px;cursor: pointer;" @click="gotoDetails(item.id)">
                                 <div class="number_t" v-if="index == 0 || index == 1 || index == 2">
                                     {{index+1 > 10 ? index + 1 : '0'+(index+1) }}
                                 </div>
@@ -112,7 +112,13 @@ const jinxList = ref([]);
 const remList = ref([]);
 const Newsdetailist = ref([]);
 const detailId = ref(null);
+const datas = ref(null);
 const emit = defineEmits(['toSwpe'])
+emitter.on('inputSea', (data) => {
+    console.log(data,111111)
+    datas.value = data;
+    getNewsdetail(data);
+});
 const getjinxList = async () => {
 	const res = await $api.post('/api/home.news/index',
         {
@@ -135,18 +141,27 @@ const getremList = async () => {
 }
 //跳转详情
 const gotoDetail = (id: number) => {
+    console.log(datas)
     detailId.value = {
         id: id,
-        type: '3'
+        type: datas.value.type
     };
     localStorage.setItem('detailId', JSON.stringify(detailId.value));
     emit('toSwpe',6)
     emitter.emit('detailId', detailId.value);
 }
-emitter.on('inputSea', (data) => {
-    console.log(data,111111)
-    getNewsdetail(data);
-});
+//跳转新闻详情
+const gotoDetails = (id: number) => {
+    console.log(datas)
+    detailId.value = {
+        id: id,
+        type: 1
+    };
+    localStorage.setItem('detailId', JSON.stringify(detailId.value));
+    emit('toSwpe',6)
+    emitter.emit('detailId', detailId.value);
+}
+
 // 新闻/百科/信息公开 搜索
 const getNewsdetail = async (data:object) => {
     // 新闻
@@ -200,7 +215,7 @@ onMounted(() => {
     height:100%;
     background-image: url('/img/xwdt.png');
     background-size: 100% 100%;
-
+    overflow-y: auto;
     .fiximg {
         img {
             margin-bottom: 20px;
@@ -265,8 +280,7 @@ onMounted(() => {
             margin: 0 auto;
             margin-top: 40px;
             padding-left: 100px;
-            overflow-y: auto;
-
+            overflow: hidden;
             .re_box_item {
                 width: 100%;
                 background: #ffffff;
@@ -278,9 +292,9 @@ onMounted(() => {
                 /* 允许换行 */
                 justify-content: flex-start;
                 /* 项目左对齐 */
-
+                cursor: pointer;
                 .re_slice {
-                    width: 841px;
+                    // width: 841px;
                     border-bottom: 1px dashed #bbbbbb;
                     margin-top: 20px;
                     margin-bottom: 30px;
diff --git a/pages/index.vue b/pages/index.vue
index 696fc74..6efe055 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -45,7 +45,7 @@
 				</swiper-slide>
 				<!-- 搜索详情 -->
 				<swiper-slide :show="isSearch" id="searchid">
-					<AppSearchdel ></AppSearchdel>
+					<AppSearchdel @toSwpe="toswiper"></AppSearchdel>
 				</swiper-slide>
 			</swiper>