zhejiushizhuce před 2 roky
rodič
revize
314b8e6366

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
src/assets/tabicon/gift.svg


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
src/assets/tabicon/message.svg


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 3 - 7
src/assets/tabicon/pay.svg


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
src/assets/tabicon/sett.svg


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
src/assets/tabicon/withdraw.svg


+ 16 - 3
src/components/SvgIcon/index.jsx

@@ -8,10 +8,23 @@ const SvgIcon=({herf,mobile=false,...props})=>{
         }
         return symbol+"#"+herf;
     }
+    const formatOL=()=>{
+        if (herf.startsWith("http://")||herf.startsWith("https://")){
+            return true;
+        }
+        return false;
+    }
     return (
-        <svg {...props}>
-            <use xlinkHref={formatHerf()} />
-        </svg>
+        <>
+            {
+                formatOL()?(<img {...props} src={herf}/>):
+                    (
+                        <svg {...props}>
+                             <use xlinkHref={formatHerf()} />
+                        </svg>
+                    )
+            }
+        </>
     )
 }
 export default SvgIcon;

+ 5 - 1
src/contexts/themeContext.js

@@ -31,6 +31,8 @@ export const ThemeProvider = ({children}) => {
 
     const [searchData,setSearchData]=useState(null);
 
+    const [showHeader, setShowHeader] = useState(true);
+
     //GameSearch
 
     const stopTransition = () => {
@@ -103,7 +105,9 @@ export const ThemeProvider = ({children}) => {
                 initHeaderHeight,
                 isShowSearch,
                 searchData,
-                showGameSearchPanel
+                showGameSearchPanel,
+                showHeader,
+                setShowHeader
             }}>
             {children}
         </ThemeContext.Provider>

+ 5 - 5
src/layout/BottomNav/index.jsx

@@ -63,14 +63,14 @@ const BottomNav = () => {
                 {/*<svg className={"icon"}>*/}
                 {/*    <use xlinkHref={`${ticon_gift}#gift`} />*/}
                 {/*</svg>*/}
-                <TabGift className={"icon"}></TabGift>
+                <TabGift className={styles.icon}></TabGift>
                 <span>{i18n.t("tab.promotion")}</span>
             </button>
             <NavLink className={styles.button} to="/" aria-label="Home">
                 {/*<svg className={"icon"}>*/}
                 {/* <use xlinkHref={`${symbol_m}#icon_Home_1`} />*/}
                 {/*</svg>*/}
-                <TabWithdraw className={"icon"}></TabWithdraw>
+                <TabWithdraw className={styles.icon}></TabWithdraw>
                 <span>{i18n.t("tab.withdraw")}</span>
             </NavLink>
             <NavLink className={styles.button} to="/promotions">
@@ -80,7 +80,7 @@ const BottomNav = () => {
                             {/*<svg className={"icon"}>*/}
                             {/*    <use xlinkHref={`${symbol_m}#icon_Promotions`} />*/}
                             {/*</svg>*/}
-                            <TabPay className={"icon"}></TabPay>
+                            <TabPay className={styles.icon_yellow}></TabPay>
                         </div>
                     </div>
                 </div>
@@ -90,7 +90,7 @@ const BottomNav = () => {
                 {/*<svg className={"icon"}>*/}
                 {/*    <use xlinkHref={`${symbol_m}#icon_Account`} />*/}
                 {/*</svg>*/}
-                <TabMessage className={"icon"}></TabMessage>
+                <TabMessage className={styles.icon}></TabMessage>
                 <span>{i18n.t("tab.message")}</span>
             </button>
             <button className={styles.button}>
@@ -98,7 +98,7 @@ const BottomNav = () => {
                 {/*<svg className={"icon"}>*/}
                 {/*    <use xlinkHref={`${symbol}#icon_Chat`} />*/}
                 {/*</svg>*/}
-                <TabSett className={"icon"}></TabSett>
+                <TabSett className={styles.icon}></TabSett>
                 <span>{i18n.t("tab.service")}</span>
             </button>
         </div>

+ 14 - 4
src/layout/BottomNav/styles.module.scss

@@ -29,14 +29,24 @@
     color: var(--text);
     &:hover {
         color: var(--header);
-        svg{
+        & .icon{
             fill: var(--header);
+            g{
+                fill: var(--header);
+            }
         }
     }
-    svg{
-        width: 1.8rem;
-        height: 1.8rem;
+    & .icon{
+        width: 1.3rem;
+        height: 1.3rem;
         fill: var(--text);
+        g{
+            fill: var(--text);
+        }
+    }
+    & .icon_yellow{
+        width: 2.8rem;
+        height: 2.8rem;
     }
     & .yellow_txt{
         color: #d5c0a4;

+ 5 - 2
src/layout/BreadCrumb/index.jsx

@@ -8,10 +8,11 @@ import {useThemeProvider} from "@contexts/themeContext";
 import SvgIcon from "@components/SvgIcon";
 const i18n=global.i18n;
 const BreadCrumb=()=>{
-    const {isMobile} = useThemeProvider();
+    const {isMobile,showHeader,setShowHeader} = useThemeProvider();
     const {pathname} = useLocation();
     const chain=useSelector(getRouteChain(pathname));
     const currRoute=useSelector(getRoute(pathname));
+
     useEffect(() => {
     }, [pathname]);
     const renderDesktop=()=>{
@@ -45,7 +46,9 @@ const BreadCrumb=()=>{
     }
     const renderMobile=()=>{
         let len=chain.length;
-        if (len<=1)return (<></>);
+        if (len<=1){
+            return (<></>);
+        }
         return (
             <div className={styles.container_m}>
                 <div className={styles.game_nav_path}>

+ 2 - 2
src/layout/Navbar/index.jsx

@@ -249,8 +249,8 @@ const PageHeader = () => {
         };
     }, []);
 
-    const {isMobile} = useThemeProvider();
-    const [showHeader, setShowHeader] = useState(true);
+    const {isMobile,showHeader,setShowHeader} = useThemeProvider();
+    // const [showHeader, setShowHeader] = useState(true);
     const headerAni=useSpring({
         from: {transform: 'translateY(-100%) translateZ(0px)'},
         transform:showHeader?'translateY(0%) translateZ(0px)':'translateY(-100%) translateZ(0px)',

+ 1 - 1
src/layout/Routes/index.jsx

@@ -7,7 +7,7 @@ const PageNotFound = lazy(() => import('@pages/PageNotFound'));
 
 const createRoute=(props)=>{
     const {route,basePath}=props;
-    const component=(route.component!=null&&route.component!="")?route.component:"ModulePage";
+    const component=(route.component!=null&&route.component!=="")?route.component:"ModulePage";
     const Component = AllComponents[component];
     const checkLogin=()=>{
         return (

+ 12 - 4
src/layout/Sidebar/styles.js

@@ -155,7 +155,7 @@ const StyledAccordionDetails = styled(AccordionDetails)`
   ${(props) => {
     let olStyle=props.olStyle;
     if (olStyle==null)return ``;
-    const {button,icon,text,radius}=olStyle;
+    const {button,icon,text,radius,gap,fontsize,weight}=olStyle;
     let btnN=getColor(button,COLOR_TYPE_NOMAL);
     let btnH=getColor(button,COLOR_TYPE_HONER);
     let btnA=getColor(button,COLOR_TYPE_ACTIVE);
@@ -167,7 +167,10 @@ const StyledAccordionDetails = styled(AccordionDetails)`
     let textA=getColor(text,COLOR_TYPE_ACTIVE);
     return `
           a {
+            gap:${gap};
             color:${textN};
+            font-size:${fontsize};
+            font-weight:${weight};
             border-radius:${radius} !important;
             .icon {
               fill: ${icoN};
@@ -269,7 +272,7 @@ const SingleLink=styled.div`
   ${(props) => {
     let olStyle=props.olStyle;
     if (olStyle==null)return ``;
-    const {button,icon,text,radius,direction}=olStyle;
+    const {button,icon,text,radius,direction,gap,fontsize,weight}=olStyle;
     let btnN=getColor(button,COLOR_TYPE_NOMAL);
     let btnH=getColor(button,COLOR_TYPE_HONER);
     let btnA=getColor(button,COLOR_TYPE_ACTIVE);
@@ -280,12 +283,14 @@ const SingleLink=styled.div`
     let textH=getColor(text,COLOR_TYPE_HONER);
     let textA=getColor(text,COLOR_TYPE_ACTIVE);
     let flex_d=direction==="horizontal"?"row":"column";
-    let gap=flex_d=="row"?"12px":"6px";
+    // let gap=flex_d=="row"?"12px":"6px";
     return `
         border-radius: ${radius} !important;
         a {
           flex-direction: ${flex_d};
           gap:${gap};
+          font-size:${fontsize};
+          font-weight:${weight};
           border-radius: ${radius} !important;
           background-color: ${btnN} !important;
           color:${textN};
@@ -341,7 +346,7 @@ const Link = styled.span`
   ${(props) => {
     let olStyle=props.olStyle;
     if (olStyle==null)return ``;
-    const {icon,text}=olStyle;
+    const {icon,text,gap,fontsize,weight}=olStyle;
     let icoN=getColor(icon,COLOR_TYPE_NOMAL);
     let icoH=getColor(icon,COLOR_TYPE_HONER);
     let icoA=getColor(icon,COLOR_TYPE_ACTIVE);
@@ -350,6 +355,9 @@ const Link = styled.span`
     let textA=getColor(text,COLOR_TYPE_ACTIVE);
     return `
         color:${textN};
+        gap:${gap};
+        font-size:${fontsize};
+        font-weight:${weight};
         & .icon {
           fill:${icoN};
         }

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů