wishpal_ironfan
/
tiefen_space_h5
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复开通空间问题

This commit is contained in:
al 2024-11-01 15:46:26 +08:00
parent 90c9cac703
commit 7883872ee4
5 changed files with 291 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
app/my/createProfile/page.jsx
View File

@ -1,7 +1,15 @@
"use client"; "use client";
import React, { useState, useRef, useMemo, Fragment } from "react"; import React, { useState, useRef, useMemo, Fragment } from "react";
import { Switch, Space, Checkbox, Button, Toast, TextArea } from "antd-mobile"; import {
Switch,
Space,
Checkbox,
Button,
Toast,
TextArea,
Radio,
} from "antd-mobile";
import { useRouter, useSearchParams } from "next/navigation"; import { useRouter, useSearchParams } from "next/navigation";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faAngleLeft } from "@fortawesome/free-solid-svg-icons"; import { faAngleLeft } from "@fortawesome/free-solid-svg-icons";
@ -32,23 +40,46 @@ const ListItemWithCheckbox = ({
}} }}
> >
<div onClick={(e) => e.stopPropagation()}> <div onClick={(e) => e.stopPropagation()}>
<Checkbox <Radio
value={superSingle.key}
ref={checkboxRef}
onChange={(value) => {
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;
setFormData(newFormData);
}}
>
{superSingle.text}
</Radio>
{/* <Checkbox
value={superSingle.key} value={superSingle.key}
ref={checkboxRef} ref={checkboxRef}
onChange={(value) => { onChange={(value) => {
const newFormData = { ...formData }; const newFormData = { ...formData };
newFormData.superSingle[superSingle.key].enable = value; newFormData.superSingle[superSingle.key].enable = value;
newFormData.superSingle[superSingle.key].price = 0;
newFormData.superSingle[superSingle.key].wechatFree = false;
setFormData(newFormData); setFormData(newFormData);
}} }}
> >
{superSingle.text} {superSingle.text}
</Checkbox> </Checkbox> */}
<div <div
className={`mt-2 px-4 h-12 py-3 rounded-[0.8rem] bg-[#FFFFFF1a] flex justify-between items-center ${ className={`mt-2 px-4 h-12 py-3 rounded-[0.8rem] bg-[#FFFFFF1a] flex justify-between items-center ${
!superSingleCheckeds.includes(superSingle.key) superSingleCheckeds != superSingle.key
? "mt-0 px-0 py-0 hidden" ? "mt-0 px-0 py-0 hidden"
: "" : ""
}`} }`}
// className={`mt-2 px-4 h-12 py-3 rounded-[0.8rem] bg-[#FFFFFF1a] flex justify-between items-center ${
// !superSingleCheckeds.includes(superSingle.key)
// ? "mt-0 px-0 py-0 hidden"
// : ""
// }`}
> >
<div className="flex items-center"> <div className="flex items-center">
<span className="mr-1 text-[#ffffffae] text-sm">¥</span> <span className="mr-1 text-[#ffffffae] text-sm">¥</span>
@ -65,7 +96,7 @@ const ListItemWithCheckbox = ({
</div> </div>
<div className="flex items-center"> <div className="flex items-center">
<span className="text-[#ffffff26] mr-2">|</span> <span className="text-[#ffffff26] mr-2">|</span>
<Checkbox <Radio
block block
checked={formData.superSingle[superSingle.key].wechatFree} checked={formData.superSingle[superSingle.key].wechatFree}
onChange={(value) => { onChange={(value) => {
@ -75,7 +106,18 @@ const ListItemWithCheckbox = ({
}} }}
> >
<p className="text-sm whitespace-nowrap">赠送微信</p> <p className="text-sm whitespace-nowrap">赠送微信</p>
</Checkbox> </Radio>
{/* <Checkbox
block
checked={formData.superSingle[superSingle.key].wechatFree}
onChange={(value) => {
const newFormData = { ...formData };
newFormData.superSingle[superSingle.key].wechatFree = value;
setFormData(newFormData);
}}
>
<p className="text-sm whitespace-nowrap">赠送微信</p>
</Checkbox> */}
</div> </div>
</div> </div>
</div> </div>
@ -101,7 +143,8 @@ export default function CreateProfile() {
const [spacePriceAble, setSpacePriceAble] = useState(false); const [spacePriceAble, setSpacePriceAble] = useState(false);
const [tiefenPriceAble, setTiefenPriceAble] = useState(false); const [tiefenPriceAble, setTiefenPriceAble] = useState(false);
const [isSubmitting, setIsSubmitting] = useState(false); const [isSubmitting, setIsSubmitting] = useState(false);
const [superSingleCheckeds, setSuperSingleCheckeds] = useState([]); // const [superSingleCheckeds, setSuperSingleCheckeds] = useState([]);
const [superSingleChecked, setSuperSingleChecked] = useState(null);
const listItemWithCheckboxMemo = useMemo(() => { const listItemWithCheckboxMemo = useMemo(() => {
return superSingles.map((item) => ( return superSingles.map((item) => (
@ -110,11 +153,12 @@ export default function CreateProfile() {
superSingle={item} superSingle={item}
formData={formData} formData={formData}
setFormData={setFormData} setFormData={setFormData}
superSingleCheckeds={superSingleCheckeds} superSingleCheckeds={superSingleChecked}
// superSingleCheckeds={superSingleCheckeds}
/> />
</Fragment> </Fragment>
)); ));
}, [formData, superSingleCheckeds]); }, [formData, superSingleChecked]);
const handleSubmit = async () => { const handleSubmit = async () => {
const { spaceIntro, spacePrice, ironFanPrice, openSuper, superSingle } = const { spaceIntro, spacePrice, ironFanPrice, openSuper, superSingle } =
@ -155,16 +199,65 @@ export default function CreateProfile() {
} }
let isPrice = false; let isPrice = false;
if (openSuper) { if (openSuper) {
Object.values(superSingle).forEach((it) => { // Object.values(superSingle).forEach((it) => {
if (it.enable) { // if (it.enable) {
const superFanPrice = it.price; // 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;
if (!superFanPrice) { if (!superFanPrice) {
isPrice = true;
Toast.show({ Toast.show({
icon: "fail", icon: "fail",
content: "请填写超粉价格", content: "请填写超粉价格",
position: "top", position: "top",
}); });
isPrice = true;
return;
} else { } else {
const _superFanPrice = parseInt(superFanPrice * 100, 10); const _superFanPrice = parseInt(superFanPrice * 100, 10);
if ( if (
@ -192,8 +285,8 @@ export default function CreateProfile() {
} }
} }
} }
});
} }
if (isPrice) return;
if (isSubmitting) return; if (isSubmitting) return;
const superfan_price_list = superSingle.map((it, index) => ({ const superfan_price_list = superSingle.map((it, index) => ({
period: index, period: index,
@ -229,7 +322,7 @@ export default function CreateProfile() {
} }
Toast.show({ Toast.show({
icon: "success", icon: "success",
content: "修改成功，请重进空间刷新查看", content: "开通空间成功！空间简介将在审核完成后生效。",
position: "top", position: "top",
}); });
router.back(); router.back();
@ -238,6 +331,7 @@ export default function CreateProfile() {
} finally { } finally {
setIsSubmitting(false); setIsSubmitting(false);
} }
}
}; };
return ( return (
<div> <div>
@ -384,13 +478,24 @@ export default function CreateProfile() {
</p> </p>
</div> </div>
<Space direction="vertical" block> <Space direction="vertical" block>
<Checkbox.Group <Radio.Group
value={superSingleChecked}
// value={superSingleCheckeds}
onChange={(values) => {
setSuperSingleChecked(values);
// setSuperSingleCheckeds(values);
}}
>
<ul>{listItemWithCheckboxMemo}</ul>
</Radio.Group>
{/* <Checkbox.Group
value={superSingleCheckeds}
onChange={(values) => { onChange={(values) => {
setSuperSingleCheckeds(values); setSuperSingleCheckeds(values);
}} }}
> >
<ul>{listItemWithCheckboxMemo}</ul> <ul>{listItemWithCheckboxMemo}</ul>
</Checkbox.Group> </Checkbox.Group> */}
</Space> </Space>
</div> </div>
)} )}

10
app/my/editprofile/editHome/page.jsx
View File

@ -88,7 +88,7 @@ export default function EditHome() {
info: "", info: "",
autoResponse: "", autoResponse: "",
wechat: "", wechat: "",
wechatAddWay: 0, wechatAddWay: 1,
}); });
const [spacePriceAble, setSpacePriceAble] = useState(false); const [spacePriceAble, setSpacePriceAble] = useState(false);
// const [wechatAddWay, setWechatAddWay] = useState("0"); // const [wechatAddWay, setWechatAddWay] = useState("0");
@ -137,8 +137,8 @@ export default function EditHome() {
} }
}, [data]); }, [data]);
const superSingles = [ const superSingles = [
{ key: 0, text: "主动添加对方" }, { key: 1, text: "主动添加对方" },
{ key: 1, text: "向对方展示微信" }, { key: 0, text: "向对方展示微信" },
]; ];
const [fieldNamesOptions, setFieldNamesOptions] = useState([]); const [fieldNamesOptions, setFieldNamesOptions] = useState([]);
const ListItemWithCheckbox = ({ superSingle }) => { const ListItemWithCheckbox = ({ superSingle }) => {
@ -224,7 +224,7 @@ export default function EditHome() {
}); });
return; return;
} }
if (values.wechatAddWay === "1" && !values.wechat) { if (values.wechatAddWay === "0" && !values.wechat) {
Toast.show({ Toast.show({
icon: "fail", icon: "fail",
content: "请填写微信号", content: "请填写微信号",
@ -595,7 +595,7 @@ export default function EditHome() {
))} ))}
</ul> </ul>
</Radio.Group> </Radio.Group>
{formData.wechatAddWay == 1 && ( {formData.wechatAddWay == 0 && (
<div className="mt-2 px-4 h-12 py-3 rounded-[0.8rem] bg-[#FFFFFF1a] flex justify-between items-center"> <div className="mt-2 px-4 h-12 py-3 rounded-[0.8rem] bg-[#FFFFFF1a] flex justify-between items-center">
<div> <div>
<OwnInput <OwnInput

2
app/my/editprofile/page.jsx
View File

@ -26,7 +26,7 @@ export default function Editprofile() {
}} }}
/> />
</div> </div>
<p className="text-base text-center leading-9">编辑资源</p> <p className="text-base text-center leading-9">编辑资料</p>
</div> </div>
{/* 内容 */} {/* 内容 */}
<div className="mt-16 pt-6 p-4 grid grid-cols-2 gap-6"> <div className="mt-16 pt-6 p-4 grid grid-cols-2 gap-6">

12
app/my/streamerVerification/completeStreamerInformation/page.jsx
View File

@ -103,7 +103,7 @@ export default function CompleteStreamerInformation() {
info: "", info: "",
autoResponse: "", autoResponse: "",
wechat: "", wechat: "",
wechatAddWay: 0, wechatAddWay: 1,
fans: 0, fans: 0,
imageAssets: [], imageAssets: [],
displayImage: [], displayImage: [],
@ -156,7 +156,7 @@ export default function CompleteStreamerInformation() {
setFormData((old) => ({ setFormData((old) => ({
...old, ...old,
fans, fans,
wechatPrice: wechat_coin_price, wechatPrice: wechat_coin_price / 10,
gender: [`${gender}`], gender: [`${gender}`],
age: [`${age}`], age: [`${age}`],
height: [`${height}`], height: [`${height}`],
@ -190,8 +190,8 @@ export default function CompleteStreamerInformation() {
setFormData((old) => ({ ...old, imageAssets: oldPhotos })); setFormData((old) => ({ ...old, imageAssets: oldPhotos }));
}, [oldPhotos]); }, [oldPhotos]);
const superSingles = [ const superSingles = [
{ key: 0, text: "主动添加对方" }, { key: 1, text: "主动添加对方" },
{ key: 1, text: "向对方展示微信" }, { key: 0, text: "向对方展示微信" },
]; ];
const [fieldNamesOptions, setFieldNamesOptions] = useState([]); const [fieldNamesOptions, setFieldNamesOptions] = useState([]);
const ListItemWithCheckbox = ({ superSingle }) => { const ListItemWithCheckbox = ({ superSingle }) => {
@ -360,7 +360,7 @@ export default function CompleteStreamerInformation() {
}); });
return; return;
} }
if (wechatAddWay === 1 && !wechat) { if (wechatAddWay === 0 && !wechat) {
Toast.show({ Toast.show({
icon: "fail", icon: "fail",
content: "请填写微信号", content: "请填写微信号",
@ -883,7 +883,7 @@ export default function CompleteStreamerInformation() {
))} ))}
</ul> </ul>
</Radio.Group> </Radio.Group>
{formData.wechatAddWay == 1 && ( {formData.wechatAddWay == 0 && (
<div className="mt-2 px-4 h-12 py-3 rounded-[0.8rem] bg-[#FFFFFF1a] flex justify-between items-center"> <div className="mt-2 px-4 h-12 py-3 rounded-[0.8rem] bg-[#FFFFFF1a] flex justify-between items-center">
<div> <div>
<OwnInput <OwnInput

139
app/space/setting/spacePaymentSetting/page.jsx
View File

@ -1,7 +1,7 @@
"use client"; "use client";
import React, { useState, useEffect, useRef, useMemo, Fragment } from "react"; import React, { useState, useEffect, useRef, useMemo, Fragment } from "react";
import { Switch, Space, Checkbox, Button, Toast } from "antd-mobile"; import { Switch, Space, Checkbox, Button, Toast, Radio } from "antd-mobile";
import { useRouter, useSearchParams } from "next/navigation"; import { useRouter, useSearchParams } from "next/navigation";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faAngleLeft } from "@fortawesome/free-solid-svg-icons"; import { faAngleLeft } from "@fortawesome/free-solid-svg-icons";
@ -31,7 +31,23 @@ const ListItemWithCheckbox = ({
}} }}
> >
<div onClick={(e) => e.stopPropagation()}> <div onClick={(e) => e.stopPropagation()}>
<Checkbox <Radio
value={superSingle.key}
ref={checkboxRef}
onChange={(value) => {
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;
setFormData(newFormData);
}}
>
{superSingle.text}
</Radio>
{/* <Checkbox
value={superSingle.key} value={superSingle.key}
ref={checkboxRef} ref={checkboxRef}
onChange={(value) => { onChange={(value) => {
@ -43,13 +59,18 @@ const ListItemWithCheckbox = ({
}} }}
> >
{superSingle.text} {superSingle.text}
</Checkbox> </Checkbox> */}
<div <div
className={`mt-2 px-4 h-12 py-3 rounded-[0.8rem] bg-[#FFFFFF1a] flex justify-between items-center ${ className={`mt-2 px-4 h-12 py-3 rounded-[0.8rem] bg-[#FFFFFF1a] flex justify-between items-center ${
!superSingleCheckeds.includes(superSingle.key) superSingleCheckeds != superSingle.key
? "mt-0 px-0 py-0 hidden" ? "mt-0 px-0 py-0 hidden"
: "" : ""
}`} }`}
// className={`mt-2 px-4 h-12 py-3 rounded-[0.8rem] bg-[#FFFFFF1a] flex justify-between items-center ${
// !superSingleCheckeds.includes(superSingle.key)
// ? "mt-0 px-0 py-0 hidden"
// : ""
// }`}
> >
<div className="flex items-center"> <div className="flex items-center">
<span className="mr-1 text-[#ffffffae] text-sm">¥</span> <span className="mr-1 text-[#ffffffae] text-sm">¥</span>
@ -66,7 +87,7 @@ const ListItemWithCheckbox = ({
</div> </div>
<div className="flex items-center"> <div className="flex items-center">
<span className="text-[#ffffff26] mr-2">|</span> <span className="text-[#ffffff26] mr-2">|</span>
<Checkbox <Radio
block block
checked={formData.superSingle[superSingle.key].wechatFree} checked={formData.superSingle[superSingle.key].wechatFree}
onChange={(value) => { onChange={(value) => {
@ -76,7 +97,18 @@ const ListItemWithCheckbox = ({
}} }}
> >
<p className="text-sm whitespace-nowrap">赠送微信</p> <p className="text-sm whitespace-nowrap">赠送微信</p>
</Checkbox> </Radio>
{/* <Checkbox
block
checked={formData.superSingle[superSingle.key].wechatFree}
onChange={(value) => {
const newFormData = { ...formData };
newFormData.superSingle[superSingle.key].wechatFree = value;
setFormData(newFormData);
}}
>
<p className="text-sm whitespace-nowrap">赠送微信</p>
</Checkbox> */}
</div> </div>
</div> </div>
</div> </div>
@ -101,16 +133,23 @@ export default function spacePaymentSetting() {
const [spacePriceAble, setSpacePriceAble] = useState(false); const [spacePriceAble, setSpacePriceAble] = useState(false);
const [tiefenPriceAble, setTiefenPriceAble] = useState(false); const [tiefenPriceAble, setTiefenPriceAble] = useState(false);
const [isSubmitting, setIsSubmitting] = useState(false); const [isSubmitting, setIsSubmitting] = useState(false);
const [superSingleCheckeds, setSuperSingleCheckeds] = useState([]); // const [superSingleCheckeds, setSuperSingleCheckeds] = useState([]);
const [superSingleChecked, setSuperSingleChecked] = useState(null);
useEffect(() => { useEffect(() => {
const account = get("account"); const account = get("account");
getStreamerInfo(Number(account.mid)).then((res) => { getStreamerInfo(Number(account.mid)).then((res) => {
setSuperSingleCheckeds( const haveChecked = res.superfan_price_list
res.superfan_price_list
.map((it, index) => ({ ...it, index })) .map((it, index) => ({ ...it, index }))
.filter((it) => it.enable) .filter((it) => it.enable);
.map((it) => superSingles[it.index].key) 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({ setFormData({
spacePrice: res.admission_price / 100, spacePrice: res.admission_price / 100,
ironFanPrice: res.ironfanship_price / 100, ironFanPrice: res.ironfanship_price / 100,
@ -131,11 +170,12 @@ export default function spacePaymentSetting() {
superSingle={item} superSingle={item}
formData={formData} formData={formData}
setFormData={setFormData} setFormData={setFormData}
superSingleCheckeds={superSingleCheckeds} superSingleCheckeds={superSingleChecked}
// superSingleCheckeds={superSingleCheckeds}
/> />
</Fragment> </Fragment>
)); ));
}, [formData, superSingleCheckeds]); }, [formData, superSingleChecked]);
const handleSubmit = async () => { const handleSubmit = async () => {
const { spacePrice, ironFanPrice, openSuper, superSingle } = formData; const { spacePrice, ironFanPrice, openSuper, superSingle } = formData;
const openSuperEveryFalse = Object.values(superSingle).every( const openSuperEveryFalse = Object.values(superSingle).every(
@ -169,9 +209,57 @@ export default function spacePaymentSetting() {
} }
let isPrice = false; let isPrice = false;
if (openSuper) { if (openSuper) {
Object.values(superSingle).forEach((it) => { // Object.values(superSingle).forEach((it) => {
if (it.enable) { // if (it.enable) {
const superFanPrice = it.price; // 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;
if (!superFanPrice) { if (!superFanPrice) {
Toast.show({ Toast.show({
icon: "fail", icon: "fail",
@ -207,7 +295,7 @@ export default function spacePaymentSetting() {
} }
} }
} }
}); }
} }
if (isPrice) return; if (isPrice) return;
// if ( // if (
@ -233,7 +321,6 @@ export default function spacePaymentSetting() {
price: parseInt(it.price * 100, 10), price: parseInt(it.price * 100, 10),
is_superfanship_give_wechat: it.wechatFree ? 1 : 0, is_superfanship_give_wechat: it.wechatFree ? 1 : 0,
})); }));
setIsSubmitting(true); setIsSubmitting(true);
try { try {
const body = { const body = {
@ -416,14 +503,24 @@ export default function spacePaymentSetting() {
</p> </p>
</div> </div>
<Space direction="vertical" block> <Space direction="vertical" block>
<Checkbox.Group <Radio.Group
value={superSingleChecked}
// value={superSingleCheckeds}
onChange={(values) => {
setSuperSingleChecked(values);
// setSuperSingleCheckeds(values);
}}
>
<ul>{listItemWithCheckboxMemo}</ul>
</Radio.Group>
{/* <Checkbox.Group
value={superSingleCheckeds} value={superSingleCheckeds}
onChange={(values) => { onChange={(values) => {
setSuperSingleCheckeds(values); setSuperSingleCheckeds(values);
}} }}
> >
<ul>{listItemWithCheckboxMemo}</ul> <ul>{listItemWithCheckboxMemo}</ul>
</Checkbox.Group> </Checkbox.Group> */}
</Space> </Space>
</div> </div>
)} )}