From 49d0da3f8dec178823a217f363aef02083eacc12 Mon Sep 17 00:00:00 2001
From: al <al@cdhncy.com>
Date: Thu, 16 Jan 2025 11:17:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B6=88=E6=81=AF=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/noticeDetail/components/NoticeItem/index.jsx | 14 +++-----------
 app/search/conponents/Banner/index.jsx           |  6 +++---
 app/search/conponents/HostList/index.jsx         | 10 +++++-----
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/app/noticeDetail/components/NoticeItem/index.jsx b/app/noticeDetail/components/NoticeItem/index.jsx
index c6e5a34..0e2b7bd 100644
--- a/app/noticeDetail/components/NoticeItem/index.jsx
+++ b/app/noticeDetail/components/NoticeItem/index.jsx
@@ -19,13 +19,13 @@ export default function NoticeItem({ leftIcon, hasLink, data }) {
                 {/* <Icon type="ionicon" name="megaphone" size={24} color="white" /> */}
                 {leftIcon}
               </div>
-              <p className="text-lg font-medium mr-2 ">{data?.title}</p>
+              <p className="text-lg font-medium mr-2 truncate">{data?.title}</p>
             </div>
             <pre className="text-base font-medium my-2 whitespace-pre-wrap">
               {data?.message}
             </pre>
             {/* 链接跳转 */}
-            {!!data?.hyperlinks && (
+            {data?.hyperlinks && data?.hyperlinks[0].action && (
               <div
                 onClick={() => {}}
                 className="rounded-xl p-2 flex flex-row items-center my-2 bg-[#FFFFFF1A]"
@@ -53,17 +53,9 @@ export default function NoticeItem({ leftIcon, hasLink, data }) {
                     }
                     const links = data?.hyperlinks;
                     if (links) {
-                      // const linkAndParams = goToPage(
-                      //   links[1]?.params
-                      // );
-                      // if (linkAndParams) {
-                      //   typeof linkAndParams === "object"
-                      //     ? router.push(...linkAndParams)
-                      //     : router.push(linkAndParams);
-                      // }
                       if (links.length > 1) {
                         links[1]?.action === "app_router_path";
-                        router.push("/" + links[1]?.params);
+                        router.push(links[1]?.params);
                       } else {
                         links[0]?.action === "outward";
                         router.push(links[0]?.params);
diff --git a/app/search/conponents/Banner/index.jsx b/app/search/conponents/Banner/index.jsx
index d6e8244..ae99e9d 100644
--- a/app/search/conponents/Banner/index.jsx
+++ b/app/search/conponents/Banner/index.jsx
@@ -17,7 +17,7 @@ export default function Banner() {
         const _data = await requireAPI(
           "POST",
           "/api/activity_banner/list",
-          null,
+          { body: { device_type: 2 } },
           true
         );
         if (_data.ret === -1) {
@@ -39,9 +39,9 @@ export default function Banner() {
   }, []);
   const items = useCallback(
     (item, index) => (
-      <Swiper.Item key={index}>
+      <Swiper.Item key={item.id}>
         <div
-          className="w-full h-[200px]"
+          className="w-full h-[calc(100vw*3/7)]"
           onClick={() => {
             const links = item?.hyperlinks;
             if (links.length > 1) {
diff --git a/app/search/conponents/HostList/index.jsx b/app/search/conponents/HostList/index.jsx
index a41d606..7380f91 100644
--- a/app/search/conponents/HostList/index.jsx
+++ b/app/search/conponents/HostList/index.jsx
@@ -39,10 +39,6 @@ export default function HostList() {
   }, []);
   return (
     <div className="flex-1 mt-6">
-      {/* Banner预留位置 */}
-      <div className="my-4">
-        <Banner />
-      </div>
       <div className="flex flex-row justify-between items-center">
         <p className="text-xl font-medium">猜你想看</p>
         {/* <div
@@ -102,7 +98,7 @@ export default function HostList() {
                   <span className="text-base text-white font-medium whitespace-nowrap truncate max-w-[30%]">
                     {item.title}
                   </span>
-                  {item.age && (
+                  {!!item.age && (
                     <>
                       <div className="flex flex-row items-center py-0.5 px-2 ml-1 bg-[#FFFFFF1A] rounded-full">
                         {item?.gender === 1 ? (
@@ -142,6 +138,10 @@ export default function HostList() {
           </List.Item>
         ))}
       </List>
+      {/* Banner预留位置 */}
+      <div className="my-4">
+        <Banner />
+      </div>
     </div>
   );
 }