Merge branch 'master' into xudh

public/.well-known/assetlinks.json

@@ -0,0 +1,5 @@
+[{
+  "relation": ["delegate_permission/common.handle_all_urls"],
+  "target" : { "namespace": "android_app", "package_name": "com.app_24680.twa",
+    "sha256_cert_fingerprints": ["2E:F4:A1:2E:BF:A8:29:B4:06:88:73:93:22:32:55:55:E2:07:2A:1B:15:D2:9F:E7:32:82:42:C3:E5:B1:90:65"] }
+}]

public/sitemap.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset
+        xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9
+       http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd"
+>
+
+    <url>
+        <loc>http://24680.com</loc>
+        <priority>0.3</priority>
+        <lastmod>2024-06-17</lastmod>
+        <changefreq>weekly</changefreq>
+    </url>
+
+</urlset>

src/assets/symbol-defs.svg

@@ -824,6 +824,21 @@
         <path d="M332.584149,128 C387.910938,128 443.248113,145.17786 489.96482,179.924443 C504.079538,190.427592 523.179588,190.6581 537.47087,180.415525 C642.193981,105.400189 788.253795,115.753007 881.780683,211.243471 C982.058541,314.240478 985.922172,480.436779 893.350806,587.993837 L887.787748,594.485645 L887.787748,594.485645 L542.96512,947.416012 C528.205425,962.524311 505.201238,964.027023 488.800215,951.931454 L483.598136,947.395968 L142.393769,597.715263 L133.492876,587.993837 L133.492876,587.993837 C37.9614692,480.446801 40.9215095,312.42648 142.393769,208.517462 C194.905923,154.738933 263.745036,128 332.584149,128 Z M394.034943,244.918639 C389.66512,229.096154 373.293818,219.807692 357.471333,224.177515 C296.842635,240.911243 246.361866,280.25 215.327842,334.955621 C184.283463,389.661243 176.413641,453.178994 193.147369,513.807692 C196.781984,526.97929 208.742043,535.62574 221.779025,535.62574 C224.388493,535.62574 227.060091,535.284024 229.721333,534.548817 C245.543818,530.178994 254.83228,513.807692 250.462457,497.985207 C224.637014,404.427515 279.736126,307.307692 373.293818,281.482249 C389.116304,277.112426 398.404765,260.741124 394.034943,244.918639 Z" id="形状" fill="url(#linearGradient-1)" fill-rule="nonzero"></path>
     </g>
 </symbol>
+<symbol id="icon_Giftbox"  viewBox="0 0 320 320" >
+
+		<path d="M53.2,123.4c-1.5,1.5-1.5,3.8,0,5.3l104.4,36.9c-0.4-0.5-0.6-0.8-0.6-0.8v-58.8c0,0-28.1,12.2-28.3,12.7
+			c-5.7,3.2-7.4-2.2-7.4-2.2l1.4-16.6L53.2,123.4z M270.9,123.4l-71-23.6c0.2,2.8,1.2,16.1,1.4,15.8c0.7,5.2-5.2,3.7-5.2,3.7
+			l-29.8-13.4c0,0-0.2,59.1,0,59.6c-1.1,1.2-2.1,1.8-3,2.1c1,0,2-0.3,2.7-1.1l104.9-37.9C272.3,127.2,272.3,124.9,270.9,123.4z
+			 M310.5,173.2l-25-39c-0.9-1.8-3.2-2.6-5-1.6l-109,39.5c-1.8,0.9-2.6,3.2-1.6,5l25.7,39c0.9,1.8,3.2,2.6,5,1.6l108.3-39.5
+			C310.8,177.3,311.5,175.1,310.5,173.2z M127.9,216.2l25.7-39c0.9-1.8,0.2-4.1-1.6-5L43,132.6c-1.8-0.9-4.1-0.2-5,1.6l-25,39
+			c-0.9,1.8-0.2,4.1,1.6,5l108.3,39.5C124.7,218.7,127,218,127.9,216.2z M281.4,201.3c0.7-4-3-3-3-3s-75.7,27.8-76.7,28.3
+			c-7.4,4.2-10.4-1.5-10.4-1.5l-24.6-38.7L166,303.3c0.2,3.2,3.7,2.2,3.7,2.2s109.7-39.5,109.5-39.5c3.5,0.5,2.2-3.7,2.2-3.7
+			S281.2,201.3,281.4,201.3z M132.7,225.1c0,0-3,5.7-10.4,1.5c-1-0.5-76.7-28.3-76.7-28.3s-3.7-1-3,3c0.2,0,0,61.1,0,61.1
+			s-1.2,4.2,2.2,3.7c-0.2,0,109.5,39.5,109.5,39.5s3.5,1,3.7-2.2l-0.7-116.9L132.7,225.1z M190.7,78.1l16.9-24.6l-27.7-11.1
+			l-18.1-23.7l-19.1,22.9l-28.1,9.9l15.9,25.2l0.8,29.8l28.9-7.3l28.6,8.5L190.7,78.1z M51.5,79.2l11.9-7.9l14.3-0.7l-3.8-13.8
+			L77.7,43l-14.3-0.6l-12-7.9l-5,13.4l-11.2,8.9l11.2,8.9L51.5,79.2z M258.7,71.3l11.9,7.9l5.1-13.4l11.2-8.9l-11.2-8.9l-5-13.4
+			l-12,7.9L244.4,43l3.8,13.8l-3.8,13.8L258.7,71.3z"/>
+</symbol>
 
 <symbol id="icon_Aviatrix" viewBox="0 0 300 300">
     <defs>

