Browse Source

feat: 修改

year 2 days ago
parent
commit
0188430470

+ 0 - 0
src/app/[locale]/(TabBar)/[[...share]]/_searchWidget/page.tsx → src/app/[locale]/(TabBar)/[[...share]]/@searchWidget/page.tsx


+ 9 - 5
src/app/[locale]/(TabBar)/[[...share]]/_home/HomeSearch.tsx

@@ -1,6 +1,7 @@
 "use client";
 import { GameListRep, searchGameListApi, SearchProps } from "@/api/home";
 import GroupCard from "@/components/Card/GroupCard";
+import { useRouter } from "@/i18n/routing";
 import { useSearchStore } from "@/stores/useSearchStore";
 import { Button, createErrorBlock, Mask, SearchBar } from "antd-mobile";
 import { useTranslations } from "next-intl";
@@ -176,24 +177,27 @@ const Content: FC<ContentProps> = (props) => {
     );
 };
 const HomeSearch: FC<PropsWithChildren<Props>> = (props) => {
+    const router = useRouter();
+
     const t = useTranslations("HomePage");
     const [visible, setVisible] = useState(false);
     const handler = () => {
-        setVisible(true);
+        router.push("/search");
     };
     return (
         <>
             <div
                 onClick={handler}
                 className={
-                    "flex items-center rounded-[0.03rem] bg-[url(/home/search.webp)] bg-[length:100%_100%] py-[12px]" +
-                    " rounded-[0.05rem] px-[10px] text-[#6e6e6e]"
+                    "flex items-center rounded-[0.03rem] rounded-[0.15rem] border border-[var(--primary-button)] px-[6px] py-[6px] text-[#6e6e6e]"
                 }
             >
                 <i
-                    className={"iconfont icon-sousuo1 mr-[0.0833rem] text-[0.16rem] text-[#85e0ee]"}
+                    className={
+                        "iconfont icon-sousuo mr-[0.0833rem] text-[0.16rem] text-[var(--textColor1)]"
+                    }
                 ></i>
-                <span className={"text-[0.12rem] text-[#85e0ee]"}>{t("search")}</span>
+                <span className={"text-[0.12rem] text-[var(--textColor1)]"}>{t("search")}</span>
             </div>
             <Mask visible={visible} opacity={0.9} getContainer={null}>
                 <Content closeHandler={() => setVisible(false)} />

+ 5 - 6
src/app/[locale]/(TabBar)/[[...share]]/layout.tsx

@@ -1,8 +1,8 @@
-import DownloadSection from "@/app/[locale]/(TabBar)/[[...share]]/_home/DownloadSection";
 import {
     PrizePlaceHolder,
     SwiperPlaceHolder,
 } from "@/app/[locale]/(TabBar)/[[...share]]/Placeholder";
+import Box from "@/components/Box";
 import Header from "@/components/Header";
 import { getTranslations } from "next-intl/server";
 import { FC, PropsWithChildren, ReactNode, Suspense } from "react";
@@ -53,9 +53,9 @@ const Layout: FC<PropsWithChildren<Props>> = async (props) => {
     return (
         <>
             <Suspense>{clientWidget}</Suspense>
-            <Suspense>
+            {/* <Suspense>
                 <DownloadSection />
-            </Suspense>
+            </Suspense> */}
             <Suspense>
                 <Header></Header>
             </Suspense>
@@ -87,9 +87,8 @@ const Layout: FC<PropsWithChildren<Props>> = async (props) => {
                 {/* 搜索下面的大奖展示 */}
                 {/*<Suspense fallback={<PrizePlaceHolder />}>{prizeWidget}</Suspense>*/}
                 {/* 搜索组件 */}
-                {/* <Box none className="mb-[.2rem] px-[.12rem]">
-                        {searchWidget}
-                    </Box> */}
+
+                <Box>{searchWidget}</Box>
                 {/* tabs 和 游戏列表 */}
                 <Suspense fallback={<PrizePlaceHolder />}>{children}</Suspense>
                 {/* 大奖 */}

+ 22 - 19
src/app/[locale]/(TabBar)/profile/page.tsx

@@ -151,25 +151,28 @@ const Page = () => {
             {token && <LoginedHeader></LoginedHeader>}
             {!token && <UnloginHeader></UnloginHeader>}
             <div className={clsx(styles.container, "mt-[.1rem]")}>
-                <div className="mb-[.15rem] flex items-center justify-between pt-[.1rem]">
-                    {topCfg.map((item) => {
-                        return (
-                            <div
-                                className="flex flex-1 flex-col items-center justify-center"
-                                key={item.text}
-                                onClick={item.handler}
-                            >
-                                <i
-                                    className={clsx(
-                                        "iconfont mb-[.0rem] text-[.24rem] text-[var(--primary-button)]",
-                                        `${item.icon}`
-                                    )}
-                                ></i>
-                                <span className="text-[.12rem]">{item.text}</span>
-                            </div>
-                        );
-                    })}
-                </div>
+                {getToken() && (
+                    <div className="mb-[.15rem] flex items-center justify-between pt-[.1rem]">
+                        {topCfg.map((item) => {
+                            return (
+                                <div
+                                    className="flex flex-1 flex-col items-center justify-center"
+                                    key={item.text}
+                                    onClick={item.handler}
+                                >
+                                    <i
+                                        className={clsx(
+                                            "iconfont mb-[.0rem] text-[.24rem] text-[var(--primary-button)]",
+                                            `${item.icon}`
+                                        )}
+                                    ></i>
+                                    <span className="text-[.12rem]">{item.text}</span>
+                                </div>
+                            );
+                        })}
+                    </div>
+                )}
+
                 {itemCfg.map((item) => {
                     return (
                         <div key={item.key} className="mb-[.1rem]" onClick={item.handler}>

+ 1 - 1
src/app/[locale]/(TabBar)/profile/unloginHeader.tsx

@@ -34,7 +34,7 @@ const UnloginHeader = () => {
                     type="primary"
                     className="relative !rounded-[.1rem] !px-[.13rem] !py-[.08rem]"
                     onClick={() => {
-                        router.push("/registe");
+                        router.push("/register");
                     }}
                 >
                     Cadastre-se

+ 5 - 2
src/app/[locale]/(enter)/components/Form/index.tsx

@@ -391,12 +391,15 @@ const FormComponent: FC<Props> = (props) => {
                             setIsRemeber(!isRemeber);
                         }}
                     >
-                        <i
+                        {/* <i
                             className={clsx("iconfont mr-[.1rem] text-[.16rem] text-[#ff5a00]", {
                                 "icon-xuanzhong": isRemeber,
                                 "icon-gouxuan-weixuanzhong-xianxingfangkuang": !isRemeber,
                             })}
-                        ></i>
+                        ></i> */}
+                        <div className="mr-[.1rem] flex h-[.16rem] !w-[.16rem] items-center justify-center border-[1px] border-[#ff5a00]">
+                            {isRemeber && <i className="iconfont icon-gou text-[#ff5a00]"></i>}
+                        </div>
                         <span className="text-[.12rem]">Lembrar a senha</span>
                     </div>
                 )}

+ 8 - 3
src/app/[locale]/(enter)/register/page.tsx

@@ -141,7 +141,7 @@ const Login = () => {
                                     setIsCanRegist(!isCanRegist);
                                 }}
                             >
-                                <i
+                                {/* <i
                                     className={clsx(
                                         "iconfont mr-[.1rem] text-[.16rem] text-[#ff5a00]",
                                         {
@@ -150,8 +150,13 @@ const Login = () => {
                                                 !isCanRegist,
                                         }
                                     )}
-                                ></i>
-                                <span className="text-[.12rem] leading-[1]">
+                                ></i> */}
+                                <div className="mr-[.1rem] flex h-[.16rem] !w-[.16rem] items-center justify-center border-[1px] border-[#ff5a00]">
+                                    {isCanRegist && (
+                                        <i className="iconfont icon-gou text-[#ff5a00]"></i>
+                                    )}
+                                </div>
+                                <span className="flex-1 text-[.12rem] leading-[1]">
                                     Eu aceito todas as Políticas e Privacidade e confirmo que tenho
                                     peloamenos 18 anos
                                 </span>

+ 9 - 5
src/app/globals.scss

@@ -86,13 +86,17 @@
     --swiper-pagination-bullet-border-radius: 0.03rem;
     .swiper-pagination {
         position: initial;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        height: 10px;
         .swiper-pagination-bullet {
-            background-color: var(--main-background);
-            width: 0.054rem;
-            opacity: 1;
+            background: var(--main-background) !important;
+            width: 0.06rem;
+            opacity: 1 !important;
             &.swiper-pagination-bullet-active {
-                width: 0.15rem;
-                background-color: var(--textColor4);
+                width: 0.18rem;
+                background: var(--textColor4) !important;
             }
         }
     }

+ 10 - 4
src/components/Card/Card.tsx

@@ -189,10 +189,16 @@ const Card: FC<PropsWithChildren<CardProps>> = (props) => {
                         height={"100%"}
                         className={"h-[100%] w-[100%]"}
                     ></CustomImage>
-                    {props.isShowOnline && item?.online_user && (
-                        <div className={styles.cardOnline}>{item?.online_user}</div>
+                    {/* && item?.online_user */}
+                    {props.isShowOnline && (
+                        <div className={styles.cardOnline}>
+                            <i className="iconfont icon-fangke2 text-[.08rem] text-[#11de68]"></i>
+                            <span className="relative top-[1px] ml-[.04rem] text-[.1rem]">
+                                {item?.online_user}
+                            </span>
+                        </div>
                     )}
-                    {props.isShowFavorite && (
+                    {/* {props.isShowFavorite && (
                         <div
                             className={clsx(styles.favorite, { [styles.active]: isFavorite })}
                             onClick={doFavorite}
@@ -202,7 +208,7 @@ const Card: FC<PropsWithChildren<CardProps>> = (props) => {
                             )}
                             {!isFavorite && <i className="iconfont icon-shoucang text-[#fff]"></i>}
                         </div>
-                    )}
+                    )} */}
                 </div>
             )}
 

+ 20 - 14
src/components/Card/style.module.scss

@@ -20,21 +20,27 @@
 }
 .cardOnline {
     position: absolute;
-    left: 0.1rem;
-    bottom: 0.05rem;
-    font-size: 0.12rem;
+    right: 0.05rem;
+    top: 0.1rem;
+    font-size: 0.1rem;
     color: #fff;
-    &::before {
-        content: "";
-        display: inline-block;
-        width: 0.04rem;
-        height: 0.04rem;
-        background: #11dd68;
-        border-radius: 50%;
-        margin-right: 0.02rem;
-        position: relative;
-        top: -0.02rem;
-    }
+    background: rgba(0, 0, 0, 0.4);
+    padding: 2px 6px;
+    border-radius: 0.1rem;
+    display: flex;
+    align-items: center;
+    line-height: 1;
+    // &::before {
+    //     content: "";
+    //     display: inline-block;
+    //     width: 0.04rem;
+    //     height: 0.04rem;
+    //     background: #11dd68;
+    //     border-radius: 50%;
+    //     margin-right: 0.02rem;
+    //     position: relative;
+    //     top: -0.02rem;
+    // }
 }
 .favorite {
     position: absolute;

+ 2 - 0
src/components/HomeWheel/index.tsx

@@ -132,4 +132,6 @@ const HomeWheel = (props: any) => {
     );
 };
 
+HomeWheel.displayName = "HomeWheel";
+
 export default HomeWheel;

+ 2 - 0
src/feedback/Help/index.tsx

@@ -38,6 +38,8 @@ export const FooterCheck = React.forwardRef<{ getValue: () => boolean }, FooterC
         );
     }
 );
+FooterCheck.displayName = "FooterCheck";
+
 export const showImage = async ({
     imgUrl,
     showAgain = false,