Ver código fonte

fix: recharge 页面逻辑修改

Before 7 meses atrás
pai
commit
f4add62882

+ 2 - 2
src/app/[locale]/(TabBar)/[[...share]]/@actionWidget/Service.tsx

@@ -24,7 +24,7 @@ interface Props {
 
 const ServiceWidget: FC<Props> = (props) => {
     const token = getToken();
-    const { services, socials } = props;
+    const { services, socials = [] } = props;
 
     const { wheelStatus, wheelCurrent, setWheel } = useWheelStore((state) => ({
         wheelStatus: state.status,
@@ -33,7 +33,7 @@ const ServiceWidget: FC<Props> = (props) => {
     }));
     const defaultService = services?.find((item) => item.is_suspend === 1);
 
-    const newServices = services?.filter((item) => item.is_suspend !== 1);
+    const newServices = services?.filter((item) => item.is_suspend !== 1) || [];
     const setSocials = useSocialStore((state) => state.setSocials);
     const redPacketModalRef = useRef<RedPacketModalProps>(null);
 

+ 12 - 5
src/app/[locale]/(navbar)/recharge/page.tsx

@@ -5,14 +5,21 @@ import { server } from "@/utils/server";
 import Image from "next/image";
 import { Download, DownNumber } from "./DownNumber";
 const getActivityApi = () => {
-    return server.request<PayDataType>({
-        url: "/v1/api/front/activity/pay",
-        method: "post",
-    });
+    return server
+        .request<PayDataType>({
+            url: "/v1/api/front/activity/pay",
+            method: "post",
+        })
+        .then((res) => {
+            return !Array.isArray(res.data) ? res.data.first_pay : [];
+        })
+        .catch((e) => {
+            return [];
+        });
 };
 const Page = async () => {
     const activities = await getActivityApi();
-    const hasEndTimeActivities = activities.data.first_pay?.find((item) => item.end_time > 0);
+    const hasEndTimeActivities = activities?.find((item) => item.end_time > 0);
     const endtime =
         hasEndTimeActivities && hasEndTimeActivities.end_time > 0
             ? hasEndTimeActivities.end_time * 1000