diff --git a/app/globals.css b/app/globals.css index 9b387f9..f861879 100644 --- a/app/globals.css +++ b/app/globals.css @@ -3,10 +3,13 @@ @tailwind utilities; body { color: #fff; - position: relative + position: relative; + touch-action:pan-y; + overflow-y: scroll; /* 确保页面在缩放时仍能滚动 */ /* padding-bottom: constant(safe-area-inset-bottom); padding-bottom: env(safe-area-inset-bottom); */ } + footer { /* Fallback for non-iOS devices */ bottom: 0; @@ -408,4 +411,8 @@ textarea { .ant-modal-mask, .ant-modal-wrap { position: absolute !important; +} + +.notice-toast .adm-toast-main{ + background-color: rgb(23,22,26)!important; } \ No newline at end of file diff --git a/app/layout.js b/app/layout.js index 95f43e3..68af304 100644 --- a/app/layout.js +++ b/app/layout.js @@ -108,7 +108,7 @@ export default function RootLayout({ children }) { {/* */} diff --git a/app/login/page.js b/app/login/page.js index acdada0..276ce71 100644 --- a/app/login/page.js +++ b/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"); @@ -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 dc5fea0..884e0e9 100644 --- a/app/my/page.js +++ b/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 ? "创作者功能" : "完善资料后解锁", @@ -236,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 ); }} > @@ -423,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 c77c229..d300a0c 100644 --- a/app/noticeDetail/components/MessageList/index.jsx +++ b/app/noticeDetail/components/MessageList/index.jsx @@ -5,7 +5,7 @@ import React, { useImperativeHandle, } from "react"; import { formatDate } from "../../../../utils/tools"; -// import ScrollNotice from "../ScrollNotice"; +import ScrollNotice from "../ScrollNotice"; import { useRouter } from "next/navigation"; import requireAPI from "@/utils/requireAPI"; import { connect } from "react-redux"; @@ -13,6 +13,7 @@ import { changeNoticeCount } from "@/store/actions"; import { Badge, Toast } from "antd-mobile"; import OwnImage from "@/components/OwnImage"; import OwnIcon from "@/components/OwnIcon"; + const MessageList = ({ mid, changeNoticeCount, refInstance, noticeCount }) => { const router = useRouter(); const [data, setData] = useState({}); @@ -198,7 +199,7 @@ const MessageList = ({ mid, changeNoticeCount, refInstance, noticeCount }) => {
99 ? "+99" : count} + content={count > 99 ? "99+" : count} className="text-lg" />
@@ -217,7 +218,7 @@ const MessageList = ({ mid, changeNoticeCount, refInstance, noticeCount }) => { return (
{/* 广告轮播 */} - {/* {!!scollNotice.length && } */} + {!!scollNotice.content && } {/* 官方消息 */}
@@ -259,7 +260,7 @@ const MessageList = ({ mid, changeNoticeCount, refInstance, noticeCount }) => { 99 ? "+99" : data.contact_cs_urc + data.contact_cs_urc > 99 ? "99+" : data.contact_cs_urc } className="text-lg" /> diff --git a/app/noticeDetail/components/NoticeItem/index.jsx b/app/noticeDetail/components/NoticeItem/index.jsx index 8c8b5ad..e6343a1 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 (
@@ -19,13 +23,13 @@ export default function NoticeItem({ leftIcon, hasLink, data }) { {/* */} {leftIcon}
-

{data?.title}

+

{data?.title}

               {data?.message}
{/* 链接跳转 */} - {!!data?.hyperlinks && ( + {data?.hyperlinks && data?.hyperlinks[0].action && (
{}} className="rounded-xl p-2 flex flex-row items-center my-2 bg-[#FFFFFF1A]" @@ -53,20 +57,29 @@ 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); } else { - links[0]?.action === "outward"; - router.push(links[0]?.params); + if (links[0]?.action === "outward") { + // 在新的标签也打开 + window.open(links[0]?.params); + } else { + // alert(links[0]?.params); + // alert(encodeURIComponent(links[0]?.params)); + router.push( + `/webView/${encodeURIComponent( + links[0]?.params + + (links[0]?.action === + "webViewWithOutHeaderInward" || + links[0]?.action === "webViewHeaderInward" + ? `?base=${encodeURIComponent( + JSON.stringify(base) + )}` + : "") + )}` + ); + } } } }} diff --git a/app/noticeDetail/components/ScrollNotice/index.js b/app/noticeDetail/components/ScrollNotice/index.js index 4359668..9027509 100644 --- a/app/noticeDetail/components/ScrollNotice/index.js +++ b/app/noticeDetail/components/ScrollNotice/index.js @@ -3,7 +3,13 @@ import React from "react"; import { NoticeBar } from "antd-mobile"; import OwnIcon from "@/components/OwnIcon"; -export default function ScrollNotice({ content }) { +import { useRouter } from "next/navigation"; +import baseRequest from "@/utils/baseRequest"; + +export default function ScrollNotice({ data }) { + const base = baseRequest(); + + const router = useRouter(); // const [fadeAnim] = useState(new Animated.Value(300)); // 透明度初始值为0 // let animation = Animated.timing(fadeAnim, { // toValue: -(length * 60), @@ -35,7 +41,32 @@ export default function ScrollNotice({ content }) { // // 如果你需要在组件卸载时停止动画，你需要实现一个机制来跟踪组件的状态，并在适当时调用`stopAnimation`。 // }, [fadeAnim]); return ( -
+
{ + const links = data?.hyperlinks; + if (links.length > 1) { + router.push(links[1]?.url); + } else { + if (links[0]?.action === "outward") { + // 在新的标签也打开 + window.open(links[0]?.url); + } else { + // alert(links[0]?.params); + // alert(encodeURIComponent(links[0]?.params)); + router.push( + `/webView/${encodeURIComponent( + links[0]?.url + + (links[0]?.action === "webViewWithOutHeaderInward" || + links[0]?.action === "webViewHeaderInward" + ? `?base=${encodeURIComponent(JSON.stringify(base))}` + : "") + )}` + ); + } + } + }} + > } bordered={false} - content={content} + content={
{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 new file mode 100644 index 0000000..4c141cd --- /dev/null +++ b/app/search/conponents/Banner/index.jsx @@ -0,0 +1,97 @@ +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 baseRequest from "@/utils/baseRequest"; +export default function Banner() { + const base = baseRequest(); + 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", + { body: { device_type: 2 } }, + 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) => ( + +
{ + const links = item?.hyperlinks; + if (links.length > 1) { + router.push( + links.filter((it) => it.inward_action_type === "h5")[0]?.url + ); + } else { + if (links[0]?.action === "outward") { + // 在新的标签也打开 + window.open(links[0]?.url); + } else { + // alert(links[0]?.params); + // alert(encodeURIComponent(links[0]?.params)); + router.push( + `/webView/${encodeURIComponent( + links[0]?.url + + (links[0]?.action === "webViewWithOutHeaderInward" || + links[0]?.action === "webViewHeaderInward" + ? `?base=${encodeURIComponent(JSON.stringify(base))}` + : "") + )}` + ); + } + } + }} + > + +
+ + ), + [] + ); + return ( +
+ + {bannerList.map((item, index) => items(item, index))} + +
+ ); +} diff --git a/app/search/conponents/HostList/index.jsx b/app/search/conponents/HostList/index.jsx index b60b074..6c63a62 100644 --- a/app/search/conponents/HostList/index.jsx +++ b/app/search/conponents/HostList/index.jsx @@ -5,7 +5,10 @@ import { useRouter } from "next/navigation"; import requireAPI from "@/utils/requireAPI"; import OwnImage from "@/components/OwnImage"; import OwnIcon from "@/components/OwnIcon"; +import Banner from "../Banner"; +import baseRequest from "@/utils/baseRequest"; export default function HostList() { + const base = baseRequest(); const [hostList, setHostList] = useState([]); const [isLoading, setIsLoading] = useState(false); const router = useRouter(); @@ -65,10 +68,30 @@ export default function HostList() { >
{ - if (item.hyperlinks[0].action === "outward") { - window.open(item.hyperlinks[0].url); + const links = item?.hyperlinks; + 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}`); + if (links[0]?.action === "outward") { + // 在新的标签也打开 + window.open(links[0]?.url); + } else { + // alert(links[0]?.params); + // alert(encodeURIComponent(links[0]?.params)); + router.push( + `/webView/${encodeURIComponent( + links[0]?.url + + (links[0]?.action === "webViewWithOutHeaderInward" || + links[0]?.action === "webViewHeaderInward" + ? `?base=${encodeURIComponent( + JSON.stringify(base) + )}` + : "") + )}` + ); + } } }} className="grid grid-cols-[48px,calc(100vw-48px-2rem)]" @@ -94,34 +117,37 @@ export default function HostList() { {item.title} - -
- {item?.gender === 1 ? ( - - ) : ( - - )} - - {item.age} - -
-
- - - {item.city} - -
+ {item.mid > 0 && ( + <> +
+ {item?.gender === 1 ? ( + + ) : ( + + )} + + {item.age} + +
+
+ + + {item.city} + +
+ + )}

{item.text} @@ -132,6 +158,9 @@ export default function HostList() { ))} {/* Banner预留位置 */} +

+ +
); } 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 cc9bf30..853f57c 100644 --- a/app/space/person_space_introduce/[mid]/page.js +++ b/app/space/person_space_introduce/[mid]/page.js @@ -175,6 +175,7 @@ export default function PersonSpaceIntroduce() { @@ -255,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/space/setting/spacePaymentSetting/page.jsx b/app/space/setting/spacePaymentSetting/page.jsx index 89d1bbd..a72f6d2 100644 --- a/app/space/setting/spacePaymentSetting/page.jsx +++ b/app/space/setting/spacePaymentSetting/page.jsx @@ -1,7 +1,7 @@ "use client"; import React, { useState, useEffect, useRef, useMemo, Fragment } from "react"; -import { Switch, Space, Checkbox, Button, Toast, Radio } from "antd-mobile"; +import { Switch, Space, Checkbox, Button, Toast, Form } from "antd-mobile"; import { useRouter, useSearchParams } from "next/navigation"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { faAngleLeft } from "@fortawesome/free-solid-svg-icons"; @@ -10,11 +10,11 @@ import requireAPI from "@/utils/requireAPI"; import { get } from "@/utils/storeInfo"; import { getStreamerInfo } from "@/api/space"; const superSingles = [ - { key: 0, text: "永久" }, - { key: 1, text: "按月生效" }, - { key: 2, text: "按季度生效" }, - { key: 3, text: "按半年生效" }, - { key: 4, text: "按年生效" }, + { key: 0, index: 0, text: "永久" }, + { key: 4, index: 1, text: "按年生效" }, + { key: 3, index: 2, text: "按半年生效" }, + { key: 2, index: 3, text: "按季度生效" }, + { key: 1, index: 4, text: "按月生效" }, ]; // const superSingles = [ // { key: 0, text: "永久" }, @@ -25,62 +25,61 @@ const superSingles = [ // ]; const ListItemWithCheckbox = ({ superSingle, - formData, - setFormData, + superSinglesContr, + setSuperSinglesContr, superSingleCheckeds, + index, }) => { return (
  • {}}>
    e.stopPropagation()}> - { const newFormData = { ...formData }; newFormData.superSingle.forEach((el) => { el.enable = 0; }); - newFormData.superSingle[superSingle.key].enable = value; - // newFormData.superSingle[superSingle.key].price = 0; - // newFormData.superSingle[superSingle.key].wechatFree = false; + newFormData.superSingle[index].enable = value; + // newFormData.superSingle[index].price = 0; + // newFormData.superSingle[index].wechatFree = false; setFormData(newFormData); }} > {superSingle.text} - - {/* */} + { - const newFormData = { ...formData }; - newFormData.superSingle[superSingle.key].enable = value; - newFormData.superSingle[superSingle.key].price = 0; - newFormData.superSingle[superSingle.key].wechatFree = false; - setFormData(newFormData); + const newSuperSinglesContr = [...superSinglesContr]; + newSuperSinglesContr[index].enable = value; + // newSuperSinglesContr[index].price = 0; + // newSuperSinglesContr[index].wechatFree = false; + setSuperSinglesContr(newSuperSinglesContr); }} > {superSingle.text} - */} +
    ¥ { - const newFormData = { ...formData }; - newFormData.superSingle[superSingle.key].price = value; - setFormData(newFormData); + const newSuperSinglesContr = [...superSinglesContr]; + newSuperSinglesContr[index].price = value; + setSuperSinglesContr(newSuperSinglesContr); }} />
    @@ -88,126 +87,107 @@ const ListItemWithCheckbox = ({ | { - const newFormData = { ...formData }; - newFormData.superSingle[superSingle.key].wechatFree = value; - setFormData(newFormData); + const newSuperSinglesContr = [...superSinglesContr]; + newSuperSinglesContr[index].wechatFree = value; + setSuperSinglesContr(newSuperSinglesContr); }} >

    赠送微信

     - {/* { - const newFormData = { ...formData }; - newFormData.superSingle[superSingle.key].wechatFree = value; - setFormData(newFormData); - }} - > -

    赠送微信

    -     */}
    • ); }; -export default function spacePaymentSetting() { + +export default function SpacePaymentSetting() { + const [form] = Form.useForm(); const router = useRouter(); const searchParams = useSearchParams(); - const [formData, setFormData] = useState({ - spacePrice: "", - ironFanPrice: "", - openSuper: true, - superSingle: [ - { enable: false, price: 0, wechatFree: false }, - { enable: false, price: 0, wechatFree: false }, - { enable: false, price: 0, wechatFree: false }, - { enable: false, price: 0, wechatFree: false }, - { enable: false, price: 0, wechatFree: false }, - ], - }); + const [openSuper, setOpenSuper] = useState(false); const [spacePriceAble, setSpacePriceAble] = useState(false); const [tiefenPriceAble, setTiefenPriceAble] = useState(false); const [isSubmitting, setIsSubmitting] = useState(false); - // const [superSingleCheckeds, setSuperSingleCheckeds] = useState([]); - const [superSingleChecked, setSuperSingleChecked] = useState(null); + const [superSingleCheckeds, setSuperSingleCheckeds] = useState([]); + + const [superSinglesContr, setSuperSinglesContr] = useState([ + { enable: false, price: 0, wechatFree: false, key: 0 }, + { enable: false, price: 0, wechatFree: false, key: 4 }, + { enable: false, price: 0, wechatFree: false, key: 3 }, + { enable: false, price: 0, wechatFree: false, key: 2 }, + { enable: false, price: 0, wechatFree: false, key: 1 }, + ]); + const [spacePriceInfo, setSpacePriceInfo] = useState(null); useEffect(() => { const account = get("account"); getStreamerInfo(Number(account.mid)).then((res) => { - // 旧版本 - const haveChecked = res.is_superfanship_enabled; - if (haveChecked) { - setSuperSingleChecked(res.superfanship_valid_period); - } - const newFormData = { - spacePrice: `${res.admission_price / 100}`, - ironFanPrice: res.ironfanship_price / 100, - openSuper: !!res.is_superfanship_enabled, - superSingle: formData.superSingle.map((it, index) => { - if (index == res.superfanship_valid_period) { - return { - enable: !!res.is_superfanship_enabled, - price: res.superfanship_price / 100, - wechatFree: !!res.is_superfanship_give_wechat, - }; - } else { - return it; - } - }), - spaceIntro: res.profile, - }; - setFormData(newFormData); // 新版本 - // const haveChecked = res.superfan_price_list - // .map((it, index) => ({ ...it, index })) - // .filter((it) => it.enable); + const priceList = res.superfan_price_list ?? [ + { enable: false, price: 0, is_superfanship_give_wechat: false, key: 0 }, + { enable: false, price: 0, is_superfanship_give_wechat: false, key: 4 }, + { enable: false, price: 0, is_superfanship_give_wechat: false, key: 3 }, + { enable: false, price: 0, is_superfanship_give_wechat: false, key: 2 }, + { enable: false, price: 0, is_superfanship_give_wechat: false, key: 1 }, + ]; + const haveChecked = priceList + .map((it, index) => ({ ...it, index })) + .filter((it) => it.enable); // if (haveChecked.length > 0) { // setSuperSingleChecked(haveChecked[0].period); // } - // setSuperSingleCheckeds( - // res.superfan_price_list - // .map((it, index) => ({ ...it, index })) - // .filter((it) => it.enable) - // .map((it) => superSingles[it.index].key) - // ); - // setFormData({ - // spacePrice: res.admission_price / 100, - // ironFanPrice: res.ironfanship_price / 100, - // openSuper: !!res.is_superfanship_enabled, - // superSingle: res.superfan_price_list.map((it) => ({ - // enable: !!it.enable, - // price: it.price / 100, - // wechatFree: !!it.is_superfanship_give_wechat, - // })), - // spaceIntro: res.profile, - // }); + setSuperSingleCheckeds( + priceList + .map((it, index) => ({ ...it, index })) + .filter((it) => it.enable) + .map((it) => superSingles[it.index].index) + ); + setOpenSuper(!!res.is_superfanship_enabled); + setSuperSinglesContr( + priceList.map((it, index) => ({ + enable: !!it.enable, + price: it.price / 100, + wechatFree: !!it.is_superfanship_give_wechat, + key: index ? 5 - index : index, + })) + ); + setSpacePriceInfo(res); }); }, []); + + useEffect(() => { + if (!spacePriceInfo) return; + form.setFieldsValue({ + spacePrice: spacePriceInfo.admission_price / 100, + ironFanPrice: spacePriceInfo.ironfanship_price / 100, + }); + }, [form, spacePriceInfo]); const listItemWithCheckboxMemo = useMemo(() => { return superSingles.map((item, index) => ( )); - }, [formData, superSingleChecked]); - const handleSubmit = async () => { - const { spacePrice, ironFanPrice, openSuper, superSingle } = formData; + }, [superSingleCheckeds, superSinglesContr]); + const handleSubmit = async (newFormData) => { + const { spacePrice, ironFanPrice } = newFormData; + const superSingle = [...superSinglesContr]; const openSuperEveryFalse = Object.values(superSingle).every( (it) => !it.enable ); - if (!spacePrice || !ironFanPrice || (openSuper && openSuperEveryFalse)) { + if (openSuper && openSuperEveryFalse) { Toast.show({ icon: "fail", - content: "请完善内容后提交", + content: "请完善档位内容后提交", position: "top", }); return; @@ -233,57 +213,9 @@ export default function spacePaymentSetting() { } let isPrice = false; if (openSuper) { - // Object.values(superSingle).forEach((it) => { - // if (it.enable) { - // const superFanPrice = it.price; - // if (!superFanPrice) { - // Toast.show({ - // icon: "fail", - // content: "请填写超粉价格", - // position: "top", - // }); - // isPrice = true; - // return; - // } else { - // const _superFanPrice = parseInt(superFanPrice * 100, 10); - // if ( - // openSuper && - // (isNaN(_superFanPrice) || - // _superFanPrice < 100 || - // _superFanPrice > 388800) - // ) { - // isPrice = true; - // Toast.show({ - // icon: "fail", - // content: "请输入有效的超粉价格", - // position: "top", - // }); - // return; - // } - // if (openSuper && _superFanPrice <= _ironFanPrice) { - // isPrice = true; - // Toast.show({ - // icon: "fail", - // content: "请输入大于铁粉价格的超粉价格", - // position: "top", - // }); - // return; - // } - // } - // } - // }); - if (superSingleChecked == null) { - Toast.show({ - icon: "fail", - content: "请选择铁粉类型", - position: "top", - }); - } else { - const superChecked = superSingle.filter( - (_, index) => index == superSingleChecked - )[0]; - if (superChecked) { - const superFanPrice = superChecked.price; + Object.values(superSingle).forEach((it) => { + if (it.enable) { + const superFanPrice = it.price; if (!superFanPrice) { Toast.show({ icon: "fail", @@ -319,7 +251,55 @@ export default function spacePaymentSetting() { } } } - } + }); + // if (superSingleChecked == null) { + // Toast.show({ + // icon: "fail", + // content: "请选择铁粉类型", + // position: "top", + // }); + // } else { + // const superChecked = superSingle.filter( + // (_, index) => index == superSingleChecked + // )[0]; + // if (superChecked) { + // const superFanPrice = superChecked.price; + // if (!superFanPrice) { + // Toast.show({ + // icon: "fail", + // content: "请填写超粉价格", + // position: "top", + // }); + // isPrice = true; + // return; + // } else { + // const _superFanPrice = parseInt(superFanPrice * 100, 10); + // if ( + // openSuper && + // (isNaN(_superFanPrice) || + // _superFanPrice < 100 || + // _superFanPrice > 388800) + // ) { + // isPrice = true; + // Toast.show({ + // icon: "fail", + // content: "请输入有效的超粉价格", + // position: "top", + // }); + // return; + // } + // if (openSuper && _superFanPrice <= _ironFanPrice) { + // isPrice = true; + // Toast.show({ + // icon: "fail", + // content: "请输入大于铁粉价格的超粉价格", + // position: "top", + // }); + // return; + // } + // } + // } + // } } if (isPrice) return; // if ( @@ -340,20 +320,21 @@ export default function spacePaymentSetting() { if (isSubmitting) return; // 旧版本 - const superfanList = superSingle.map((it, index) => ({ - period: index, - enable: it.enable ? 1 : 0, - price: parseInt(it.price * 100, 10), - is_superfanship_give_wechat: it.wechatFree ? 1 : 0, - })); - const superfanObj = superfanList.filter((it) => it.enable)[0]; - // 新版本 - // const superfan_price_list = superSingle.map((it, index) => ({ + // const superfanList = superSingle.map((it, index) => ({ // period: index, // enable: it.enable ? 1 : 0, // price: parseInt(it.price * 100, 10), // is_superfanship_give_wechat: it.wechatFree ? 1 : 0, // })); + // const superfanObj = superfanList.filter((it) => it.enable)[0]; + // 新版本 + + const superfan_price_list = superSinglesContr.map((it, index) => ({ + period: it.key, + enable: it.enable ? 1 : 0, + price: parseInt(it.price * 100, 10), + is_superfanship_give_wechat: it.wechatFree ? 1 : 0, + })); setIsSubmitting(true); try { const body = { @@ -362,13 +343,12 @@ export default function spacePaymentSetting() { ironfanship_price: parseInt(ironFanPrice * 100, 10), is_superfanship_enabled: openSuper ? 1 : 0, // 旧版本 - superfanship_price: superfanObj.price, - superfanship_valid_period: superfanObj.period, - is_superfanship_give_wechat: superfanObj.is_superfanship_give_wechat, + // superfanship_price: superfanObj.price, + // superfanship_valid_period: superfanObj.period, + // is_superfanship_give_wechat: superfanObj.is_superfanship_give_wechat, // 新版本 - // superfan_price_list, + superfan_price_list, }; - // console.log("body", body); const _data = await requireAPI( "POST", "/api/zone/update", @@ -397,6 +377,7 @@ export default function spacePaymentSetting() { setIsSubmitting(false); } }; + const messageEle = (message) =>

    {message}

    ; return (
    {/* 头部标题 */} @@ -415,10 +396,35 @@ export default function spacePaymentSetting() {
    {/* 内容 */}
    -
    +
    { + Toast.show({ + icon: "fail", + content: "请检查所填内容", + position: "top", + }); + }} + onFinish={handleSubmit} + onValuesChange={(values) => { + console.log("onValuesChange:", values); + // setFormData(values); + }} + // hasFeedback={false} + validateMessages={{ + required: (name) => { + return

    {`请输入${name}`}

    ; + }, + }} + >

    - 解锁空间价格 + 解锁空间价格 *

    @@ -428,28 +434,31 @@ export default function spacePaymentSetting() {

    ¥ - {/* {!spacePriceAble ? ( - {formData.spacePrice} - ) : ( + { + // if (value.length === 0) { + // return Promise.reject(messageEle("请选择性别")); + // } + // }, + }, + ]} + > - setFormData((old) => ({ ...old, spacePrice: value })) - } + placeholder="0~3888，仅支持整数" + inputClassName="placeholder:text-[14px]" /> - )} */} - - setFormData((old) => ({ ...old, spacePrice: value })) - } - className={!formData.spacePrice ? "pb-1.5" : ""} - inputClassName="placeholder:text-[14px]" - /> +
    -
    -
    -
    -

    - 铁粉价格 - * -

    -

    - （累计消费达成后解锁铁粉权益） -

    -
    -
    -
    - ¥ - {/* {!tiefenPriceAble ? ( - {formData.ironFanPrice} - ) : ( - - )} */} - - setFormData((old) => ({ ...old, ironFanPrice: value })) - } - className={!formData.ironFanPrice ? "pb-1.5" : ""} - inputClassName="placeholder:text-[14px]" - /> + +

    + 铁粉价格 + * +

    +

    + （累计消费达成后解锁铁粉权益） +

    +
    + } + layout="vertical" + rules={[ + { + required: true, + message: messageEle("请填写铁粉价格"), + // validator: (rule, value) => { + // if (value.length === 0) { + // return Promise.reject(messageEle("请选择性别")); + // } + // }, + }, + ]} + > +
    +
    + ¥ + + + +
    +
    - -
    -
    -
    +

    - 超粉功能 - * + 超粉功能

    是否启用

    - { - setFormData((old) => ({ - ...old, - openSuper: value, - })); - }} - style={{ - "--checked-color": "#FF669E", - "--height": "24px", - "--width": "36px", - }} - /> + + setOpenSuper((old) => !old)} + style={{ + "--checked-color": "#FF669E", + "--height": "24px", + "--width": "36px", + }} + /> +
    -
    - {formData.openSuper && ( -
    -
    -

    - 超粉单次开通类型 - * -

    -

    - （付费后解锁对应期限超粉权益） -

    -
    - - { - setSuperSingleChecked(values); - // setSuperSingleCheckeds(values); - }} - > -
      {listItemWithCheckboxMemo}
    -     - {/* { - setSuperSingleCheckeds(values); - }} - > -
      {listItemWithCheckboxMemo}
    -     */} -     -
    - )} - -
    -
    + } + layout="vertical" + > + + {/* { + setSuperSingleChecked(values); + // setSuperSingleCheckeds(values); }} - onClick={handleSubmit} > - {isSubmitting ? "正在保存..." : "保存设置"} - -
    +
      {listItemWithCheckboxMemo}
    + */} + { + setSuperSingleCheckeds(values); + }} + > +
      {listItemWithCheckboxMemo}
    +     + + + )} + + + + +
    ); 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() { {/* 内容 */}