更新PP跳转

src/components/Card/Card.tsx

@@ -1,238 +0,0 @@
-"use client";
-import { Category, GameListRep, GameRequest } from "@/api/home";
-import { userInfoApi } from "@/api/login";
-import Box from "@/components/Box";
-import useGame from "@/hooks/useGame";
-import { useRouter } from "@/i18n/routing";
-import { useWalletStore } from "@/stores/useWalletStore";
-import { getToken } from "@/utils/Cookies";
-import { Button, Popup, Toast } from "antd-mobile";
-import { useTranslations } from "next-intl";
-import { FC, PropsWithChildren, ReactNode, useEffect, useRef, useState } from "react";
-import TipsModal, { ModalProps } from "../TipsModal";
-import styles from "./style.module.scss";
-export interface CardProps {
-    item?: GameListRep;
-    render?: (value: GameListRep) => ReactNode;
-    groupType?: Category["bet_type"];
-}
-
-const Card: FC<PropsWithChildren<CardProps>> = (props) => {
-    const { render, item, groupType } = props;
-
-    const { getGameUrl, getCoinType } = useGame();
-
-    const t = useTranslations("Game");
-    const brandRef = useRef<GameListRep | null>(null);
-    const wallet = useWalletStore((state) => state.wallet);
-    // 判断是否有未结算的对局
-    const gameModelRef = useRef<ModalProps>(null);
-    const gameRef = useRef<(GameListRep & { mode: GameRequest["mode"] }) | null>(null);
-
-    const [visible, setVisible] = useState(false);
-    const element = useRef<HTMLElement | null>(null);
-
-    const router = useRouter();
-    const token = getToken();
-    const handler = (game: GameListRep) => {
-        setVisible(true);
-        brandRef.current = game;
-    };
-    useEffect(() => {
-        element.current = document.getElementById("app");
-    }, []);
-    const playGameHandler = async (game: GameListRep) => {
-<<<<<<< HEAD
-        const type = getCoinType(game, groupType!);
-
-=======
-      console.log('playGameHandler===>',game)
->>>>>>> feature-lucky
-        if (!token) {
-            router.push("/login?redirect=/");
-            return;
-        }
-        // 现金游戏
-        if (type === 1 && Number(wallet.score) + wallet.point <= 0) {
-            router.push("/deposit");
-            return;
-        }
-
-        // 免费游戏
-        if (type === 2 && Number(wallet.free_score) <= 0) {
-            // router.push("/deposit");
-            Toast.show({
-                icon: "fail",
-                content: "No free coins",
-                maskClickable: false,
-            });
-            return;
-        }
-        // 重玩游戏
-        if (type === 3 && Number(wallet.lose_score) <= 0) {
-            Toast.show({
-                icon: "fail",
-                content: "No replay coins",
-                maskClickable: false,
-            });
-            return;
-        }
-
-        let params: any = {
-            id: game.id + "",
-            mode: type!,
-        };
-        // 判断是否有未结算的游戏
-        const { data }: any = await userInfoApi();
-        const play_list = data?.play_list.map((item: any) => {
-            return {
-                ...item,
-                mode: 1,
-            };
-        });
-        const free_game_list = data?.free_game_list.map((item: any) => {
-            return {
-                ...item,
-                mode: 2,
-            };
-        });
-        const lose_game_list = data?.lose_game_list.map((item: any) => {
-            return {
-                ...item,
-                mode: 3,
-            };
-        });
-        let gameList = [...free_game_list, ...lose_game_list];
-        if (type === 2) {
-            gameList = [...play_list, ...lose_game_list];
-        }
-        if (type === 3) {
-            gameList = [...play_list, ...free_game_list];
-        }
-        let unfinishedGame = gameList.find((item: { id: number }) => item?.id === game.id);
-        if (unfinishedGame) {
-            gameRef.current = unfinishedGame;
-            setVisible(false);
-            gameModelRef.current?.onOpen();
-            return;
-        }
-        getGameUrl(brandRef.current!, params);
-    };
-
-    const goGame = () => {
-        getGameUrl(gameRef.current!, {
-            id: gameRef.current?.id + "",
-            mode: gameRef.current?.mode!,
-        });
-    };
-
-    const demoPlayGameHandler = (game: GameListRep) => {
-        const params = {
-            id: game.id + "",
-            demo: game.demo,
-        };
-        getGameUrl(game, params);
-    };
-    return (
-        <>
-            {render ? (
-                render(item!)
-            ) : (
-                <div className={styles.cardWrap} onClick={() => handler(item!)}>
-                    <img
-                        src={item?.game_icon}
-                        alt={item?.game_name_cn}
-                        className={"h-[100%] w-[100%]"}
-                    />
-                </div>
-            )}
-
-            <Popup
-                visible={visible}
-                onMaskClick={() => {
-                    setVisible(false);
-                }}
-                onClose={() => {
-                    setVisible(false);
-                }}
-                showCloseButton={true}
-                getContainer={() => document.querySelector("#app")!}
-                bodyStyle={{
-                    background: "rgba(27, 36, 106, .7)",
-                    borderRadius: ".1rem .1rem 0 0",
-                    border: "1px solid #e53fff",
-                    boxShadow: "0rem -.06rem 20px 0.0rem #e53fff inset",
-                    padding: ".06rem .02rem",
-                }}
-            >
-                <Box className={"w-1/1 flex w-[4.02rem] flex-1"}>
-                    <div className={styles.cardWrap} style={{ width: "1.1rem" }}>
-                        <img
-                            src={item?.game_icon}
-                            alt={item?.game_name + "-" + item?.category_name}
-                            className={"h-[100%] w-[100%]"}
-                        />
-                    </div>
-                    <div className={styles.cardWrapGmeInfo}>
-                        <p className={"h-[0.6rem] text-[.18rem]"}>{item?.game_name}</p>
-
-                        <div className={"flex w-[2.2rem] justify-start"}>
-                            {/* 只是PG游戏展示demo试玩按钮 */}
-                            {(item?.category_name === "Pragmaticplay" ||
-                                item?.category_name === "PP") && (
-                                <div
-                                    onClick={() => demoPlayGameHandler({ ...item!, demo: 1 })}
-                                    className={`flex h-[0.46rem] w-[1rem] items-center justify-center bg-[url(/home/popbtn.png)] bg-[length:100%_100%] text-[0.15rem] font-bold`}
-                                >
-<<<<<<< HEAD
-                                    {t("demo")}
-                                </div>
-=======
-                                    {t("demo")} 
-                                </Button>
->>>>>>> feature-lucky
-                            )}
-                            <div
-                                onClick={() => playGameHandler(item!)}
-                                // style={{
-                                //     "--background-color": "#009d80",
-                                //     "--border-color": "#009d80",
-                                // }}
-                                className={`flex h-[0.46rem] w-[1rem] items-center justify-center bg-[url(/home/popbtn.png)] bg-[length:100%_100%] text-[0.15rem] font-bold`}
-                            >
-<<<<<<< HEAD
-                                {t("join")}
-                            </div>
-=======
-                                {t("join")} 
-                            </Button>
->>>>>>> feature-lucky
-                        </div>
-                    </div>
-                </Box>
-            </Popup>
-
-            <TipsModal title={"Tips"} ref={gameModelRef} getContainer={element.current}>
-                <p className={"text-left text-[0.12rem] font-medium text-[#666]"}>
-                    Há jogos inconclusos continuar o jogo
-                </p>
-
-                <div className={"mt-[0.0694rem] flex justify-center"}>
-                    <Button
-                        color={"primary"}
-                        className={"mx-auto"}
-                        style={{
-                            "--background-color": "var(--primary-color)",
-                            "--border-color": "var(--primary-color)",
-                        }}
-                        onClick={goGame}
-                    >
-                        para jogos
-                    </Button>
-                </div>
-            </TipsModal>
-        </>
-    );
-};
-
-export default Card;

