添加banner

app/login/page.js

@@ -52,7 +52,7 @@ function Login({ handleLogin }) {
   const showMobal = useRef();
   const [iframePageUrl, setIframePageUrl] = useState(null);
   useEffect(() => {
-    const userAgent = navigator.userAgent;
+    const userAgent = window && window.navigator?.userAgent;
     //区分设备类型
     if (/Android/i.test(userAgent)) {
       setDeviceType("Android");

app/my/page.js

@@ -29,7 +29,6 @@ const My = () => {
       null,
       true
     );
-    console.log("------", data);
     if (data.ret === -1) {
       Toast.show({
         icon: "fail",
@@ -122,7 +121,7 @@ const My = () => {
           },
           {
             url: `my/refund/refundList`,
-            iconUrl: "/icons/32DP/wallet.png",
+            iconUrl: "/icons/32DP/refund.png",
             title: "退款审核",
             subTitle:
               account.data.account.role == 3 ? "创作者功能" : "完善资料后解锁",

app/noticeDetail/components/NoticeItem/index.jsx

@@ -63,7 +63,7 @@ export default function NoticeItem({ leftIcon, hasLink, data }) {
                       // }
                       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);

app/search/conponents/Banner/index.jsx

@@ -0,0 +1,81 @@
+import React, { useEffect, useState, useRef, useCallback } from "react";
+import { Toast, Swiper, Image } from "antd-mobile";
+import LoadingMask from "@/components/LoadingMask";
+import { useRouter } from "next/navigation";
+import requireAPI from "@/utils/requireAPI";
+import OwnImage from "@/components/OwnImage";
+import { goToPage } from "@/utils/tools";
+export default function Banner() {
+  const [bannerList, setBannerList] = useState([]);
+  const [isLoading, setIsLoading] = useState(false);
+  const router = useRouter();
+  const ref = useRef(null);
+  useEffect(() => {
+    const getBannerList = async () => {
+      setIsLoading(true);
+      try {
+        const _data = await requireAPI(
+          "POST",
+          "/api/activity_banner/list",
+          null,
+          true
+        );
+        if (_data.ret === -1) {
+          Toast.show({
+            icon: "fail",
+            content: _data.msg,
+            position: "top",
+          });
+          return;
+        }
+        setBannerList(_data.data.list);
+      } catch (error) {
+        console.error(error);
+      } finally {
+        setIsLoading(false);
+      }
+    };
+    getBannerList();
+  }, []);
+  const items = useCallback(
+    (item, index) => (
+      <Swiper.Item key={index}>
+        <div
+          className="w-full h-[200px]"
+          onClick={() => {
+            const links = item?.hyperlinks;
+            if (links.length > 1) {
+              router.push(
+                links.filter((it) => it.inward_action_type === "h5")[0]?.url
+              );
+            } else {
+              router.push(links[0]?.url);
+            }
+          }}
+        >
+          <OwnImage
+            className={"w-full h-full"}
+            outClassName={"w-full h-full"}
+            src={item.image.images[0].urls[0]}
+            fit="cover"
+            position="center"
+          />
+        </div>
+      </Swiper.Item>
+    ),
+    []
+  );
+  return (
+    <div className="flex-1 mt-6">
+      <Swiper
+        allowTouchMove
+        ref={ref}
+        loop
+        autoplay
+        style={{ "--border-radius": "8px" }}
+      >
+        {bannerList.map((item, index) => items(item, index))}
+      </Swiper>
+    </div>
+  );
+}

app/search/conponents/HostList/index.jsx

@@ -5,6 +5,7 @@ import { useRouter } from "next/navigation";
 import requireAPI from "@/utils/requireAPI";
 import OwnImage from "@/components/OwnImage";
 import OwnIcon from "@/components/OwnIcon";
+import Banner from "../Banner";
 export default function HostList() {
   const [hostList, setHostList] = useState([]);
   const [isLoading, setIsLoading] = useState(false);
@@ -38,6 +39,10 @@ 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
@@ -65,10 +70,13 @@ export default function HostList() {
           >
             <div
               onClick={() => {
-                if (item.hyperlinks[0].action === "outward") {
+                const links = item?.hyperlinks;
-                  window.open(item.hyperlinks[0].url);
+                if (links.length > 1) {
+                  router.push(
+                    links.filter((it) => it.inward_action_type === "h5")[0]?.url
+                  );
                 } else {
-                  router.push(`space/person_space_introduce/${item.mid}`);
+                  router.push(links[0]?.url);
                 }
               }}
               className="grid grid-cols-[48px,calc(100vw-48px-2rem)]"
@@ -94,34 +102,37 @@ export default function HostList() {
                   <span className="text-base text-white font-medium whitespace-nowrap truncate max-w-[30%]">
                     {item.title}
                   </span>
-
+                  {item.age && (
-                  <div className="flex flex-row items-center py-0.5 px-2 ml-1 bg-[#FFFFFF1A] rounded-full">
+                    <>
-                    {item?.gender === 1 ? (
+                      <div className="flex flex-row items-center py-0.5 px-2 ml-1 bg-[#FFFFFF1A] rounded-full">
-                      <OwnIcon
+                        {item?.gender === 1 ? (
-                        src="/icons/info/female.png"
+                          <OwnIcon
-                        className="w-[14px] h-full"
+                            src="/icons/info/female.png"
-                        outClassName="mr-1"
+                            className="w-[14px] h-full"
-                      />
+                            outClassName="mr-1"
-                    ) : (
+                          />
-                      <OwnIcon
+                        ) : (
-                        src="/icons/info/male.png"
+                          <OwnIcon
-                        className="w-[14px] h-full"
+                            src="/icons/info/male.png"
-                        outClassName="mr-1"
+                            className="w-[14px] h-full"
-                      />
+                            outClassName="mr-1"
-                    )}
+                          />
-                    <span className="text-white text-xs font-medium ml-0.5">
+                        )}
-                      {item.age}
+                        <span className="text-white text-xs font-medium ml-0.5">
-                    </span>
+                          {item.age}
-                  </div>
+                        </span>
-                  <div className="flex flex-row items-center py-0.5 px-2 ml-1 bg-[#FFFFFF1A] rounded-full">
+                      </div>
-                    <OwnIcon
+                      <div className="flex flex-row items-center py-0.5 px-2 ml-1 bg-[#FFFFFF1A] rounded-full">
-                      src="/icons/info/location.png"
+                        <OwnIcon
-                      className="w-[14px] h-full"
+                          src="/icons/info/location.png"
-                    />
+                          className="w-[14px] h-full"
-                    <span className="text-white text-xs font-medium ml-0.5">
+                        />
-                      {item.city}
+                        <span className="text-white text-xs font-medium ml-0.5">
-                    </span>
+                          {item.city}
-                  </div>
+                        </span>
+                      </div>
+                    </>
+                  )}
                 </div>
                 <p className="text-sm text-[#FFFFFF80] whitespace-nowrap truncate w-full">
                   {item.text}
@@ -131,7 +142,6 @@ export default function HostList() {
           </List.Item>
         ))}
       </List>
-      {/* Banner预留位置 */}
     </div>
   );
 }

app/space/person_space_introduce/[mid]/page.js

@@ -175,6 +175,7 @@ export default function PersonSpaceIntroduce() {
               <OwnImage
                 rounded="rounded"
                 className="h-full"
+                outClassName="h-full"
                 fit="cover"
                 src={data?.streamer_ext?.shorts?.videos[0]?.cover_urls[0]}
               />

components/InOtherApp/index.js

@@ -6,7 +6,7 @@ export default function InOtherApp() {
   //区分是否在微信/微博/qq/支付宝/钉钉内置浏览器中打开
   const [isInOtherApp, setIsInOtherApp] = useState(false);
   useEffect(() => {
-    const userAgent = navigator.userAgent.toLowerCase();
+    const userAgent = window && window.navigator?.userAgent.toLowerCase();
     let temIsInOtherApp =
       userAgent.match(/MicroMessenger/i) == "micromessenger" ||
       userAgent.match(/WeiBo/i) == "weibo" ||

components/VideoPlayer/index.jsx

@@ -14,7 +14,7 @@ export default function VideoPlayer({ video }) {
   const [showController, setShowController] = useState(false);
   const [screenState, setScreenState] = useState(false);
   const isSliding = useRef(null);
-  const userAgent = navigator.userAgent;
+  const userAgent = window && window.navigator?.userAgent;
   // const currentTime = useMemo(()=>{
   //   const videoPlayer = document.getElementById("videoPlayer");
   //   if (videoPlayer) {

components/WithAuth/index.js

@@ -1,3 +1,4 @@
+"use client";
 import { checkAuth } from "@/utils/auth";
 import { useRouter, usePathname, useSearchParams } from "next/navigation";
 import { useEffect } from "react";
@@ -10,7 +11,7 @@ export default function WithAuth(WrappedComponent) {
   const pathname = usePathname();
   const searchParams = useSearchParams();
   useEffect(() => {
-    const ua = navigator.userAgent.toLowerCase();
+    const ua = window && window.navigator?.userAgent.toLowerCase();
     if (
       (ua.indexOf("mqqbrowser") > -1 || ua.indexOf("quark") > -1) &&
       ua.indexOf("iphone") > -1

utils/baseRequest.js

@@ -1,3 +1,4 @@
+"use client";
 import { getCookie } from "cookies-next";
 import { get } from "./storeInfo";
 export default function baseRequest() {
@@ -7,7 +8,7 @@ export default function baseRequest() {
   const mid = getCookie("mid");
   const b_ts = new Date().getTime();
   let b_dt = 0;
-  if (/(iPad|iPhone|iPod)/gi.test(navigator.userAgent)) {
+  if (/(iPad|iPhone|iPod)/gi.test(window && window.navigator?.userAgent)) {
     b_dt = 1;
   }
   const baseRequest = {

utils/tools.js

@@ -1,3 +1,4 @@
+"use client";
 import { Toast } from "antd-mobile";
 //格式化时间戳
 export function formatDeadline(timestamp) {
@@ -135,7 +136,7 @@ export function getVideoBase64(url) {
     canvas.height = video.height;
 
     // 判断是否为 iOS 系统
-    if (/(iPad|iPhone|iPod)/gi.test(navigator.userAgent)) {
+    if (/(iPad|iPhone|iPod)/gi.test(window && window.navigator?.userAgent)) {
       // 在 iOS 系统中，需要手动触发视频加载，然后设置自动播放和静音属性
       video.load();
       // video.autoplay = true;
@@ -182,17 +183,26 @@ export function getcountLines(str) {
 }
 
 // 跳转页面
-// export function goToPage(link) {
+export function goToPage(link) {
-//   let linkArr = link.split("?");
+  let linkArr = link.split("?");
-//   const params = linkArr[1]?.split("&");
+  const params = linkArr[1]?.split("&");
-//   console.log("params", params);
+
-//   if (params == "") return "/my/" + linkArr[0];
+  if (!params) return linkArr[0];
-// }
+  // if (linkArr[0].includes("/")) {
+  //   const path = linkArr[0].replace(/^\/+|\/+$/g, "");
+  //   const pathNames = path.split("/").filter((it) => it != "");
+  //   return [pathNames[0], { screen: pathNames[1] }];
+  // }
+  const query = params
+    .map((it) => ({ [it.split("=")[0]]: it.split("=")[1] }))
+    .reduce((acc, cur) => ({ ...acc, ...cur }), {});
+  return [linkArr[0], query];
+}
 
 // 尝试使用浏览器打开URL
 export function openUrlWithBrowser(url) {
   try {
-    const userAgent = navigator.userAgent;
+    const userAgent = window && window.navigator?.userAgent;
     //区分设备类型
     if (/Android/i.test(userAgent)) {
       var intentUrl =

utils/webviewBaseRequest.js

@@ -1,3 +1,4 @@
+"use client";
 import { getCookies } from "cookies-next";
 
 export default function webviewBaseRequest() {
@@ -5,7 +6,7 @@ export default function webviewBaseRequest() {
   const b_ts = new Date().getTime();
   const baseRequest = {
     b_mid: parseInt(cookies.b_mid),
-    b_did: window && window.navigator?.userAgent.slice(0,65),
+    b_did: window && window.navigator?.userAgent.slice(0, 65),
     b_ver: cookies.b_ver,
     b_dt: parseInt(cookies.b_dt),
     b_model: cookies.b_model,