From 88f792716c11ce4536585002c5815666e9237c63 Mon Sep 17 00:00:00 2001
From: yezian <jueweijue@gmail.com>
Date: Fri, 10 Jan 2025 16:32:23 +0800
Subject: [PATCH] anln_refund (#24)
Co-authored-by: al <al@cdhncy.com>
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/tiefen_space_h5/pulls/24
---
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 ++--
components/Websocket/index.jsx | 2 +-
6 files changed, 28 insertions(+), 18 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() {
<Radio.Group
className="flex flex-col"
onChange={setIndex}
- value={data && data?.refunds_status === 4 ? 2 : selectedIndex}
+ value={
+ data && [2, 3, 4].includes(data?.refunds_status)
+ ? 2
+ : selectedIndex
+ }
disabled={!checkAble}
>
<div className="flex flex-row items-start mt-4 pr-6">
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
/>
<div className="ml-2 flex flex-col gap-1">
- <div className="flex flex-row items-center flex-1 ">
+ <div className="flex flex-row flex-wrap items-center flex-1 ">
<div style={{ maxWidth: 100 }} className="truncate">
<span className="mr-2 text-base text-white font-medium whitespace-nowrap">
{item.account.name}
@@ -99,9 +99,9 @@ export default function PendingReview({ currentIndex }) {
</div>
</div>
- <div className="flex flex-col justify-center items-center">
+ <div className="flex flex-col justify-center items-start">
<div className="px-4 py-1 rounded-full bg-[#FFFFFF1A] flex-row items-center">
- <span className="text-white text-sm">
+ <span className="text-white text-sm whitespace-nowrap">
{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 }}
>
<div
- onClick={() =>
- 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)]"
>
<div className="relative">
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" ? (
<div
className="flex items-center"
+ style={{ display: !isOwn ? "flex" : "none" }}
onClick={() =>
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 && (
<div className="text-[#FFFFFFB2] font-medium text-xs flex items-center">
<span className="mr-1">查看TA的空间</span>
<FontAwesomeIcon
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) => {