username hai 1 ano
pai
achega
6ed6871421

BIN=BIN
public/img/a.png


+ 20 - 1
src/app/[locale]/(ordinary)/profile/page.scss

@@ -36,14 +36,20 @@
         height: .36rem;
         font-size: .14rem;
         color: #000;
+
         .bgImg {
           width: .36rem;
           height: .36rem;
           margin-right: .1rem;
           background-color: transparent;
-          background-image: url('/img/logo.webp');
+          background: url('/img/logo.webp') no-repeat center;
           background-size: 100% 100%;
+
+          &.default {
+            background-size: 80% 80%;
+          }
         }
+        
         & > div {
           display: -webkit-box;
           display: -ms-flexbox;
@@ -101,6 +107,11 @@
         .iconfont {
           margin: 0 .08rem;
           font-size: .18rem;
+          color: #000;
+
+          &.icon-gift2 {
+            width: .32rem;
+          }
         }
 
         & > div {
@@ -112,6 +123,14 @@
         div {
           span {
             font-size: .12rem;
+            color: #333;
+            display: flex;
+            align-items: center;
+
+            .a {
+              width: .14rem;
+              margin-left: .03rem;
+            }
           }
           .num {
             width: 100%;

+ 8 - 9
src/app/[locale]/(ordinary)/profile/page.tsx

@@ -1,7 +1,7 @@
 "use client";
 import { FC, PropsWithChildren } from "react";
 import { useRouter } from "@/i18n";
-// import ButtonOwn from "@/components/ButtonOwn";
+import clsx from "clsx";
 import ItemCom from "./component/ItemCom";
 import './page.scss'
 import { useGlobalStore } from '@/stores';
@@ -9,7 +9,7 @@ import {getLogoutApi} from "@/api/user";
 
 interface Props {}
 
-const Profile: FC<PropsWithChildren<Props>> = (props) => {
+const Profile: FC<PropsWithChildren<Props>> = () => {
     const { token, setToken, userInfo, setUserInfo } = useGlobalStore();
 
     const logoutRequest = async () => {
@@ -26,16 +26,17 @@ const Profile: FC<PropsWithChildren<Props>> = (props) => {
         router.push(path)
     }
 
+    const divClassName = clsx('bgImg', token && 'default');
     return (
         <div className="profile-box">
             <div className="userContent">
                 <div className="userInfo">
                     <div>
-                        <div className="bgImg"></div>
+                        <div className={divClassName}></div>
                         {
                             token && (
                                 <div>
-                                    <span>{userInfo?.user_name || ''}</span>
+                                    <span>{userInfo?.user_name || '昵称'}</span>
                                     <span className="phone">{userInfo?.user_phone || ''}</span>
                                 </div>
                             )
@@ -50,7 +51,7 @@ const Profile: FC<PropsWithChildren<Props>> = (props) => {
                     token && (
                         <div className="coin">
                             <div>
-                                <span className="iconfont icon-wallet"></span>
+                                <span className="iconfont icon-icon-wallet"></span>
                                 <div>
                                     <span> Saldo </span>
                                     <div className="num">
@@ -62,7 +63,7 @@ const Profile: FC<PropsWithChildren<Props>> = (props) => {
                             <div>
                                 <span className="iconfont icon-gift2"></span>
                                 <div>
-                                    <span> Bônus </span>
+                                    <span> Bônus <img className="a" src="/img/a.png" alt="" /></span>
                                     <div className="num">
                                         <span className="uppercase">brl </span>
                                         <span>0.00</span>
@@ -76,9 +77,7 @@ const Profile: FC<PropsWithChildren<Props>> = (props) => {
 
             <div className="link">
                 <span  onClick={() => goPage('/deposit')}>Depósito</span>
-                <span  onClick={() => goPage('/withdraw')}>Sacar</span>
-                {/* <ButtonOwn active={true}>Depósito</ButtonOwn>
-                <ButtonOwn active={true}>Sacar</ButtonOwn> */}
+                <span  onClick={() => goPage(token ? '/withdraw' : `/login?redirect=withdraw`)}>Sacar</span>
             </div>
 
             <ItemCom />

+ 5 - 1
src/app/[locale]/login/page.tsx

@@ -1,6 +1,7 @@
 "use client";
 import { FC, PropsWithChildren, useState } from "react";
 import { useRouter } from "@/i18n";
+import { useSearchParams } from "next/navigation";
 import HeaderBack from "@/components/HeaderBack";
 import GoogleCom from "./component/GoogleCom";
 import FromCom from "./component/FromCom";
@@ -15,6 +16,9 @@ const Login: FC<PropsWithChildren<Props>> = () => {
     const { setToken, setUserInfo } = useGlobalStore();
 
     const router:any = useRouter()
+    let searchParams = useSearchParams();
+    let redirect = searchParams.get('redirect') || ''
+
     const [msgError, setMsgError] = useState('')
     const loginRequest = async ({userPhone, pwd}: any) => {
         let params = {user_phone: userPhone, pwd}
@@ -23,7 +27,7 @@ const Login: FC<PropsWithChildren<Props>> = () => {
             alert('登录成功')
             setUserInfo({...res.data, user_phone: userPhone})
             setToken(res.data.token)
-            router.replace('/')
+            router.replace('/' + redirect)
         }
         setMsgError(res.msg || '')
     }

+ 7 - 3
src/styles/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4617618 */
-  src: url('iconfont.woff2?t=1721445755488') format('woff2'),
-       url('iconfont.woff?t=1721445755488') format('woff'),
-       url('iconfont.ttf?t=1721445755488') format('truetype');
+  src: url('iconfont.woff2?t=1721636933902') format('woff2'),
+       url('iconfont.woff?t=1721636933902') format('woff'),
+       url('iconfont.ttf?t=1721636933902') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-icon-wallet:before {
+  content: "\e796";
+}
+
 .icon-tishi1:before {
   content: "\e61d";
 }

BIN=BIN
src/styles/iconfont/iconfont.ttf


BIN=BIN
src/styles/iconfont/iconfont.woff


BIN=BIN
src/styles/iconfont/iconfont.woff2