浏览代码

no message

zhejiushizhuce 2 年之前
父节点
当前提交
690fa75436
共有 4 个文件被更改,包括 32 次插入 和 27 次删除
  1. 15 12
      src/layout/Navbar/index.jsx
  2. 13 11
      src/layout/Sidebar/index.jsx
  3. 3 3
      src/layout/Sidebar/styles.js
  4. 1 1
      src/locales/languages/en_US.json

+ 15 - 12
src/layout/Navbar/index.jsx

@@ -126,13 +126,14 @@ const DesktopNavToggle=()=>{
 const DesktopSignInUp=()=>{
     const navigate=useNavigate();
     const isLogin=useSelector(isLogined);
+    const {setIsShowLang} = useThemeProvider();
     return (
         <div className="d-flex align-items-center justify-content-end">
-            <IconButton aria-label="search">
-                <svg className={"ls-icon"} style={{width:'20px',height:'20px'}}>
-                    <use xlinkHref={`${symbol}#icon_Search`} />
-                </svg>
-            </IconButton>
+            {/*<IconButton aria-label="search">*/}
+            {/*    <svg className={"ls-icon"} style={{width:'20px',height:'20px'}}>*/}
+            {/*        <use xlinkHref={`${symbol}#icon_Search`} />*/}
+            {/*    </svg>*/}
+            {/*</IconButton>*/}
             {
                 !isLogin?(
                     <>
@@ -148,13 +149,15 @@ const DesktopSignInUp=()=>{
                     </>
                 )
             }
-            <Button  className="m-button">
-                <svg className={"ls-icon"} style={{width:'20px',height:'20px'}}>
-                    <use xlinkHref={`${symbol}#icon_Chat`} />
-                </svg>
-                <div className="chat-green-dont"></div>
-            </Button>
-            <Button  className="m-button" style={{marginLeft: '0.5rem',marginRight:'0.5rem'}}>
+            {/*<Button  className="m-button">*/}
+            {/*    <svg className={"ls-icon"} style={{width:'20px',height:'20px'}}>*/}
+            {/*        <use xlinkHref={`${symbol}#icon_Chat`} />*/}
+            {/*    </svg>*/}
+            {/*    <div className="chat-green-dont"></div>*/}
+            {/*</Button>*/}
+            <Button  className="m-button" style={{marginLeft: '0.5rem',marginRight:'0.5rem'}} onClick={()=>{
+                setIsShowLang(true);
+            }}>
                 <svg className={"ls-icon"} style={{width:'20px',height:'20px'}}>
                     <use xlinkHref={`${symbol}#icon_Language`} />
                 </svg>

+ 13 - 11
src/layout/Sidebar/index.jsx

@@ -223,9 +223,10 @@ const Sidebar = () => {
         let lv=currRoute.lv;
         return lv===link.lv;
     }
-    const renderIconLink=(link,olstyle)=>{
+    const renderIconLink=(link,olstyle,lIcon=null)=>{
         let ispop=link.type===ROUTE_TYPE_POP||link.type===ROUTE_TYPE_POP_OR_FULL||link.type===ROUTE_TYPE_OUTLINK;
         let linkIcon=(<SvgIcon className={"icon"} herf={link.icon}/>);
+        if (lIcon!=null)linkIcon=lIcon;
         let target=link.type===ROUTE_TYPE_OUTLINK?"_blank":"";
         let linkA=ispop?(
             <a href={link.path} target={target}>
@@ -345,30 +346,31 @@ const Sidebar = () => {
     }
     const renderBonus=()=>{
         let styles=getolstyles(0);
-        let herf=ROUTE_PATH.PROMOTION;
-        let link={type:0,title:'links.bonus',icon:'icon_Gift',path:herf}
+        let herf=ROUTE_PATH.CHECK_IN;
+        let link={type:0,title:'links.check_in',icon:'icon_Gift',path:herf}
         return (
             <StyledBlock open={open}>
                 <StyledBonus className="d-flex flex-column g-6" open={open}>
                     {
                         open?(
                             <SingleLink olstyle={styles}>
-                                <NavLink className={`${pathname === herf ? 'active' : ''} h4`} to={herf}>
-                                    <SvgIcon className={"icon"} herf={"icon_Gift"}/>
-                                    {i18n.t("links.bonus")}
+                                <NavLink className={`${pathname === herf ? 'active' : ''} h4`} to={ROUTE_PATH.CHECK_IN}>
+                                    {/*<SvgIcon className={"icon"} herf={"icon_Gift"}/>*/}
+                                    <CheckInIcon className={"icon"}/>
+                                    {i18n.t("links.check_in")}
                                 </NavLink>
                             </SingleLink>
-                        ):renderIconLink(link,styles)
+                        ):renderIconLink(link,styles,(<CheckInIcon className={"icon"}/>))
                     }
                     <StyledAct open={open} enter={isActHovered} onMouseEnter={handleActEnter} onMouseLeave={handleActLeave}>
                         <div className="bonus-item li-quests">
                             <button className="bonus-item-btn" onClick={()=>{
-                                navigate(ROUTE_PATH.CHECK_IN);
+                                navigate(ROUTE_PATH.PROMOTION);
                             }}>
                                 {/*<img className="img-bg" src={questsimg} alt={"quests"}/>*/}
-                                {/*<SvgIcon className={"icon-bonus"} herf={"icon_Gift"}/>*/}
-                                <CheckInIcon className={"icon-bonus iconshake"}></CheckInIcon>
-                                {open?i18n.t("links.check_in"):""}
+                                <SvgIcon className={"icon-bonus"} herf={"icon_Gift"}/>
+                                {/*<CheckInIcon className={"icon-bonus iconshake"}></CheckInIcon>*/}
+                                {open?i18n.t("links.bonus"):""}
                             </button>
                         </div>
                         <div className="bonus-item li-spin">

+ 3 - 3
src/layout/Sidebar/styles.js

@@ -531,11 +531,11 @@ const StyledAct=styled.div`
       font-weight: 700;
       color:var(--header);
       & .icon-bonus{
-        margin-left: 0.5rem;
-        margin-right: 0.5rem;
+        margin-left: 0.3rem;
+        margin-right: 0.3rem;
         width: 1.8rem;
         height: 1.8rem;
-        fill:#f6e4f4;
+        fill:#b891ff;
       }
       & .img-bg{
         width: auto;

+ 1 - 1
src/locales/languages/en_US.json

@@ -31,7 +31,7 @@
     "live_events": "Live Events",
     "basketball": "Basketball",
     "fifa": "FIFA",
-    "bonus": "Bonus",
+    "bonus": "BONUS",
     "live_support": "Live Support",
     "quest": "QUEST",
     "spin": "SPIN",