diff --git a/app/my/streamerVerification/afterSubmitStreamerVerification/page.jsx b/app/my/streamerVerification/afterSubmitStreamerVerification/page.jsx
index d735ade..67d5d2d 100644
--- a/app/my/streamerVerification/afterSubmitStreamerVerification/page.jsx
+++ b/app/my/streamerVerification/afterSubmitStreamerVerification/page.jsx
@@ -80,10 +80,7 @@ export default function AfterSubmitStreamerVerification() {
paddingLeft: "32px",
paddingRight: "32px",
}}
- onClick={() => () =>
- router.replace(
- "my/streamerVerification/completeStreamerInformation"
- )}
+ onClick={() => router.replace("completeStreamerInformation")}
>
前往完善资料
diff --git a/app/my/streamerVerification/completeStreamerInformation/page.jsx b/app/my/streamerVerification/completeStreamerInformation/page.jsx
index 6d0f6bd..967bb78 100644
--- a/app/my/streamerVerification/completeStreamerInformation/page.jsx
+++ b/app/my/streamerVerification/completeStreamerInformation/page.jsx
@@ -93,12 +93,12 @@ export default function CompleteStreamerInformation() {
const [isWaitingReview, setIsWaitingReview] = useState(false);
const [formData, setFormData] = useState({
wechatPrice: 0,
- gender: ["0"],
- age: ["18"],
- height: ["140"],
- weight: ["35"],
- constellation: ["白羊座"],
- province: ["北京市"],
+ gender: [""],
+ age: [""],
+ height: [""],
+ weight: [""],
+ constellation: [""],
+ province: [""],
tags: [],
info: "",
autoResponse: "",
@@ -106,8 +106,8 @@ export default function CompleteStreamerInformation() {
wechatAddWay: 0,
fans: 0,
imageAssets: [],
- displayImage: null,
- displayVideo: null,
+ displayImage: [],
+ displayVideo: [],
});
const [spacePriceAble, setSpacePriceAble] = useState(false);
// const [wechatAddWay, setWechatAddWay] = useState("0");
@@ -133,8 +133,11 @@ export default function CompleteStreamerInformation() {
getData();
}, []);
useEffect(() => {
- if (data.tag) {
+ // console.log("setFormData", data?.streamer);
+
+ if (data?.streamer?.tag) {
const {
+ fans,
wechat_coin_price,
gender,
age,
@@ -150,7 +153,9 @@ export default function CompleteStreamerInformation() {
cover,
shorts,
} = data?.streamer;
- setFormData({
+ setFormData((old) => ({
+ ...old,
+ fans,
wechatPrice: wechat_coin_price,
gender: [`${gender}`],
age: [`${age}`],
@@ -163,23 +168,27 @@ export default function CompleteStreamerInformation() {
autoResponse: auto_response_message,
wechatAddWay: wechat_lock_type,
wechat: wechat_contact,
+
displayImage: [
{
notChanged: true,
- id: { image_ids: cover.image_ids },
- uri: cover.images[0].urls[0],
+ image_ids: cover.image_ids,
+ url: cover.images[0].urls[0],
},
],
displayVideo: [
{
notChanged: true,
- id: { video_ids: shorts?.video_ids },
- cover: shorts?.videos[0]?.cover_urls[0],
+ video_ids: shorts?.video_ids,
+ url: shorts?.videos[0]?.cover_urls[0],
},
],
- });
+ }));
}
}, [data]);
+ useEffect(() => {
+ setFormData((old) => ({ ...old, imageAssets: oldPhotos }));
+ }, [oldPhotos]);
const superSingles = [
{ key: 0, text: "主动添加对方" },
{ key: 1, text: "向对方展示微信" },
@@ -258,26 +267,33 @@ export default function CompleteStreamerInformation() {
setData({ ...account, streamer: _data.data.list[0] });
setWechatInputShow(_data.data.list[0].wechat_lock_type);
- if (_data.data.list[0])
+ if (_data.data.list[0]) {
setFormData((old) => ({
...old,
displayImage: [
{
notChanged: true,
- id: { image_ids: _data.data.list[0].cover.image_ids },
- uri: _data.data.list[0].cover.images[0].urls[0],
+ image_ids: _data.data.list[0].cover.image_ids,
+ url: _data.data.list[0].cover.images[0].urls[0],
},
],
displayVideo: [
{
notChanged: true,
- id: { video_ids: _data.data.list[0].shorts?.video_ids },
- cover: _data.data.list[0].shorts?.videos[0]?.cover_urls[0],
+ video_ids: _data.data.list[0].shorts?.video_ids,
+ url: _data.data.list[0].shorts?.videos[0]?.cover_urls[0],
},
],
}));
- setOldPhotos(_data.data.list[0].album.images);
- setIsloading(false);
+ setOldPhotos(
+ _data.data.list[0].album.images.map((it) => ({
+ id: it.id,
+ url: it.urls[0],
+ }))
+ );
+ }
+
+ // setIsloading(false);
} catch (error) {
console.error(error);
} finally {
@@ -327,6 +343,14 @@ export default function CompleteStreamerInformation() {
});
return;
}
+ if (isNaN(fans) || fans < 1) {
+ Toast.show({
+ icon: "fail",
+ content: "请输入有效的全网粉丝量(大于等于1的整数)",
+ position: "top",
+ });
+ return;
+ }
const price = parseInt(wechatPrice, 10);
if (isNaN(price) || price < 1) {
Toast.show({
@@ -345,7 +369,7 @@ export default function CompleteStreamerInformation() {
return;
}
//相册不得低于2张
- if (displayImage.length < 2) {
+ if (imageAssets.length < 2) {
Toast.show({
icon: "fail",
content: "相册至少需要上传2张照片哦!",
@@ -354,7 +378,7 @@ export default function CompleteStreamerInformation() {
return;
}
//相册不得超过9张
- if (displayImage.length > 9) {
+ if (imageAssets.length > 9) {
Toast.show({
icon: "fail",
content: "相册最多只能上传9张照片哦!",
@@ -363,12 +387,14 @@ export default function CompleteStreamerInformation() {
return;
}
setIsSubmitting(true);
- const cover = displayImage?.id
- ? displayImage
- : await multiUploadImage(displayImage.file, 1);
- const shorts = displayVideo?.id
- ? displayVideo
- : await multiUploadImage(displayVideo.file, 2);
+ const cover =
+ displayImage[0]?.image_ids?.length > 0
+ ? displayImage[0]
+ : await multiUploadImage(displayImage[0].file, 1);
+ const shorts =
+ displayVideo[0]?.video_ids?.length > 0
+ ? displayVideo[0]
+ : await multiUploadImage(displayVideo[0].file, 2);
const newMedia = imageAssets.filter((it) => it.id == undefined);
const media = await multiUploadImage(newMedia, 1);
const album = {
@@ -446,19 +472,23 @@ export default function CompleteStreamerInformation() {
if (type == 1) {
setFormData((old) => ({
...old,
- displayImage: {
- url: URL.createObjectURL(file),
- file: Array.from(e.target.files),
- },
+ displayImage: [
+ {
+ url: URL.createObjectURL(file),
+ file: Array.from(e.target.files),
+ },
+ ],
}));
} else {
creatVideoCanvas(file);
setFormData((old) => ({
...old,
- displayVideo: {
- url: frameImageUrl,
- file: Array.from(e.target.files),
- },
+ displayVideo: [
+ {
+ url: frameImageUrl,
+ file: Array.from(e.target.files),
+ },
+ ],
}));
}
};
@@ -582,8 +612,8 @@ export default function CompleteStreamerInformation() {
- setFormData((old) => ({ ...old, fans: value }))
- }
+ onChange={(value) => {
+ setFormData((old) => ({ ...old, fans: value }));
+ }}
/>