src/hooks/useGame.tsx

@@ -42,10 +42,10 @@ const useGame = () => {
                 Toast.clear();
                 if (res.data && res.data.game_url) {
                     eventStartTrial();
-
                     const game_url = res.data.game_url;
+
                     // 获取游戏的品牌
-                    console.log(`🚀🚀🚀🚀🚀-> in useGame.tsx on 28`,game,res.data);
+                    const category_name = game?.category_name;
 
                     // 然后是文档对象
                     if (game_url.indexOf("!doctype") !== -1) {
@@ -54,15 +54,14 @@ const useGame = () => {
                         router.push(`/game?${url}`);
                         return;
                     }
-                    // const url = `${encodeURI(res.data.game_url)}&return_url=${encodeURI(window.location.href.replace(pathname, ""))}&category_name=${game.provider}`;
-                    const url = `${encodeURI(res.data.game_url)}&brand=${brand}&return_url=${window.location.href.replace(pathname, "")}&category_name=${game.provider}`;
+                    const url = `${encodeURI(res.data.game_url)}&return_url=${encodeURI(window.location.href.replace(pathname, ""))}&category_name=${game.provider}`;
 
-                    // 如果是pp游戏，在当前页面打开游戏地址，不需要新窗口打开,不需要return_url
-                    // if(brand === 'pp'){
-                    //   const ppUrl = `${encodeURI(res.data.game_url)}&brand=${brand}&category_name=${game.provider}`;
-                    //   window.open(ppUrl,'_self');
-                    //   return
-                    // }
+                    // 如果是pp游戏,则当前窗口打开新的地址，不需要加return_url
+                    if(category_name === 'PP'){
+                      const ppUrl = `${encodeURI(res.data.game_url)}&category_name=${game.provider}`;
+                      window.open(ppUrl,'_self');
+                      return
+                    }
 
                     if (new RegExp("https").test(game_url)) {
                         // 如果是https