修复bug
This commit is contained in:
parent
2ef89b0819
commit
7de541fa74
|
@ -353,7 +353,7 @@ const My = () => {
|
||||||
src={"/icons/32DP/toScreen.png"}
|
src={"/icons/32DP/toScreen.png"}
|
||||||
placeholder=""
|
placeholder=""
|
||||||
/>
|
/>
|
||||||
<span className="text-base">添到主屏幕</span>
|
<span className="text-base">添加到主屏幕</span>
|
||||||
</div>
|
</div>
|
||||||
<FontAwesomeIcon
|
<FontAwesomeIcon
|
||||||
icon={faAngleRight}
|
icon={faAngleRight}
|
||||||
|
|
|
@ -102,7 +102,7 @@ export default function Home() {
|
||||||
)}
|
)}
|
||||||
</Swiper.Item>
|
</Swiper.Item>
|
||||||
<Swiper.Item>
|
<Swiper.Item>
|
||||||
{activeIndex && (
|
{!!activeIndex && (
|
||||||
<FollowPostList scrollHeight={scrollHeight} ref={followPostRef} />
|
<FollowPostList scrollHeight={scrollHeight} ref={followPostRef} />
|
||||||
)}
|
)}
|
||||||
</Swiper.Item>
|
</Swiper.Item>
|
||||||
|
|
|
@ -8,6 +8,7 @@ import { useRouter } from "next/navigation";
|
||||||
import { getStreamerDetailInfo } from "@/api/space";
|
import { getStreamerDetailInfo } from "@/api/space";
|
||||||
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
|
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
|
||||||
import { faCopy } from "@fortawesome/free-solid-svg-icons";
|
import { faCopy } from "@fortawesome/free-solid-svg-icons";
|
||||||
|
import clipboard from "copy-to-clipboard";
|
||||||
export default function AddWeChat({
|
export default function AddWeChat({
|
||||||
visible,
|
visible,
|
||||||
closeMask,
|
closeMask,
|
||||||
|
@ -112,7 +113,7 @@ export default function AddWeChat({
|
||||||
//提交微信函数
|
//提交微信函数
|
||||||
const submitWechat = async (order_id) => {
|
const submitWechat = async (order_id) => {
|
||||||
//提交用户微信和备注
|
//提交用户微信和备注
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const submitWechatData = await requireAPI(
|
const submitWechatData = await requireAPI(
|
||||||
"POST",
|
"POST",
|
||||||
|
@ -141,23 +142,32 @@ export default function AddWeChat({
|
||||||
//用户未解锁微信情况:先支付,再提交用户微信和备注
|
//用户未解锁微信情况:先支付,再提交用户微信和备注
|
||||||
if (streamerDetailData.is_unlock_wechat === 1) {
|
if (streamerDetailData.is_unlock_wechat === 1) {
|
||||||
//用户已解锁微信情况:直接提交用户微信和备注
|
//用户已解锁微信情况:直接提交用户微信和备注
|
||||||
console.log("ccccc",streamerDetailData,streamerData.wechat_order_id)
|
console.log(
|
||||||
|
"ccccc",
|
||||||
|
streamerDetailData,
|
||||||
|
streamerData.wechat_order_id
|
||||||
|
);
|
||||||
await submitWechat(streamerDetailData.wechat_order_id);
|
await submitWechat(streamerDetailData.wechat_order_id);
|
||||||
setStreamerDetailData({
|
setStreamerDetailData({
|
||||||
...streamerDetailData,
|
...streamerDetailData,
|
||||||
wechat_order_status: 3,
|
wechat_order_status: 3,
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
|
console.log(
|
||||||
|
"xxxx",
|
||||||
|
streamerDetailData,
|
||||||
|
streamerData.wechat_order_id
|
||||||
|
);
|
||||||
const order_id = await payCoin();
|
const order_id = await payCoin();
|
||||||
if (!order_id) return;
|
if (!order_id) return;
|
||||||
|
|
||||||
await submitWechat(order_id);
|
await submitWechat(order_id);
|
||||||
//展示解锁成功界面
|
//展示解锁成功界面
|
||||||
// setIsWechatUnlocked(true);
|
// setIsWechatUnlocked(true);
|
||||||
setStreamerDetailData({
|
setStreamerDetailData({
|
||||||
...streamerDetailData,
|
...streamerDetailData,
|
||||||
// wechat_order_status: 3,
|
wechat_order_status: 3,
|
||||||
wechat_order_status:1
|
is_unlock_wechat: 1,
|
||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -179,7 +189,7 @@ export default function AddWeChat({
|
||||||
setStreamerDetailData({
|
setStreamerDetailData({
|
||||||
...streamerDetailData,
|
...streamerDetailData,
|
||||||
wechat_order_status: 3,
|
wechat_order_status: 3,
|
||||||
wechat_order_status:1
|
is_unlock_wechat: 1,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -226,6 +236,14 @@ export default function AddWeChat({
|
||||||
// size="sm"
|
// size="sm"
|
||||||
color="#ffffff"
|
color="#ffffff"
|
||||||
className="ml-2"
|
className="ml-2"
|
||||||
|
onClick={() => {
|
||||||
|
clipboard(wechat);
|
||||||
|
Toast.show({
|
||||||
|
icon: "success",
|
||||||
|
content: "已复制到剪贴板",
|
||||||
|
position: "top",
|
||||||
|
});
|
||||||
|
}}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
@ -238,7 +256,7 @@ export default function AddWeChat({
|
||||||
streamerDetailData?.wechat_order_status === 2) && (
|
streamerDetailData?.wechat_order_status === 2) && (
|
||||||
<div
|
<div
|
||||||
className="bg-primary px-4 py-2 rounded-full flex items-center justify-center"
|
className="bg-primary px-4 py-2 rounded-full flex items-center justify-center"
|
||||||
onClick={()=>unlockWechat()}
|
onClick={() => unlockWechat()}
|
||||||
>
|
>
|
||||||
{!streamerDetailData?.is_unlock_wechat && (
|
{!streamerDetailData?.is_unlock_wechat && (
|
||||||
<span className="text-[16px] whitespace-nowrap">
|
<span className="text-[16px] whitespace-nowrap">
|
||||||
|
|
Loading…
Reference in New Issue