src/layout/BottomNav/index.jsx

@@ -7,7 +7,7 @@ import SearchPopup from './SearchPopup';
 import SettingsPopup from './SettingsPopup';
 
 // hooks
-import {useState} from 'react';
+import React, {useState} from 'react';
 import useStoreRoute from '@hooks/useStoreRoute';
 import {useShopProvider} from '@contexts/shopContext';
 import symbol_m from "@assets/symbol-mobile.svg";
@@ -15,6 +15,7 @@ import symbol from "@assets/symbol-defs.svg";
 import {ReactComponent as TabGift} from '@assets/tabicon/gift.svg';
 import {ReactComponent as TabWithdraw} from '@assets/tabicon/withdraw.svg';
 import {ReactComponent as TabPay} from '@assets/tabicon/pay.svg';
+import shopIcon from '@assets/tabicon/deposit.png';
 import {ReactComponent as TabMessage} from '@assets/tabicon/message.svg';
 import {ReactComponent as TabSett} from '@assets/tabicon/sett.svg';
 import {ROUTE_PATH} from "@constants/routes";
@@ -65,49 +66,65 @@ const BottomNav = () => {
     // )
     return (
         <div className={`${styles.container} ${isStandalone?styles.container_full:''}`}>
+            <svg aria-hidden="true" focusable="false" style={{width:0,height:0,position:"absolute"}}>
+                <linearGradient id="gradient-vertical" x1="0%" y1="0%" x2="0%" y2="100%">
+                    <stop offset="0%" stopColor="#fffee7"/>
+                    <stop offset="50%" stopColor="#e4f6ee"/>
+                    <stop offset="100%" stopColor="#d6fede"/>
+                </linearGradient>
+                <linearGradient id="gradient-vertical-dark" x1="0%" y1="0%" x2="0%" y2="100%">
+                    <stop offset="0%" stopColor="#807f74"/>
+                    <stop offset="50%" stopColor="#757c77" />
+                    <stop offset="100%" stopColor="#386b42" />
+                </linearGradient>
+            </svg>
             <NavLink className={styles.button} to={ROUTE_PATH.PROMOTION}>
                 {/*<svg className={"icon"}>*/}
                 {/*    <use xlinkHref={`${ticon_gift}#gift`} />*/}
                 {/*</svg>*/}
-                <TabGift className={styles.icon}/>
-                <span>{i18n.t("tab.promotion")}</span>
+                {/*<TabGift className={styles.icon}/>*/}
+                <svg className={styles.bottomicon}>
+                    <use xlinkHref={`${symbol}#icon_Giftbox`}/>
+                </svg>
+                <span className={styles.bottomtxt}>{i18n.t("tab.promotion")}</span>
             </NavLink>
             <NavLink className={styles.button} to={ROUTE_PATH.SAQUE} aria-label="Home">
                 {/*<svg className={"icon"}>*/}
                 {/* <use xlinkHref={`${symbol_m}#icon_Home_1`} />*/}
                 {/*</svg>*/}
-                <TabWithdraw className={styles.icon}/>
-                <span>{i18n.t("tab.withdraw")}</span>
+                {/*<TabWithdraw className={styles.icon}/>*/}
+                <svg className={styles.bottomicon}>
+                    <use xlinkHref={`${symbol}#icon_WithDraw`}/>
+                </svg>
+                <span className={styles.bottomtxt}>{i18n.t("tab.withdraw")}</span>
             </NavLink>
-            <NavLink className={styles.button} to={ROUTE_PATH.PAY}>
-                <div className={styles['wallet-tabbar-wrap']}>
-                    <div className={styles['in-1']}>
-                        <div className={styles['in-2']}>
-                            {/*<svg className={"icon"}>*/}
-                            {/*    <use xlinkHref={`${symbol_m}#icon_Promotions`} />*/}
-                            {/*</svg>*/}
-                            <TabPay className={styles.icon_yellow}/>
-                        </div>
-                    </div>
-                </div>
-                <span className={styles.yellow_txt}>{i18n.t("tab.deposit")}</span>
+            <NavLink className={styles.button} style={{width:"25%"}} to={ROUTE_PATH.PAY}>
+                <img src={shopIcon} style={{width:"8rem",marginTop:"-2.4rem"}}/>
+
+                <span className={`${styles.yellow_txt} ${styles.bottomtxt}`} style={{lineHeight:"1.5rem"}}>{i18n.t("tab.deposit")}</span>
             </NavLink>
             <NavLink className={styles.button} to={ROUTE_PATH.MESSAGE}>
                 {
-                    mailNew>0?(<div className={styles["dont-badge"]}></div>):(<></>)
+                    mailNew > 0 ? (<div className={styles["dont-badge"]}></div>) : (<></>)
                 }
                 {/*<svg className={"icon"}>*/}
                 {/*    <use xlinkHref={`${symbol_m}#icon_Account`} />*/}
                 {/*</svg>*/}
-                <TabMessage className={styles.icon}/>
-                <span>{i18n.t("tab.message")}</span>
+                {/*<TabMessage className={styles.icon}/>*/}
+                <svg className={styles.bottomicon}>
+                    <use xlinkHref={`${symbol}#icon_Mail`}/>
+                </svg>
+                <span className={styles.bottomtxt}>{i18n.t("tab.message")}</span>
             </NavLink>
             <NavLink className={styles.button} to={ROUTE_PATH.CUSTOMER}>
                 {/*<svg className={"icon"}>*/}
                 {/*    <use xlinkHref={`${symbol}#icon_Chat`} />*/}
                 {/*</svg>*/}
-                <TabSett className={styles.icon}></TabSett>
-                <span>{i18n.t("tab.service")}</span>
+                {/*<TabSett className={styles.icon}></TabSett>*/}
+                <svg className={styles.bottomicon}>
+                    <use xlinkHref={`${symbol}#icon_Support`}/>
+                </svg>
+                <span className={styles.bottomtxt}>{i18n.t("tab.service")}</span>
             </NavLink>
         </div>
     )

src/layout/BottomNav/styles.module.scss

@@ -8,11 +8,11 @@
     left: 0;
     right: 0;
     z-index: var(--zindex-in);
-    height: 4.125rem;
+    height: 4.5rem;
     display: flex;
     align-items: center;
     justify-content: space-between;
-    gap: 20px;
+    gap: 0.5rem;
     pointer-events:auto;
     &_full{
         padding: 0rem 0.6rem 0.6rem 0.6rem;
@@ -49,6 +49,16 @@
             fill: var(--text);
         }
     }
+    & .bottomicon{
+        width: 2.2rem;
+        height: 2.2rem;
+        margin-top:-0.4rem;
+        fill: url(#gradient-vertical) #fffee7;
+        g{
+            fill: url(#gradient-vertical) #fffee7;
+        }
+    }
+
     & .icon_yellow{
         width: 2.8rem;
         height: 2.8rem;
@@ -57,6 +67,10 @@
         color: #d5c0a4;
         line-height: 2rem;
     }
+    & .bottomtxt{
+        line-height: 1rem;
+        padding-bottom: 0.1rem;
+    }
 }
 
 .menu_item {