Merge branch 'feature-Before' into dev

src/app/[locale]/(TabBar)/profile/component/ItemCom/index.tsx

@@ -19,6 +19,7 @@ export interface ItemComProps {
 
 const ItemCom: FC<ItemComProps> = ({ max, type = "login" }) => {
     const t = useTranslations("ProfilePage");
+    const tall = useTranslations();
     const router = useRouter();
     const { unread, userUnread } = useGlobalNoticeStore((state) => ({
         unread: state.unread,
@@ -74,6 +75,14 @@ const ItemCom: FC<ItemComProps> = ({ max, type = "login" }) => {
             url: "/notification",
             content: unread || userUnread ? Badge.dot : null,
         },
+        {
+            label: tall("HomePage.Contante"),
+            desc: "",
+            icon: "icon-dakaixinxi",
+            color: "#b09959",
+            url: "/concat",
+            content: unread || userUnread ? Badge.dot : null,
+        },
     ];
     const routerHandler = (item: any) => {
         if (item.url === "/cashWheel") {

src/app/[locale]/(enter)/login/page.tsx

@@ -8,7 +8,9 @@ import GoogleCom from "../components/GoogleCom";
 const Login = async () => {
     const t = await getTranslations("LoginPage");
     const services = await getServicesApi();
+    console.log(`🚀🚀🚀🚀🚀-> in page.tsx on 11`, services);
     const defaultService = services?.filter((item) => item.register_show === 1);
+
     return (
         <>
             <GoogleCom />
@@ -21,23 +23,24 @@ const Login = async () => {
             <div
                 className={`absolute bottom-[0.84rem] right-[0.12rem] z-50 flex w-[0.6944rem] flex-col items-center justify-center`}
             >
-                {defaultService.map((item, index) => (
-                    <Link
-                        key={index}
-                        href={item.url}
-                        className={
-                            "flex h-[0.54rem] w-[0.54rem] items-center justify-center rounded-[50%]" +
-                            " bg-gradient-to-t from-[#ff611b] to-[#ffcf35]"
-                        }
-                        target={"_blank"}
-                    >
-                        <img
-                            className={"h-[0.3889rem] w-[0.3889rem] object-contain"}
-                            src={item.icon_url}
-                            alt={""}
-                        ></img>
-                    </Link>
-                ))}
+                {defaultService &&
+                    defaultService.map((item, index) => (
+                        <Link
+                            key={index}
+                            href={item.url}
+                            className={
+                                "flex h-[0.54rem] w-[0.54rem] items-center justify-center rounded-[50%]" +
+                                " bg-gradient-to-t from-[#ff611b] to-[#ffcf35]"
+                            }
+                            target={"_blank"}
+                        >
+                            <img
+                                className={"h-[0.3889rem] w-[0.3889rem] object-contain"}
+                                src={item.icon_url}
+                                alt={""}
+                            ></img>
+                        </Link>
+                    ))}
             </div>
         </>
     );

src/app/[locale]/(navbar)/concat/page.tsx

@@ -33,7 +33,7 @@ const Page = async () => {
                                 "iconfont icon-duanxinguanli mr-[0.0694rem] text-[0.16rem] text-[#999]"
                             }
                         ></span>
-                        <span>{t("concat")}：</span>
+                        <span className={"text-[#fff]"}>{t("concat")}：</span>
                         <span className={"text-[#56b83f]"}>{item.email}</span>
                     </a>
                 ))}

src/app/[locale]/(navbar)/recharge/page.tsx

@@ -1,4 +1,3 @@
-import { getConfigApi } from "@/api/config";
 import { PayDataType } from "@/api/promo";
 import DomainFooter from "@/components/DomainFooter";
 import { Link } from "@/i18n/routing";
@@ -194,7 +193,7 @@ const Page = async () => {
                                             </div>
                                         </Link>
                                     </div>
-                                    <div>100 grátis grátis para começar a jogar imediatamente</div>
+                                    <div>25 grátis para começar a jogar imediatamente</div>
                                 </div>
                             </div>
                         )}