From ef7dab789793492001975d6732757959f311ed30 Mon Sep 17 00:00:00 2001 From: al Date: Fri, 27 Dec 2024 12:51:47 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/my/page.js | 49 +++++++++++++++++++++++++++-- app/profile/[mid]/page.js | 2 ++ components/CheckVip/index.jsx | 11 ++----- components/ImagesMask/index.jsx | 52 +++++++++++++++++------------- components/UploadImgs/index.js | 2 +- utils/auth.js | 56 +++++++++++++++++++++++++++++---- utils/tools/handleFuns.js | 2 +- 7 files changed, 135 insertions(+), 39 deletions(-) diff --git a/app/my/page.js b/app/my/page.js index 5391481..e614305 100644 --- a/app/my/page.js +++ b/app/my/page.js @@ -9,6 +9,8 @@ import { get } from "@/utils/storeInfo"; import requireAPI from "@/utils/requireAPI"; import OwnIcon from "@/components/OwnIcon"; import OwnImage from "@/components/OwnImage"; +import { getVipPrice } from "@/utils/auth"; +import baseRequest from "@/utils/baseRequest"; const My = () => { const [userInfo, setUserInfo] = useState({}); const router = useRouter(); @@ -76,6 +78,7 @@ const My = () => { }); return; } + const vipPrice = await getVipPrice(); const isInJoinProgress = (statuses.data.basic_status === 0 || statuses.data.basic_status === 1 || @@ -208,7 +211,12 @@ const My = () => { // } return currentOld; }); - setUserInfo({ ...data.data, ...account.data.account, ...streamer.data }); + setUserInfo({ + ...data.data, + ...account.data.account, + ...streamer.data, + vipPrice, + }); }; const ItemEle = ({ url, @@ -406,7 +414,44 @@ const My = () => {

钻石

- + {/*会员功能*/} +
{ + const base = baseRequest(); + router.push( + `/webView/${encodeURIComponent( + `/vip?base=${encodeURIComponent(JSON.stringify(base))}` + )}` + ); + }} + className="flex flex-col p-2.5 rounded-2xl mt-3.5 bg-[#301024] mb-4" + > +
+
+
+ + + {userInfo?.is_a_member !== 1 + ? "开通会员保存图片" + : "尊贵的永久会员"} + +
+ + {userInfo?.is_a_member !== 1 + ? "限时优惠活动" + : "已解锁全部会员权益"} + +
+ {userInfo?.is_a_member !== 1 && ( +
+ + ¥{userInfo.vipPrice}/永久 + +
+ )} +
+
{/* 主播用户 */} {!!streamerNavigates.length && (
diff --git a/app/profile/[mid]/page.js b/app/profile/[mid]/page.js index 30cd25a..3100638 100644 --- a/app/profile/[mid]/page.js +++ b/app/profile/[mid]/page.js @@ -59,10 +59,12 @@ export default function PersonSpace() { const photosArr = [ ...data?.streamer_ext?.cover?.images?.map((item) => ({ url: item.urls[0], + id: item.id, type: "video", })), ...data?.streamer_ext?.album?.images.map((item) => ({ url: item.urls[0], + id: item.id, type: "img", })), ]; diff --git a/components/CheckVip/index.jsx b/components/CheckVip/index.jsx index 5b3fd89..694f9b4 100644 --- a/components/CheckVip/index.jsx +++ b/components/CheckVip/index.jsx @@ -1,7 +1,8 @@ "use client"; -import React, { useEffect } from "react"; +import React from "react"; import { Dialog } from "antd-mobile"; +import { checkRole } from "@/utils/auth"; // import { useRouter } from "next/navigation"; import baseRequest from "@/utils/baseRequest"; import { save } from "@/utils/storeInfo"; @@ -9,13 +10,8 @@ import { getUserInfo } from "@/api/public"; export default function CheckVip({ children, isVipToPassFun, router }) { const base = baseRequest(); - useEffect(() => {}, []); const handleCheck = async () => { - //向服务器请求新的账号信息并保存到本地 - const account = await getUserInfo(); - save("account", JSON.stringify(account)); - const isVip = account?.is_a_member; - + const isVip = await checkRole(); if (!isVip) { const showMobal = Dialog.show({ title: "是否开通会员", @@ -56,7 +52,6 @@ export default function CheckVip({ children, isVipToPassFun, router }) { style: { color: "#fff" }, onClick: () => { showMobal.close(); - console.log("showMobal", showMobal); router.push( `/webView/${encodeURIComponent( `/vip?base=${encodeURIComponent(JSON.stringify(base))}` diff --git a/components/ImagesMask/index.jsx b/components/ImagesMask/index.jsx index 904c6fa..d7b24dc 100644 --- a/components/ImagesMask/index.jsx +++ b/components/ImagesMask/index.jsx @@ -21,7 +21,7 @@ import OwnImage from "../OwnImage"; import { saveImage } from "@/utils/tools/handleFuns"; import requireAPI from "@/utils/requireAPI"; import CheckVip from "@/components/CheckVip"; -function ImagesMask({}, ref) { +function ImagesMask({ isEditing = false }, ref) { const [visible, setVisible] = useState(false); const [images, setImages] = useState([]); const [data, setData] = useState(null); @@ -32,6 +32,7 @@ function ImagesMask({}, ref) { return (
- getOriginImg(images[currentIndex]?.id)} - router={router} - > -
- 原图 -
- + {!isEditing && ( + <> + { + getOriginImg(images[currentIndex]?.id); + }} + router={router} + > +
+ 原图 +
+ - saveImage(images[currentIndex]?.url)} - router={router} - > -
- -
- + + saveImage(images[currentIndex]?.url) + } + router={router} + > +
+ +
+ + + )}
{ diff --git a/components/UploadImgs/index.js b/components/UploadImgs/index.js index 200dd1b..d54ee3e 100644 --- a/components/UploadImgs/index.js +++ b/components/UploadImgs/index.js @@ -322,7 +322,7 @@ export default function UploadImgs({ )}
- +
); } diff --git a/utils/auth.js b/utils/auth.js index 73a60bf..5bc3157 100644 --- a/utils/auth.js +++ b/utils/auth.js @@ -1,6 +1,6 @@ import { setCookie, deleteCookie, getCookie } from "cookies-next"; import requireAPI from "./requireAPI"; -import { get } from "./storeInfo"; +import { get, save } from "./storeInfo"; export async function checkAuth() { try { const data = await requireAPI("POST", `/api/login/validate`); @@ -24,9 +24,53 @@ export function signOut() { deleteCookie("mid"); } -export function checkRole() { - const account = get("account"); - const role = account?.role; - const isVip = account?.is_a_member; - return role !== 0 && isVip === 1; +export async function getUserInfo(mid) { + if (!mid) return; + try { + const data = await requireAPI("POST", `/api/account/list_by_mid`, { + body: { mid }, + }); + if (data.ret === 1) { + return data.data.account; + } + } catch (e) { + // console.log(e); + } +} +export async function getVipPrice() { + try { + const data = await requireAPI( + "POST", + `/api/vas/get_membership_product_list` + ); + if (data.ret === -1) { + Toast.show({ + icon: "fail", + content: data.msg, + position: "top", + }); + return; + } else { + return data.data.product.real_price / 100; + } + } catch (e) { + // console.log(e); + } +} + +export async function checkRole() { + const account = get("account"); + + const userInfo = await getUserInfo(account.mid); + console.log("account", account.mid); + if (userInfo) { + if (userInfo.is_a_member !== account) { + save("account", userInfo); + } + } + + const role = userInfo?.role; + const isVip = userInfo?.is_a_member; + console.log(role, isVip, userInfo); + return role !== 0 || isVip === 1; } diff --git a/utils/tools/handleFuns.js b/utils/tools/handleFuns.js index 4ef6eb7..3e16946 100644 --- a/utils/tools/handleFuns.js +++ b/utils/tools/handleFuns.js @@ -183,7 +183,7 @@ export const saveImage = async (url) => { .catch((error) => console.log(error)); }; export const saveFile = async (href) => { - const isVip = checkRole(); + const isVip = await checkRole(); if (!isVip) { // setIsVipModalVisible(true); Toast.show({ From bd7469f7fa25a0ac3cf08ec5ccb8e52727478f31 Mon Sep 17 00:00:00 2001 From: al Date: Fri, 27 Dec 2024 13:01:04 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E6=B8=85=E9=99=A4console=20log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- utils/auth.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/utils/auth.js b/utils/auth.js index 5bc3157..698e970 100644 --- a/utils/auth.js +++ b/utils/auth.js @@ -62,7 +62,6 @@ export async function checkRole() { const account = get("account"); const userInfo = await getUserInfo(account.mid); - console.log("account", account.mid); if (userInfo) { if (userInfo.is_a_member !== account) { save("account", userInfo); @@ -71,6 +70,5 @@ export async function checkRole() { const role = userInfo?.role; const isVip = userInfo?.is_a_member; - console.log(role, isVip, userInfo); return role !== 0 || isVip === 1; } From 3dc7204f8c1b0badcc5b414b874b0b4673459dfe Mon Sep 17 00:00:00 2001 From: al Date: Fri, 27 Dec 2024 18:38:46 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=81=B6=E5=8F=91?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/my/refund/refundList/components/PendingReview/index.jsx | 2 +- app/noticeDetail/components/MessageList/index.jsx | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/my/refund/refundList/components/PendingReview/index.jsx b/app/my/refund/refundList/components/PendingReview/index.jsx index 14fcc28..375b276 100644 --- a/app/my/refund/refundList/components/PendingReview/index.jsx +++ b/app/my/refund/refundList/components/PendingReview/index.jsx @@ -23,7 +23,7 @@ export default function Reviewed({ currentIndex }) { const account = get("account"); try { const body = { - b_mid: account.mid, + b_mid: account?.mid, audit_type: 1, offset: offset, limit: 10, diff --git a/app/noticeDetail/components/MessageList/index.jsx b/app/noticeDetail/components/MessageList/index.jsx index c89137c..c77c229 100644 --- a/app/noticeDetail/components/MessageList/index.jsx +++ b/app/noticeDetail/components/MessageList/index.jsx @@ -53,6 +53,7 @@ const MessageList = ({ mid, changeNoticeCount, refInstance, noticeCount }) => { ]); useImperativeHandle(refInstance, () => ({ readAllMsg: async (types) => { + if (!data.session_id) return; try { const body = { n_types: types, @@ -68,6 +69,7 @@ const MessageList = ({ mid, changeNoticeCount, refInstance, noticeCount }) => { }); return; } + const _data2 = await requireAPI( "POST", "/api/contact_customer_service/read_all", @@ -83,6 +85,7 @@ const MessageList = ({ mid, changeNoticeCount, refInstance, noticeCount }) => { }); return; } + changeNoticeCount(0); } catch (error) { console.error(error); From 293557d6dd2658669827a259d3bcf00d43613665 Mon Sep 17 00:00:00 2001 From: al Date: Sat, 28 Dec 2024 16:06:31 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/my/page.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/my/page.js b/app/my/page.js index e614305..0b079c3 100644 --- a/app/my/page.js +++ b/app/my/page.js @@ -118,13 +118,13 @@ const My = () => { subTitle: account.data.account.role == 3 ? "创作者功能" : "完善资料后解锁", }, - // { - // url: `my/refund/refundList`, - // iconUrl: "/icons/32DP/wallet.png", - // title: "退款审核", - // subTitle: - // account.data.account.role == 3 ? "创作者功能" : "完善资料后解锁", - // }, + { + url: `my/refund/refundList`, + iconUrl: "/icons/32DP/wallet.png", + title: "退款审核", + subTitle: + account.data.account.role == 3 ? "创作者功能" : "完善资料后解锁", + }, // ...currentOld, ]; if (isInJoinProgress) { From 0567162885bc7f15a6fdf8c67f988cc44471fc36 Mon Sep 17 00:00:00 2001 From: al Date: Fri, 3 Jan 2025 11:42:14 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E8=BF=90?= =?UTF-8?q?=E8=90=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/noticeDetail/page.js | 44 ++++++++++++++++++- .../setting/collaboratorSetting/page.jsx | 1 + 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/app/noticeDetail/page.js b/app/noticeDetail/page.js index 78e7609..f1fd82e 100644 --- a/app/noticeDetail/page.js +++ b/app/noticeDetail/page.js @@ -1,7 +1,7 @@ "use client"; import React, { useEffect, useRef, useState } from "react"; -import { Tabs, Swiper, Toast } from "antd-mobile"; +import { Tabs, Swiper, Toast, Dialog } from "antd-mobile"; import Link from "next/link"; import requireAPI from "@/utils/requireAPI"; import MessageList from "./components/MessageList"; @@ -112,8 +112,48 @@ export default function Space() { } } const handleReadAll = () => { - if (mesListEl.current) mesListEl.current.readAllMsg([0, 1, 2, 3]); + const showMobal = Dialog.show({ + title: "提示", + content:
确定要清楚所有未读消息吗？
, + bodyStyle: { + maxHeight: "none", + width: "80vw", + position: "fixed", + top: "200px", + left: "10vw", + "--text-color": "#fff", + color: "#fff", + }, + // cancelText:"确认", + // confirmText:"取消", + style: { + "--text-color": "#fff", + }, + closeOnAction: true, + actions: [ + [ + { + key: "close", + text: "取消", + bold: true, + style: { color: "#ffffff80" }, + onClick: () => { + showMobal?.close(); + }, + }, + { + key: "submit", + text: "确认", + style: { color: "#fff" }, + onClick: () => { + if (mesListEl.current) mesListEl.current.readAllMsg([0, 1, 2, 3]); + }, + }, + ], + ], + }); }; + return (
diff --git a/app/space/setting/collaboratorSetting/page.jsx b/app/space/setting/collaboratorSetting/page.jsx index 4e8e59b..f94cf7e 100644 --- a/app/space/setting/collaboratorSetting/page.jsx +++ b/app/space/setting/collaboratorSetting/page.jsx @@ -27,6 +27,7 @@ import { useRouter, useSearchParams } from "next/navigation"; import OwnInput from "@/components/OwnInput"; import { get } from "@/utils/storeInfo"; import OwnIcon from "@/components/OwnIcon"; +import baseRequest from "@/utils/baseRequest"; export default function CollaboratorSetting() { const [data, setData] = useState(null); const [selfMid, setSelfMid] = useState(); From 7cf4a739e8fd7c7c6a3736ee6d1ebc514ad73713 Mon Sep 17 00:00:00 2001 From: al Date: Fri, 3 Jan 2025 17:45:33 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/my/setting/aboutUs/page.js | 8 +++++-- app/my/setting/feedback/page.js | 39 ++++++++++++++++++++++++++++----- components/OwnIcon/index.jsx | 2 +- 3 files changed, 41 insertions(+), 8 deletions(-) diff --git a/app/my/setting/aboutUs/page.js b/app/my/setting/aboutUs/page.js index 82e6cd1..74d005b 100644 --- a/app/my/setting/aboutUs/page.js +++ b/app/my/setting/aboutUs/page.js @@ -28,8 +28,12 @@ export default function AboutUs() {

关于我们

{/* 内容 */} -
- +
+
    diff --git a/app/my/setting/feedback/page.js b/app/my/setting/feedback/page.js index 15e68bb..43e9a06 100644 --- a/app/my/setting/feedback/page.js +++ b/app/my/setting/feedback/page.js @@ -11,7 +11,8 @@ import { multiUploadImage } from "@/utils/upload"; import requireAPI from "@/utils/requireAPI"; export default function Feedback() { const [value, setValue] = useState(); - const [assets, setAssets] = useState([]); + const [imgAssets, setImgAssets] = useState([]); + const [videoAssets, setVideoAssets] = useState([]); const [isSubmitting, setIsSubmitting] = useState(false); const router = useRouter(); //提交反馈 @@ -24,13 +25,26 @@ export default function Feedback() { }); return; } - + if (imgAssets.length + videoAssets.length > 9) { + Toast.show({ + icon: "fail", + content: "最多上传9个图片或视频", + position: "top", + }); + return; + } //提交数据 setIsSubmitting(true); // const media = await multiUpload(assets); - const media = await multiUploadImage(assets, 1); + const { image_ids } = await multiUploadImage(imgAssets, 1); + const { video_ids } = await multiUploadImage(videoAssets, 2); + + const media = { image_ids, video_ids }; + // console.log("media",media) const account = await get("account"); + debugger; + try { const data = await requireAPI( "POST", @@ -93,9 +107,24 @@ export default function Feedback() { style={{ "--placeholder-color": "#FFFFFF80", "--font-size": "16px" }} />

    - 截图（最多9张） + 截图或录屏（最多9张）

    - +
    +

    图片

    + +
    +

    视频

    +
    + } + layout="vertical" + > + + {/* { + setSuperSingleChecked(values); + // setSuperSingleCheckeds(values); }} - onClick={handleSubmit} > - {isSubmitting ? "正在保存..." : "保存设置"} - -
+
    {listItemWithCheckboxMemo}
+ */} + { + setSuperSingleCheckeds(values); + }} + > +
    {listItemWithCheckboxMemo}
+ + + + )} + + + + +
); diff --git a/components/Websocket/index.jsx b/components/Websocket/index.jsx index 7fd4081..447410f 100644 --- a/components/Websocket/index.jsx +++ b/components/Websocket/index.jsx @@ -61,7 +61,7 @@ const WebSocketComponent = ({ getData, authInfo }) => { // 可以在这里发送消息到服务器，例如：socket.send('Hello Server!'); retryInterval = 1000; sendMessageQueue(); - socketRef.current.send(JSON.stringify({ t: 1 })); + socketRef.current?.send(JSON.stringify({ t: 1 })); }; // 处理收到的消息 socketRef.current.onmessage = (event) => { From 8a2ef9b2e5658ecf4942aed57600d9d1ca7d92d2 Mon Sep 17 00:00:00 2001 From: al Date: Wed, 8 Jan 2025 14:54:33 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/space/setting/spacePaymentSetting/page.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/space/setting/spacePaymentSetting/page.jsx b/app/space/setting/spacePaymentSetting/page.jsx index acb310b..a306ab0 100644 --- a/app/space/setting/spacePaymentSetting/page.jsx +++ b/app/space/setting/spacePaymentSetting/page.jsx @@ -103,7 +103,7 @@ const ListItemWithCheckbox = ({ ); }; -export default function spacePaymentSetting() { +export default function SpacePaymentSetting() { const [form] = Form.useForm(); const router = useRouter(); const searchParams = useSearchParams(); From 8024ac79948896605e5148450e4a140326014017 Mon Sep 17 00:00:00 2001 From: al Date: Fri, 10 Jan 2025 16:07:47 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/my/page.js | 18 ++++++++++-------- app/my/refund/refundDetail/[id]/page.jsx | 6 +++++- .../refundList/components/Reviewed/index.jsx | 6 +++--- app/search/conponents/HostList/index.jsx | 10 +++++++--- components/PostItem/index.js | 4 ++-- 5 files changed, 27 insertions(+), 17 deletions(-) diff --git a/app/my/page.js b/app/my/page.js index e614305..dc5fea0 100644 --- a/app/my/page.js +++ b/app/my/page.js @@ -5,7 +5,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { faAngleRight } from "@fortawesome/free-solid-svg-icons"; import { Avatar, Toast, Space } from "antd-mobile"; import { useRouter } from "next/navigation"; -import { get } from "@/utils/storeInfo"; +import { get, save } from "@/utils/storeInfo"; import requireAPI from "@/utils/requireAPI"; import OwnIcon from "@/components/OwnIcon"; import OwnImage from "@/components/OwnImage"; @@ -29,6 +29,7 @@ const My = () => { null, true ); + console.log("------", data); if (data.ret === -1) { Toast.show({ icon: "fail", @@ -65,6 +66,7 @@ const My = () => { }); return; } + save("account", account.data.account); const statuses = await requireAPI( "POST", "/api/streamer_auth_approval/get_statuses", @@ -118,13 +120,13 @@ const My = () => { subTitle: account.data.account.role == 3 ? "创作者功能" : "完善资料后解锁", }, - // { - // url: `my/refund/refundList`, - // iconUrl: "/icons/32DP/wallet.png", - // title: "退款审核", - // subTitle: - // account.data.account.role == 3 ? "创作者功能" : "完善资料后解锁", - // }, + { + url: `my/refund/refundList`, + iconUrl: "/icons/32DP/wallet.png", + title: "退款审核", + subTitle: + account.data.account.role == 3 ? "创作者功能" : "完善资料后解锁", + }, // ...currentOld, ]; if (isInJoinProgress) { diff --git a/app/my/refund/refundDetail/[id]/page.jsx b/app/my/refund/refundDetail/[id]/page.jsx index 7145d56..ac98970 100644 --- a/app/my/refund/refundDetail/[id]/page.jsx +++ b/app/my/refund/refundDetail/[id]/page.jsx @@ -142,7 +142,11 @@ export default function RefundDetail() {
diff --git a/app/my/refund/refundList/components/Reviewed/index.jsx b/app/my/refund/refundList/components/Reviewed/index.jsx index c647efc..d7e418a 100644 --- a/app/my/refund/refundList/components/Reviewed/index.jsx +++ b/app/my/refund/refundList/components/Reviewed/index.jsx @@ -66,7 +66,7 @@ export default function PendingReview({ currentIndex }) { roundedFull />
-
+
{item.account.name} @@ -99,9 +99,9 @@ export default function PendingReview({ currentIndex }) {
-
+
- + {item?.refunds_status === 4 ? "已自动退款" : item?.refunds_status === -1 diff --git a/app/search/conponents/HostList/index.jsx b/app/search/conponents/HostList/index.jsx index 7892663..b60b074 100644 --- a/app/search/conponents/HostList/index.jsx +++ b/app/search/conponents/HostList/index.jsx @@ -64,9 +64,13 @@ export default function HostList() { style={{ "--padding-left": 0 }} >
- router.push(`space/person_space_introduce/${item.mid}`) - } + onClick={() => { + if (item.hyperlinks[0].action === "outward") { + window.open(item.hyperlinks[0].url); + } else { + router.push(`space/person_space_introduce/${item.mid}`); + } + }} className="grid grid-cols-[48px,calc(100vw-48px-2rem)]" >
diff --git a/components/PostItem/index.js b/components/PostItem/index.js index 713b6c7..e64c918 100644 --- a/components/PostItem/index.js +++ b/components/PostItem/index.js @@ -284,6 +284,7 @@ export default function PostItem({ {type == "post" ? (
router.push("/space/person_space_introduce/" + data.mid) } @@ -324,8 +325,7 @@ export default function PostItem({ /> ) : ( - data?.streamer_ext?.zones?.length !== 0 && - !isOwn && ( + data?.streamer_ext?.zones?.length !== 0 && (
查看TA的空间 Date: Fri, 10 Jan 2025 16:24:13 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E8=B6=85=E7=B2=89?= =?UTF-8?q?=E6=A1=A3=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../setting/spacePaymentSetting/page.jsx | 631 +++++++++--------- 1 file changed, 305 insertions(+), 326 deletions(-) diff --git a/app/space/setting/spacePaymentSetting/page.jsx b/app/space/setting/spacePaymentSetting/page.jsx index a306ab0..89d1bbd 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, Form } from "antd-mobile"; +import { Switch, Space, Checkbox, Button, Toast, Radio } 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, index: 0, text: "永久" }, - { key: 4, index: 1, text: "按年生效" }, - { key: 3, index: 2, text: "按半年生效" }, - { key: 2, index: 3, text: "按季度生效" }, - { key: 1, index: 4, text: "按月生效" }, + { key: 0, text: "永久" }, + { key: 1, text: "按月生效" }, + { key: 2, text: "按季度生效" }, + { key: 3, text: "按半年生效" }, + { key: 4, text: "按年生效" }, ]; // const superSingles = [ // { key: 0, text: "永久" }, @@ -25,61 +25,62 @@ const superSingles = [ // ]; const ListItemWithCheckbox = ({ superSingle, - superSinglesContr, - setSuperSinglesContr, + formData, + setFormData, superSingleCheckeds, - index, }) => { return (
  • {}}>
    e.stopPropagation()}> - {/* { const newFormData = { ...formData }; newFormData.superSingle.forEach((el) => { el.enable = 0; }); - newFormData.superSingle[index].enable = value; - // newFormData.superSingle[index].price = 0; - // newFormData.superSingle[index].wechatFree = false; + newFormData.superSingle[superSingle.key].enable = value; + // newFormData.superSingle[superSingle.key].price = 0; + // newFormData.superSingle[superSingle.key].wechatFree = false; setFormData(newFormData); }} > {superSingle.text} - */} - + {/* { - const newSuperSinglesContr = [...superSinglesContr]; - newSuperSinglesContr[index].enable = value; - newSuperSinglesContr[index].price = 0; - newSuperSinglesContr[index].wechatFree = false; - setSuperSinglesContr(newSuperSinglesContr); + const newFormData = { ...formData }; + newFormData.superSingle[superSingle.key].enable = value; + newFormData.superSingle[superSingle.key].price = 0; + newFormData.superSingle[superSingle.key].wechatFree = false; + setFormData(newFormData); }} > {superSingle.text} - + */}
    ¥ { - const newSuperSinglesContr = [...superSinglesContr]; - newSuperSinglesContr[index].price = value; - setSuperSinglesContr(newSuperSinglesContr); + const newFormData = { ...formData }; + newFormData.superSingle[superSingle.key].price = value; + setFormData(newFormData); }} />
    @@ -87,107 +88,126 @@ const ListItemWithCheckbox = ({ | { - const newSuperSinglesContr = [...superSinglesContr]; - newSuperSinglesContr[index].wechatFree = value; - setSuperSinglesContr(newSuperSinglesContr); + const newFormData = { ...formData }; + newFormData.superSingle[superSingle.key].wechatFree = value; + setFormData(newFormData); }} >

    赠送微信

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

    赠送微信

    +     */}
    • ); }; - -export default function SpacePaymentSetting() { - const [form] = Form.useForm(); +export default function spacePaymentSetting() { const router = useRouter(); const searchParams = useSearchParams(); - const [openSuper, setOpenSuper] = useState(false); + 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 [spacePriceAble, setSpacePriceAble] = useState(false); const [tiefenPriceAble, setTiefenPriceAble] = useState(false); const [isSubmitting, setIsSubmitting] = useState(false); - 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); + // const [superSingleCheckeds, setSuperSingleCheckeds] = useState([]); + const [superSingleChecked, setSuperSingleChecked] = 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 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); + // const haveChecked = res.superfan_price_list + // .map((it, index) => ({ ...it, index })) + // .filter((it) => it.enable); // if (haveChecked.length > 0) { // setSuperSingleChecked(haveChecked[0].period); // } - 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); + // 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, + // }); }); }, []); - - 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) => ( )); - }, [superSingleCheckeds, superSinglesContr]); - const handleSubmit = async (newFormData) => { - const { spacePrice, ironFanPrice } = newFormData; - const superSingle = [...superSinglesContr]; + }, [formData, superSingleChecked]); + const handleSubmit = async () => { + const { spacePrice, ironFanPrice, openSuper, superSingle } = formData; const openSuperEveryFalse = Object.values(superSingle).every( (it) => !it.enable ); - if (openSuper && openSuperEveryFalse) { + if (!spacePrice || !ironFanPrice || (openSuper && openSuperEveryFalse)) { Toast.show({ icon: "fail", - content: "请完善档位内容后提交", + content: "请完善内容后提交", position: "top", }); return; @@ -213,57 +233,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", @@ -299,7 +271,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 ( @@ -320,21 +340,20 @@ export default function SpacePaymentSetting() { if (isSubmitting) return; // 旧版本 - // const superfanList = 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 = 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 = { @@ -343,12 +362,13 @@ 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", @@ -377,7 +397,6 @@ export default function SpacePaymentSetting() { setIsSubmitting(false); } }; - const messageEle = (message) =>

    {message}

    ; return (
    {/* 头部标题 */} @@ -396,35 +415,10 @@ 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}`}

    ; - }, - }} - > +

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

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

    ¥ - { - // if (value.length === 0) { - // return Promise.reject(messageEle("请选择性别")); - // } - // }, - }, - ]} - > + {/* {!spacePriceAble ? ( + {formData.spacePrice} + ) : ( + setFormData((old) => ({ ...old, spacePrice: value })) + } /> - + )} */} + + setFormData((old) => ({ ...old, spacePrice: value })) + } + className={!formData.spacePrice ? "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("请选择性别")); - // } - // }, - }, - ]} - > -
    -
    - ¥ - - - -
    - +
    +
    +
    +

    + 铁粉价格 + * +

    +

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

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

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

    是否启用

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

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

    -

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

    -
    - } - layout="vertical" - > - - {/* { - setSuperSingleChecked(values); - // setSuperSingleCheckeds(values); - }} - > -
      {listItemWithCheckboxMemo}
    -     */} - { - setSuperSingleCheckeds(values); - }} - > -
      {listItemWithCheckboxMemo}
    -     -     - - )} +
    + {formData.openSuper && ( +
    +
    +

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

    +

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

    +
    + + { + setSuperSingleChecked(values); + // setSuperSingleCheckeds(values); + }} + > +
      {listItemWithCheckboxMemo}
    +     + {/* { + setSuperSingleCheckeds(values); + }} + > +
      {listItemWithCheckboxMemo}
    +     */} +     +
    + )} - - - -
    +
    + +
    ); From 07083f1cb4d38db395f81f9b71db9f6a295ad81f Mon Sep 17 00:00:00 2001 From: al Date: Fri, 10 Jan 2025 17:23:20 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/my/streamerVerification/joinGuild/page.jsx | 2 ++ app/my/streamerVerification/joinStreamer/page.jsx | 2 ++ app/space/setting/spaceRefund/page.jsx | 6 ++++-- components/BottomNav/index.js | 2 +- store/reducers.js | 1 - utils/tools/handleFuns.js | 4 ++-- 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/my/streamerVerification/joinGuild/page.jsx b/app/my/streamerVerification/joinGuild/page.jsx index 994f7df..fbf3a05 100644 --- a/app/my/streamerVerification/joinGuild/page.jsx +++ b/app/my/streamerVerification/joinGuild/page.jsx @@ -136,6 +136,7 @@ export default function JoinGuild() {
    @@ -155,6 +156,7 @@ export default function JoinGuild() {
    diff --git a/app/my/streamerVerification/joinStreamer/page.jsx b/app/my/streamerVerification/joinStreamer/page.jsx index 04dcf9a..d36cdcf 100644 --- a/app/my/streamerVerification/joinStreamer/page.jsx +++ b/app/my/streamerVerification/joinStreamer/page.jsx @@ -128,6 +128,7 @@ export default function JoinStreamer() { setFormData((old) => ({ ...old, name: value })) @@ -168,6 +169,7 @@ export default function JoinStreamer() { setFormData((old) => ({ ...old, contact: value })) diff --git a/app/space/setting/spaceRefund/page.jsx b/app/space/setting/spaceRefund/page.jsx index 6c237ce..7aa268a 100644 --- a/app/space/setting/spaceRefund/page.jsx +++ b/app/space/setting/spaceRefund/page.jsx @@ -59,7 +59,7 @@ export default function SpaceRefund() { if (isSubmitting) return; setIsSubmitting(true); try { - const _data = await requireAPI("POST", "/api/zone/refund", { + const _data = await requireAPI("POST", "/api/zone/refund_v2", { body: { zid: Number(searchParams.get("id")), contact_name: name, @@ -166,6 +166,7 @@ export default function SpaceRefund() { 联系方式

    setContact(value)} value={contact} @@ -184,6 +185,7 @@ export default function SpaceRefund() {