From cf14a0dc2e1767d73b189b7c50cdfcbbdf5ab0e6 Mon Sep 17 00:00:00 2001 From: al Date: Thu, 16 Jan 2025 20:24:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0webView=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/login/page.js | 16 ++++++++++---- app/my/page.js | 10 +++++++-- app/my/setting/aboutUs/page.js | 8 +++++-- .../joinStreamer/page.jsx | 4 +++- app/my/wallet/page.js | 4 +++- .../components/MessageList/index.jsx | 2 +- .../components/NoticeItem/index.jsx | 20 +++++++++++++++-- .../components/ScrollNotice/index.js | 22 +++++++++++++++++-- app/search/conponents/Banner/index.jsx | 2 +- app/search/page.js | 8 +++++-- app/space/[id]/page.js | 20 ++++++++--------- .../person_space_introduce/[mid]/page.js | 10 ++++----- app/webView/[src]/page.js | 4 ++-- components/CheckVip/index.jsx | 4 +++- components/ImagesMask/index.jsx | 13 ++++++----- components/PaySpacePost/index.js | 11 +++++----- components/Photos/index.js | 11 +++++----- components/StreamerNavigator/index.js | 1 - components/VideoPlayer/index.jsx | 1 - utils/tools/handleFuns.js | 2 -- 20 files changed, 115 insertions(+), 58 deletions(-) diff --git a/app/login/page.js b/app/login/page.js index 2c583be..276ce71 100644 --- a/app/login/page.js +++ b/app/login/page.js @@ -247,7 +247,9 @@ function Login({ handleLogin }) { className="text-[#FF669E]" onClick={() => { setIframePageUrl( - `/webView/${encodeURIComponent("/doc/useragreement")}` + `/webView/${encodeURIComponent( + `${process.env.NEXT_PUBLIC_WEB_URL}/doc/useragreement` + )}` ); }} > @@ -258,7 +260,9 @@ function Login({ handleLogin }) { className="text-[#FF669E]" onClick={() => { setIframePageUrl( - `/webView/${encodeURIComponent("/doc/privatypolicy")}` + `/webView/${encodeURIComponent( + `${process.env.NEXT_PUBLIC_WEB_URL}/doc/privatypolicy` + )}` ); }} > @@ -598,7 +602,9 @@ const LoginBtn = ({ { setIframePageUrl( - `/webView/${encodeURIComponent("/doc/useragreement")}` + `/webView/${encodeURIComponent( + `${process.env.NEXT_PUBLIC_WEB_URL}/doc/useragreement` + )}` ); }} className="text-[#FF669E] text-xs" @@ -609,7 +615,9 @@ const LoginBtn = ({ { setIframePageUrl( - `/webView/${encodeURIComponent("/doc/privatypolicy")}` + `/webView/${encodeURIComponent( + `${process.env.NEXT_PUBLIC_WEB_URL}/doc/privatypolicy` + )}` ); }} className="text-[#FF669E] text-xs" diff --git a/app/my/page.js b/app/my/page.js index 7fb248e..884e0e9 100644 --- a/app/my/page.js +++ b/app/my/page.js @@ -235,7 +235,11 @@ const My = () => { subTitle != "完善资料后解锁" && !disable && router.push( - toWebView ? `/webView/${encodeURIComponent(url)}` : url + toWebView + ? `/webView/${encodeURIComponent( + `${process.env.NEXT_PUBLIC_WEB_URL}/${url}` + )}` + : url ); }} > @@ -422,7 +426,9 @@ const My = () => { const base = baseRequest(); router.push( `/webView/${encodeURIComponent( - `/vip?base=${encodeURIComponent(JSON.stringify(base))}` + `${ + process.env.NEXT_PUBLIC_WEB_URL + }/${`/vip?base=${encodeURIComponent(JSON.stringify(base))}`}` )}` ); }} diff --git a/app/my/setting/aboutUs/page.js b/app/my/setting/aboutUs/page.js index 74d005b..6f039d6 100644 --- a/app/my/setting/aboutUs/page.js +++ b/app/my/setting/aboutUs/page.js @@ -41,7 +41,9 @@ export default function AboutUs() { className="flex justify-between items-center p-3" onClick={() => router.push( - `/webView/${encodeURIComponent("/doc/useragreement")}` + `/webView/${encodeURIComponent( + `${process.env.NEXT_PUBLIC_WEB_URL}/doc/useragreement` + )}` ) } > @@ -64,7 +66,9 @@ export default function AboutUs() { className="flex justify-between items-center p-3" onClick={() => router.push( - `/webView/${encodeURIComponent("/doc/privatypolicy")}` + `/webView/${encodeURIComponent( + `${process.env.NEXT_PUBLIC_WEB_URL}/doc/privatypolicy` + )}` ) } > diff --git a/app/my/streamerVerification/joinStreamer/page.jsx b/app/my/streamerVerification/joinStreamer/page.jsx index d36cdcf..4c884c4 100644 --- a/app/my/streamerVerification/joinStreamer/page.jsx +++ b/app/my/streamerVerification/joinStreamer/page.jsx @@ -102,7 +102,9 @@ export default function JoinStreamer() { className="text-base text-center leading-9 text-[#FF669E]" onClick={() => { router.push( - `/webView/${encodeURIComponent("/doc/platformguidelines")}` + `/webView/${encodeURIComponent( + `${process.env.NEXT_PUBLIC_WEB_URL}/doc/platformguidelines` + )}` ); }} > diff --git a/app/my/wallet/page.js b/app/my/wallet/page.js index 8a68da3..df058ba 100644 --- a/app/my/wallet/page.js +++ b/app/my/wallet/page.js @@ -100,7 +100,9 @@ export default function Wallet() { // console.log("base,base", base); router.push( `/webView/${encodeURIComponent( - `/pay?base=${encodeURIComponent(JSON.stringify(base))}` + `${ + process.env.NEXT_PUBLIC_WEB_URL + }/pay?base=${encodeURIComponent(JSON.stringify(base))}` )}` ); } diff --git a/app/noticeDetail/components/MessageList/index.jsx b/app/noticeDetail/components/MessageList/index.jsx index b318fc6..979f5ac 100644 --- a/app/noticeDetail/components/MessageList/index.jsx +++ b/app/noticeDetail/components/MessageList/index.jsx @@ -217,7 +217,7 @@ const MessageList = ({ mid, changeNoticeCount, refInstance, noticeCount }) => { return (
{/* 广告轮播 */} - {!!scollNotice.length && } + {!!scollNotice.content && } {/* 官方消息 */}
diff --git a/app/noticeDetail/components/NoticeItem/index.jsx b/app/noticeDetail/components/NoticeItem/index.jsx index 0e2b7bd..2f72ebc 100644 --- a/app/noticeDetail/components/NoticeItem/index.jsx +++ b/app/noticeDetail/components/NoticeItem/index.jsx @@ -4,8 +4,12 @@ import { Toast } from "antd-mobile"; import { useRouter } from "next/navigation"; import OwnImage from "@/components/OwnImage"; import OwnIcon from "@/components/OwnIcon"; +import baseRequest from "@/utils/baseRequest"; + export default function NoticeItem({ leftIcon, hasLink, data }) { const router = useRouter(); + const base = baseRequest(); + return (
@@ -57,8 +61,20 @@ export default function NoticeItem({ leftIcon, hasLink, data }) { links[1]?.action === "app_router_path"; router.push(links[1]?.params); } else { - links[0]?.action === "outward"; - router.push(links[0]?.params); + if (links[0]?.action === "outward") { + router(links[0]?.params); + } else { + // alert(links[0]?.params); + // alert(encodeURIComponent(links[0]?.params)); + router.push( + `/webView/${encodeURIComponent( + links[0]?.params + + `?base=${encodeURIComponent( + JSON.stringify(base) + )}` + )}` + ); + } } } }} diff --git a/app/noticeDetail/components/ScrollNotice/index.js b/app/noticeDetail/components/ScrollNotice/index.js index 4359668..69fdcc6 100644 --- a/app/noticeDetail/components/ScrollNotice/index.js +++ b/app/noticeDetail/components/ScrollNotice/index.js @@ -3,7 +3,10 @@ import React from "react"; import { NoticeBar } from "antd-mobile"; import OwnIcon from "@/components/OwnIcon"; -export default function ScrollNotice({ content }) { +import { useRouter } from "next/navigation"; +/************* ✨ Codeium Command ⭐ *************/ +export default function ScrollNotice({ data }) { + const router = useRouter(); // const [fadeAnim] = useState(new Animated.Value(300)); // 透明度初始值为0 // let animation = Animated.timing(fadeAnim, { // toValue: -(length * 60), @@ -45,7 +48,22 @@ export default function ScrollNotice({ content }) { /> } bordered={false} - content={content} + content={ +
{ + const links = data?.hyperlinks; + if (links.length > 1) { + links[1]?.action === "app_router_path"; + router.push(links[1]?.url); + } else { + links[0]?.action === "outward"; + router.push(links[0]?.url); + } + }} + > + {data.content} +
+ } style={{ "--background-color": "transparent", "--height": "max-content", diff --git a/app/search/conponents/Banner/index.jsx b/app/search/conponents/Banner/index.jsx index ae99e9d..4e97e71 100644 --- a/app/search/conponents/Banner/index.jsx +++ b/app/search/conponents/Banner/index.jsx @@ -41,7 +41,7 @@ export default function Banner() { (item, index) => (
{ const links = item?.hyperlinks; if (links.length > 1) { diff --git a/app/search/page.js b/app/search/page.js index 3d8c2d8..404d2c9 100644 --- a/app/search/page.js +++ b/app/search/page.js @@ -800,7 +800,9 @@ export default function Search() { if (!isMember) { router.push( `/webView/${encodeURIComponent( - `/vip?base=${encodeURIComponent(JSON.stringify(base))}` + `${ + process.env.NEXT_PUBLIC_WEB_URL + }/vip?base=${encodeURIComponent(JSON.stringify(base))}` )}` ); return; @@ -1000,7 +1002,9 @@ export default function Search() { if (!isMember) { router.push( `/webView/${encodeURIComponent( - `/vip?base=${encodeURIComponent(JSON.stringify(base))}` + `${ + process.env.NEXT_PUBLIC_WEB_URL + }/vip?base=${encodeURIComponent(JSON.stringify(base))}` )}` ); return; diff --git a/app/space/[id]/page.js b/app/space/[id]/page.js index cf4141d..33ae28a 100644 --- a/app/space/[id]/page.js +++ b/app/space/[id]/page.js @@ -294,11 +294,11 @@ export default function PersonSpace() { : router.push( "/webView/" + encodeURIComponent( - "/zone/pay/" + - streamerInfo?.id + - "/h5_zone_superfanship/0" + - "?base=" + - encodeURIComponent(JSON.stringify(base)) + `${process.env.NEXT_PUBLIC_WEB_URL}/zone/pay/${ + streamerInfo?.id + }/h5_zone_superfanship/0?base=${encodeURIComponent( + JSON.stringify(base) + )}` ) ); }} @@ -461,11 +461,11 @@ export default function PersonSpace() { : router.push( "/webView/" + encodeURIComponent( - "/zone/pay/" + - streamerInfo?.id + - "/h5_zone_superfanship/0" + - "?base=" + - encodeURIComponent(JSON.stringify(base)) + `${process.env.NEXT_PUBLIC_WEB_URL}/zone/pay/${ + streamerInfo?.id + }/h5_zone_superfanship/0?base=${encodeURIComponent( + JSON.stringify(base) + )}` ) ); }} diff --git a/app/space/person_space_introduce/[mid]/page.js b/app/space/person_space_introduce/[mid]/page.js index a1bd75d..853f57c 100644 --- a/app/space/person_space_introduce/[mid]/page.js +++ b/app/space/person_space_introduce/[mid]/page.js @@ -256,11 +256,11 @@ export default function PersonSpaceIntroduce() { router.push( "/webView/" + encodeURIComponent( - "/zone/pay/" + - data?.id + - "/h5_zone_admission/0" + - "?base=" + - encodeURIComponent(JSON.stringify(base)) + `${process.env.NEXT_PUBLIC_WEB_URL}/zone/pay/${ + data?.id + }/h5_zone_admission/0?base=${encodeURIComponent( + JSON.stringify(base) + )}` ) ); } diff --git a/app/webView/[src]/page.js b/app/webView/[src]/page.js index 13f4457..4c695f2 100644 --- a/app/webView/[src]/page.js +++ b/app/webView/[src]/page.js @@ -4,7 +4,7 @@ import React from "react"; import { useRouter, useParams } from "next/navigation"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { faAngleLeft } from "@fortawesome/free-solid-svg-icons"; -export default function PersonSpace() { +export default function WebView() { const { src } = useParams(); const router = useRouter(); return ( @@ -25,7 +25,7 @@ export default function PersonSpace() { {/* 内容 */}