From 7113a8688dd3220e468b82128bd9e1b14fe636cd Mon Sep 17 00:00:00 2001 From: al Date: Wed, 31 Jul 2024 20:05:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=80=80=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/space.js | 1 + app/favicon.ico | Bin 4286 -> 5767 bytes .../selectUserProfileItem/page.js | 2 +- app/space/[id]/page.js | 3 +- app/space/setting/page.js | 4 +- app/space/setting/spaceRefund/page.jsx | 36 +++++++++--------- components/PostItem/index.js | 4 +- public/images/splash.png | Bin 0 -> 62025 bytes utils/requireAPI.js | 2 +- 9 files changed, 27 insertions(+), 25 deletions(-) create mode 100644 public/images/splash.png diff --git a/api/space.js b/api/space.js index 4a1669f..18ec8a7 100644 --- a/api/space.js +++ b/api/space.js @@ -79,6 +79,7 @@ export const getSpaceData = async (mid) => { } return { isRefunding: data.data.refund_status === 1, + refund_enable: data.data.refund_enable, noRole: data.data.list[0].visitor_role === 4, }; } catch (error) { diff --git a/app/favicon.ico b/app/favicon.ico index b195838a0da13c9164692ac423e03cbe8edace27..e4f50191e338b8ad8edb5237779677d50687044b 100644 GIT binary patch literal 5767 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 ZalD`n`g7LT*MGu*j;4V|`F*>P{{dPZ=JNmm literal 4286 zcmchbd2AI`6voG>0S$KHj~bA+G|^aU7bMa|%3_2V!Gy%ECPaBnjc7C|CTgGyAqbMT zXvLyvs9KcNvbY4FCDbKl(Nx41MYL9H7ZkM=ikdV*V2;1@9v6pU<~h&!oaTEo_s+fN z`{vwp&&;W1UBKV?@s|EtO(~X@W?5D?pv$@eXn&AHL@p`~l@v~!QdBl6zo0%p=bEj# z**V*CvnMqF8{{!pZK$p3*enf&3YEi4%hK|Saf}bAj!KeCFCLK)sO`K7IpNB(@^MZL z+RjSP=t>l?+iq5RW>+Q8s~XfFs>wYj(QW07u6L*~kv{i(4&~H%(75m$u**wP8UgTv_P zr{AgL2=|Vj(a{?klH#l8{i6omo4QB+_{WaALR#)VEc@Y79S0pcy5Z^ts^dps{GmG3 zABsg2pNOe}oD#_`e*Cj}hBoYchW*chuMY0@Gfs6J2D&asz#x6G{9tmL7ynq+FpM8} zW9MVg2KEBg(N`}r++)k{`)wK6VoT3rTht#t!1zOT`~tqmhF?6y;$JwmPFk4%A!r4= zfa>VpAY$9>T*qOb5;?vH4Uc;3SXET#xek8($?T&|CCBAG)_XfJI`*v)IepSW?7IB( zDDk<}mM;8Y{LzQzPWFY@-t^-y%$y@{!uvMZ2Et%Fc80oLgdWWkgYYe~B#+;47=;&+? z&VTZcXqW5_9k*)2ls9$eX6*V_z-zuX5-mDb5Fm&^c&E$gPe75=CPM=BA?twPE+W0K7D%6ZDZw~2P6FV z-?;I-d(oPxB%$BmmnUV&^;Z^4^2n5P_#@xn^P}~c)?IGhiEf+vLu(+d{r>m*%cBNV zO^K|9)VBJ%vi#ioQ+=QZxt;nuS`(StK)=sTo{Inccm1t#?p1%EvaA`smNlZ)vMyZ4 UzX}Yj|M)O=_1p?qFPzH#7fLLf@&Et; diff --git a/app/my/editUserProfile/selectUserProfileItem/page.js b/app/my/editUserProfile/selectUserProfileItem/page.js index ee77494..b7b30f8 100644 --- a/app/my/editUserProfile/selectUserProfileItem/page.js +++ b/app/my/editUserProfile/selectUserProfileItem/page.js @@ -81,7 +81,7 @@ export default function SelectUserProfileItem() { id="uploadAvatarBtn" style={{ display: "none" }} accept="image/png, image/jpeg" - capture="camera" + // capture="camera" onChange={uploadHead} /> diff --git a/app/space/[id]/page.js b/app/space/[id]/page.js index fd643e2..7f7aaf1 100644 --- a/app/space/[id]/page.js +++ b/app/space/[id]/page.js @@ -192,13 +192,14 @@ export default function PersonSpace() { encodeURIComponent( JSON.stringify({ mid: streamerInfo?.mid, - id: streamerInfo?.streamer_ext?.mid, + id: streamerInfo?.id, ct: streamerInfo?.streamer_ext?.ct, user_id: streamerInfo?.streamer_ext?.user_id, name: streamerInfo?.streamer_ext?.name, visitor_role: streamerInfo?.visitor_role, avatar: streamerInfo?.streamer_ext?.avatar?.images[0]?.urls[0], + admission_price:streamerInfo?.admission_price }) ) ) diff --git a/app/space/setting/page.js b/app/space/setting/page.js index 0747379..9ad12fd 100644 --- a/app/space/setting/page.js +++ b/app/space/setting/page.js @@ -21,7 +21,7 @@ export default function Setting() { let data = await JSON.parse(decodeURIComponent(searchParams.get("data"))); console.log("data",data) await getSpaceData(Number(data.mid)).then((res) => { - setStreamerInfo({ ...data, refund_enable: res?.refund_enable }); + setStreamerInfo({ ...data,refund_enable:res?.refund_enable }); }); } })(); @@ -173,7 +173,7 @@ export default function Setting() {
  • - router.push("setting/spaceRefund?id=" + streamerInfo.mid) + router.push("setting/spaceRefund?mid=" + streamerInfo.mid+"&id="+streamerInfo.id) } className="flex justify-between" > diff --git a/app/space/setting/spaceRefund/page.jsx b/app/space/setting/spaceRefund/page.jsx index 91cee05..c21dc83 100644 --- a/app/space/setting/spaceRefund/page.jsx +++ b/app/space/setting/spaceRefund/page.jsx @@ -3,7 +3,7 @@ import React, { useState, useEffect } from "react"; import { redirect, useRouter, useSearchParams } from "next/navigation"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { faAngleLeft } from "@fortawesome/free-solid-svg-icons"; -import { TextArea, Divider, Button, Toast } from "antd-mobile"; +import { TextArea, Divider, Button, Toast,DotLoading,Input } from "antd-mobile"; import requireAPI from "@/utils/requireAPI"; import { getSpaceData } from "@/api/space"; export default function SpaceRefund() { @@ -20,11 +20,12 @@ export default function SpaceRefund() { const router = useRouter(); const searchParams = useSearchParams(); useEffect(() => { - getSpaceData(Number(id)).then((res) => { + const mid = searchParams.get("mid"); + getSpaceData(Number(mid)).then((res) => { if (res) { const { isRefunding, noRole } = res; isRefunding && router.push("/"); - noRole && router.replace("person_space_introduce/" + id); + noRole && router.replace("person_space_introduce/" + mid); } }); getData(); @@ -33,17 +34,17 @@ export default function SpaceRefund() { const handleSubmit = async () => { if (!name || !contact || !remark) { Toast.show({ - type: "error", - text1: "请完善信息后提交", - topOffset: 60, + icon: "fail", + content: "请完善信息后提交", + position: "top", }); return; } if (remark.length < 15) { Toast.show({ - type: "error", - text1: "请填写15字以上退款原因", - topOffset: 60, + icon: "fail", + content: "请填写15字以上退款原因", + position: "top", }); return; } @@ -61,9 +62,9 @@ export default function SpaceRefund() { }); if (_data.ret === -1) { Toast.show({ - type: "error", - text1: _data.msg, - topOffset: 60, + icon: "fail", + content: _data.msg, + position: "top", }); return; } @@ -138,12 +139,12 @@ export default function SpaceRefund() { * 联系人

    -