fix: 合并v1.5-冲突解决30%

src/app/[locale]/(TabBar)/[[...share]]/_home/HomeGames.tsx

@@ -65,7 +65,6 @@ const HomeGames = (props: Props) => {
             </div> */}
 
             {groupGames.map((group, index) => {
-                console.log(group, index);
                 if (group.type === 2 && providers) {
                     return (
                         <React.Fragment key={index}>

src/app/[locale]/(TabBar)/deposit/layout.tsx

@@ -2,7 +2,6 @@ import HeaderBack from "@/components/HeaderBack";
 import { getTranslations } from "next-intl/server";
 import { ReactNode, Suspense } from "react";
 import "./index.scss";
-import { ReactNode } from "react";
 
 export const generateMetadata = async () => {
     const t = await getTranslations("titles");
@@ -18,12 +17,14 @@ export default async function Layout({
     params: { locale: string };
 }) {
     return (
-      <div className="depositePage h-[100%] overflow-auto bg-[#0b0e10]">
+        <div className="depositePage h-[100%] overflow-auto bg-[#0b0e10]">
             <Suspense>
-              <HeaderBack
-                showBack={true}
-                Right={<span id="HeaderRight" style={{ width: ".3rem", display: "block" }}></span>}
-              />
+                <HeaderBack
+                    showBack={true}
+                    Right={
+                        <span id="HeaderRight" style={{ width: ".3rem", display: "block" }}></span>
+                    }
+                />
             </Suspense>
             <main className={"main-header overflow-auto"}>{children}</main>
         </div>

src/app/[locale]/(TabBar)/profile/ProfileHeader.tsx

@@ -80,21 +80,21 @@ const VipCard = () => {
                             "--track-width": ".12rem",
                         }}
                     />
-                  <div className={"process-bottom text-[#e581ff]"}>
-                    <span className="bg-[#0abd71]">VIP{userVip?.vip_level}</span>
-                    <div className={"process-bottom-desc"}>
-                      {userVip.vip_exp}/{userVip.vip_score_exp}
-                    </div>
-                    <span className="bg-[#eac61f]">
+                    <div className={"process-bottom text-[#e581ff]"}>
+                        <span className="bg-[#0abd71]">VIP{userVip?.vip_level}</span>
+                        <div className={"process-bottom-desc"}>
+                            {userVip.vip_exp}/{userVip.vip_score_exp}
+                        </div>
+                        <span className="bg-[#eac61f]">
                             VIP
-                      {userVip.vip_next_level}
+                            {userVip.vip_next_level}
                         </span>
-                  </div>
+                    </div>
+                </div>
+                <div className="vip-card-text" onClick={() => router.push("/vip")}>
+                    <span className="underline">CLUBE VIP</span>
+                    <i className="iconfont icon-xiangzuo1 block rotate-[180deg]"></i>
                 </div>
-              <div className="vip-card-text" onClick={() => router.push("/vip")}>
-                <span className="underline">CLUBE VIP</span>
-                <i className="iconfont icon-xiangzuo1 block rotate-[180deg]"></i>
-              </div>
             </div>
         </div>
     );
@@ -286,47 +286,47 @@ const WalletCard = () => {
                     </Button>
                 </div>
             </TipsModal>
-          <div className="coin">
-            <div className={"coin_right_wallet"}>
-              {walletCfg.map((item, index) => {
-                return (
-                  <div
-                    key={item.key}
-                    className={"wallet_right_content"}
-                    onClick={item.onClick}
-                  >
-                    <Badge
-                      content={item.dot}
-                      style={{
-                        right: "4px",
-                        top: "50%",
-                        width: "6px",
-                        height: "6px",
-                        minWidth: "6px",
-                      }}
-                    >
-                      <div className="wallet-right-icon">
+            <div className="coin">
+                <div className={"coin_right_wallet"}>
+                    {walletCfg.map((item, index) => {
+                        return (
+                            <div
+                                key={item.key}
+                                className={"wallet_right_content"}
+                                onClick={item.onClick}
+                            >
+                                <Badge
+                                    content={item.dot}
+                                    style={{
+                                        right: "4px",
+                                        top: "50%",
+                                        width: "6px",
+                                        height: "6px",
+                                        minWidth: "6px",
+                                    }}
+                                >
+                                    <div className="wallet-right-icon">
                                         <span
-                                          className={clsx("coin_left__icon iconfont", item.icon)}
-                                          style={{ ...(item.iconStyle || {}) }}
+                                            className={clsx("coin_left__icon iconfont", item.icon)}
+                                            style={{ ...(item.iconStyle || {}) }}
                                         ></span>
-                      </div>
-                    </Badge>
-                    <section>
-                      <div className={"wallet_header"}>
-                        {item.title}
-                        <div className="wallet-question">?</div>
-                      </div>
-                      <div className="num">
-                        <span className="uppercase">R$</span>
-                        <span>{item.value}</span>
-                      </div>
-                    </section>
-                  </div>
-                );
-              })}
+                                    </div>
+                                </Badge>
+                                <section>
+                                    <div className={"wallet_header"}>
+                                        {item.title}
+                                        <div className="wallet-question">?</div>
+                                    </div>
+                                    <div className="num">
+                                        <span className="uppercase">R$</span>
+                                        <span>{item.value}</span>
+                                    </div>
+                                </section>
+                            </div>
+                        );
+                    })}
+                </div>
             </div>
-          </div>
         </>
     );
 };

src/app/[locale]/(enter)/components/Form/index.tsx

@@ -319,7 +319,7 @@ const FormComponent: FC<Props> = (props) => {
         }
     };
     return (
-        <div className={clsx(styles.loginForm,"custom-form px-spacing-x py-spacing-y")}>
+        <div className={clsx(styles.loginForm, "custom-form px-spacing-x py-spacing-y")}>
             <Form
                 style={{
                     "--border-bottom": "none",
@@ -491,18 +491,18 @@ const FormComponent: FC<Props> = (props) => {
                         </div>
                     </>
                 ) : null}
-              <div className="mb-[0.2rem] flex justify-end text-[0.12rem]">
-                {type == "login" && (
-                  <>
-                    <Link className={"text-[#677787]"} href="/resetPhone">
-                      {t("LoginPage.forgetPwd")}
-                    </Link>
-                    {/* <Link className={"text-[#fff]"} href="/register">
+                <div className="mb-[0.2rem] flex justify-end text-[0.12rem]">
+                    {type == "login" && (
+                        <>
+                            <Link className={"text-[#677787]"} href="/resetPhone">
+                                {t("LoginPage.forgetPwd")}
+                            </Link>
+                            {/* <Link className={"text-[#fff]"} href="/register">
                                 {t("LoginPage.registerGo")}
                             </Link> */}
-                  </>
-                )}
-              </div>
+                        </>
+                    )}
+                </div>
             </Form>
         </div>
     );

src/app/[locale]/(navbar)/betrecord/layout.tsx

@@ -16,9 +16,9 @@ export default async function Layout({
 }) {
     const t = await getTranslations("ProfilePage");
     return (
-      <div className="betrecordPage h-[100%] overflow-auto">
+        <div className="betrecordPage h-[100%] overflow-auto">
             <Suspense>
-                <HeaderBack showBack={true} title={t("gamblingBets")}/>
+                <HeaderBack showBack={true} title={t("gamblingBets")} />
             </Suspense>
             <main className={"main-header"}>{children}</main>
         </div>

src/app/[locale]/(navbar)/transactions/layout.tsx

@@ -17,10 +17,10 @@ export default async function Layout({
 }) {
     const t = await getTranslations("ProfilePage");
     return (
-      <div className="flex h-[100%] flex-col overflow-auto">
-        <Suspense>
-          <HeaderBack showBack={true} title={t("transactions")} />
-        </Suspense>
+        <div className="flex h-[100%] flex-col overflow-auto">
+            <Suspense>
+                <HeaderBack showBack={true} title={t("transactions")} />
+            </Suspense>
             <main className={"main-header flex-1"}>{children}</main>
         </div>
     );

src/components/Card/Card.tsx

@@ -28,7 +28,6 @@ const Card: FC<PropsWithChildren<CardProps>> = (props) => {
     const { getGameUrl, getCoinType } = useGame();
     const t = useTranslations("Game");
     const brandRef = useRef<GameListRep | null>(null);
-    const wallet = useWalletStore((state) => state.wallet);
     const [isFavorite, setIsFavorite] = useState(item?.is_favorite === 1 || false);
     const wallet = useWalletStore((state) => {
         return {

src/components/Card/SwiperGroup.tsx

@@ -1,5 +1,5 @@
 "use client";
-import { FC, PropsWithChildren, ReactNode, useRef } from "react";
+import { FC, PropsWithChildren, ReactNode, useMemo, useRef } from "react";
 
 import { Swiper, SwiperClass, SwiperSlide } from "swiper/react";
 

src/components/Layout/Sidebar.tsx

@@ -250,107 +250,105 @@ const Sidebar: FC<PropsWithChildren<Props>> = (props) => {
         //     pathname: `/gameList2?provider_id=${item.id}`,
         // });
     };
-
     return (
-  return (
-    <Box pt={false} className={"h-[100%] bg-[#1e252b] px-[0px]"}>
-      <div className={"relative flex h-[100%] flex-col"}>
-        <div className={"sticky top-[0] px-[.12rem]"}>
-          <div className={"mb-[.1rem] flex items-center pt-[10px]"}>
-            <div
-              onClick={() => tabHandler(PageEnum.none)}
-              className="mr-[.06rem] rounded-[.06rem] bg-[#121617] px-[.08rem] py-[.06rem]"
-            >
-              <i className="iconfont icon-zhankai1 text-[.16rem] text-[#fff]"></i>
-            </div>
-            <div className={"flex-1"}>
-              <Image src={"/logo2.png"} alt={"logo"} width={130} height={110} />
-            </div>
-          </div>
-        </div>
-        <div className="flex-1 overflow-scroll px-[.12rem]">
-          <div className={styles.providerBox}>
-            {providers?.map((item, idx) => {
-              if (idx === 6 && !isShowAll) {
-                return (
-                  <div
-                    className={styles.providerItem}
-                    onClick={() => setIsShowAll(true)}
-                    key={item.id}
-                  >
-                    <img src="/sidebar/more.png" alt="" />
-                  </div>
-                );
-              }
-              if (idx > 6 && !isShowAll) return null;
-              return (
-                <div
-                  className={styles.providerItem}
-                  onClick={() => todoHandler(item)}
-                  key={item.id}
-                >
-                  <img src={item.game_icon} alt="" />
+        <Box pt={false} className={"h-[100%] bg-[#1e252b] px-[0px]"}>
+            <div className={"relative flex h-[100%] flex-col"}>
+                <div className={"sticky top-[0] px-[.12rem]"}>
+                    <div className={"mb-[.1rem] flex items-center pt-[10px]"}>
+                        <div
+                            onClick={() => tabHandler(PageEnum.none)}
+                            className="mr-[.06rem] rounded-[.06rem] bg-[#121617] px-[.08rem] py-[.06rem]"
+                        >
+                            <i className="iconfont icon-zhankai1 text-[.16rem] text-[#fff]"></i>
+                        </div>
+                        <div className={"flex-1"}>
+                            <Image src={"/logo2.png"} alt={"logo"} width={130} height={110} />
+                        </div>
+                    </div>
                 </div>
-              );
-            })}
-          </div>
-          <div className={clsx(styles.sideTitle, "mt-[.06rem]")}>
-            <i
-              className={clsx("iconfont icon-qianbao11 text-[.26rem]", styles.icon)}
-            ></i>
-            <span>Carteira</span>
-          </div>
-
-          <div className={styles.qianbao}>
-            {walletCfg.map((item: any) => {
-              return (
-                <div key={item.text} className={styles.qianbaoItem}>
-                  <img className="mr-[.06rem] w-[.3rem]" src={item.icon} alt="" />
-                  <div>
-                    <div className="text-[.16rem] leading-[1.2]">
-                      {item.value}R
+                <div className="flex-1 overflow-scroll px-[.12rem]">
+                    <div className={styles.providerBox}>
+                        {providers?.map((item, idx) => {
+                            if (idx === 6 && !isShowAll) {
+                                return (
+                                    <div
+                                        className={styles.providerItem}
+                                        onClick={() => setIsShowAll(true)}
+                                        key={item.id}
+                                    >
+                                        <img src="/sidebar/more.png" alt="" />
+                                    </div>
+                                );
+                            }
+                            if (idx > 6 && !isShowAll) return null;
+                            return (
+                                <div
+                                    className={styles.providerItem}
+                                    onClick={() => todoHandler(item)}
+                                    key={item.id}
+                                >
+                                    <img src={item.game_icon} alt="" />
+                                </div>
+                            );
+                        })}
                     </div>
-                    <div
-                      className="text-[.1rem] leading-[1]"
-                      style={{ ...(item.textStyle || {}) }}
-                    >
-                      {item.text}
+                    <div className={clsx(styles.sideTitle, "mt-[.06rem]")}>
+                        <i
+                            className={clsx("iconfont icon-qianbao11 text-[.26rem]", styles.icon)}
+                        ></i>
+                        <span>Carteira</span>
                     </div>
-                  </div>
-                </div>
-              );
-            })}
-          </div>
-          {cardData.length > 0 && (
-            <div className={clsx(styles.sideTitle, "my-[.06rem]")}>
-              <i
-                className={clsx("iconfont icon-liwu text-[.24rem]", styles.icon)}
-              ></i>
-              <span>Promoções</span>
-            </div>
-          )}
 
-          <div className={styles.promotionBox}>
-            {cardData.map((item) => {
-              return (
-                <Box
-                  key={item.id}
-                  action={item.action_type}
-                  actionData={item.action_params}
-                  className={styles.promoItem}
-                  onBeforeHandler={() => registePromo(item.id)}
-                >
-                  <div
-                    key={item.id}
-                    className={styles.promotionItem}
-                    onClick={() => promotionHandle(item)}
-                  >
-                    <img src={item.content} alt="" />
-                  </div>
-                </Box>
-              );
-            })}
-            {/* <div className={styles.promotionItem}>
+                    <div className={styles.qianbao}>
+                        {walletCfg.map((item: any) => {
+                            return (
+                                <div key={item.text} className={styles.qianbaoItem}>
+                                    <img className="mr-[.06rem] w-[.3rem]" src={item.icon} alt="" />
+                                    <div>
+                                        <div className="text-[.16rem] leading-[1.2]">
+                                            {item.value}R
+                                        </div>
+                                        <div
+                                            className="text-[.1rem] leading-[1]"
+                                            style={{ ...(item.textStyle || {}) }}
+                                        >
+                                            {item.text}
+                                        </div>
+                                    </div>
+                                </div>
+                            );
+                        })}
+                    </div>
+                    {cardData.length > 0 && (
+                        <div className={clsx(styles.sideTitle, "my-[.06rem]")}>
+                            <i
+                                className={clsx("iconfont icon-liwu text-[.24rem]", styles.icon)}
+                            ></i>
+                            <span>Promoções</span>
+                        </div>
+                    )}
+
+                    <div className={styles.promotionBox}>
+                        {cardData.map((item) => {
+                            return (
+                                <Box
+                                    key={item.id}
+                                    action={item.action_type}
+                                    actionData={item.action_params}
+                                    className={styles.promoItem}
+                                    onBeforeHandler={() => registePromo(item.id)}
+                                >
+                                    <div
+                                        key={item.id}
+                                        className={styles.promotionItem}
+                                        onClick={() => promotionHandle(item)}
+                                    >
+                                        <img src={item.content} alt="" />
+                                    </div>
+                                </Box>
+                            );
+                        })}
+                        {/* <div className={styles.promotionItem}>
                             <img src="/sidebar/promotion.png" alt="" />
                         </div>
                         <div className={styles.promotionItem}>
@@ -362,48 +360,48 @@ const Sidebar: FC<PropsWithChildren<Props>> = (props) => {
                         <div className={styles.promotionItem}>
                             <img src="/sidebar/promotion.png" alt="" />
                         </div> */}
-          </div>
-
-          {listCfg.map((item) => {
-            if (item.noRender) return null;
-            if (item.renderWrap) {
-              const Wrapper = item.renderWrap;
-              if (React.isValidElement(Wrapper)) {
-                return (
-                  <Wrapper key={item.text}>
-                    <div className={styles.signalItem}>
-                      <img src={item.icon} alt="" />
-                      <div>{item.text}</div>
                     </div>
-                  </Wrapper>
-                );
-              }
-              return null;
-            }
-            return (
-              <div
-                className={styles.signalItem}
-                key={item.text}
-                onClick={item.handle}
-              >
-                <img src={item.icon} alt="" />
-                <div>{item.text}</div>
-              </div>
-            );
-          })}
-        </div>
-        <div
-          className={clsx(
-            "flex items-center justify-between bg-[#2b363f] p-[.1rem]",
-            styles.footer
-          )}
-        >
-          <button onClick={() => tabHandler(PageEnum.deposit)}>Depósito</button>
-          <button onClick={() => tabHandler(PageEnum.withdraw)}>Sacar</button>
-        </div>
 
-        {/*  card*/}
-        {/* <div className={"mt-[0.2rem] grid grid-cols-1 gap-[0.0833rem]"}>
+                    {listCfg.map((item) => {
+                        if (item.noRender) return null;
+                        if (item.renderWrap) {
+                            const Wrapper = item.renderWrap;
+                            if (React.isValidElement(Wrapper)) {
+                                return (
+                                    <Wrapper key={item.text}>
+                                        <div className={styles.signalItem}>
+                                            <img src={item.icon} alt="" />
+                                            <div>{item.text}</div>
+                                        </div>
+                                    </Wrapper>
+                                );
+                            }
+                            return null;
+                        }
+                        return (
+                            <div
+                                className={styles.signalItem}
+                                key={item.text}
+                                onClick={item.handle}
+                            >
+                                <img src={item.icon} alt="" />
+                                <div>{item.text}</div>
+                            </div>
+                        );
+                    })}
+                </div>
+                <div
+                    className={clsx(
+                        "flex items-center justify-between bg-[#2b363f] p-[.1rem]",
+                        styles.footer
+                    )}
+                >
+                    <button onClick={() => tabHandler(PageEnum.deposit)}>Depósito</button>
+                    <button onClick={() => tabHandler(PageEnum.withdraw)}>Sacar</button>
+                </div>
+
+                {/*  card*/}
+                {/* <div className={"mt-[0.2rem] grid grid-cols-1 gap-[0.0833rem]"}>
                     {cardData.map((item, index) => {
                         return (
                             <Box
@@ -431,24 +429,24 @@ const Sidebar: FC<PropsWithChildren<Props>> = (props) => {
                     })}
                 </div> */}
 
-        {/*  gift */}
-        {/*<section*/}
-        {/*    onClick={() => tabHandler(PageEnum.promo)}*/}
-        {/*    className={"my-[0.11rem] flex items-center text-[0.15rem]" + " text-[#fff]"}*/}
-        {/*>*/}
-        {/*    <div className={"flex-1"}>*/}
-        {/*        <span*/}
-        {/*            className={*/}
-        {/*                "iconfont icon-liwulipinjiangpin mr-[0.0694rem]" +*/}
-        {/*                " text-[0.16rem] text-[#999]"*/}
-        {/*            }*/}
-        {/*        ></span>*/}
-        {/*        <span> {t("promocoes")} </span>*/}
-        {/*    </div>*/}
-        {/*    /!*<span className={"iconfont icon-xiangyou1"}></span>*!/*/}
-        {/*</section>*/}
+                {/*  gift */}
+                {/*<section*/}
+                {/*    onClick={() => tabHandler(PageEnum.promo)}*/}
+                {/*    className={"my-[0.11rem] flex items-center text-[0.15rem]" + " text-[#fff]"}*/}
+                {/*>*/}
+                {/*    <div className={"flex-1"}>*/}
+                {/*        <span*/}
+                {/*            className={*/}
+                {/*                "iconfont icon-liwulipinjiangpin mr-[0.0694rem]" +*/}
+                {/*                " text-[0.16rem] text-[#999]"*/}
+                {/*            }*/}
+                {/*        ></span>*/}
+                {/*        <span> {t("promocoes")} </span>*/}
+                {/*    </div>*/}
+                {/*    /!*<span className={"iconfont icon-xiangyou1"}></span>*!/*/}
+                {/*</section>*/}
 
-        {/* <section
+                {/* <section
                     onClick={() => tabHandler(PageEnum.deposit)}
                     className={"my-[0.16rem] flex items-center text-[0.15rem]" + " text-[#fff]"}
                 >
@@ -507,8 +505,8 @@ const Sidebar: FC<PropsWithChildren<Props>> = (props) => {
                 </section>
 
                 <section className={"mt-[0.11rem] text-[#fff]"}>{t("coumnidade")}</section> */}
-      </div>
-    </Box>
-  );
+            </div>
+        </Box>
+    );
 };
 export default Sidebar;