no message

public/index.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <!-- <link rel="icon" href="%PUBLIC_URL%/favicon.ico" /> -->
     <link rel="icon" href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 100 100%22><text x=%2250%%22 y=%2250%%22 style=%22dominant-baseline:central;text-anchor:middle;font-size:110px;%22>🍒</text></svg>" />
-    <meta name="viewport" content="width=device-width, initial-scale=1,minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+    <meta name="viewport" content="width=device-width, initial-scale=1,minimum-scale=1.0, maximum-scale=1.0, user-scalable=no,minimal-ui,viewport-fit=cover" />
     <title>24680.com - Casino & Sports & Racing</title>
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>

src/App.js

@@ -43,10 +43,11 @@ import Layout from "@layout/Layout";
 import {getFetchStatus, getUserID, getUserInfo} from '@features/mainSlice';
 import {useDispatch, useSelector} from "react-redux";
 import {REQ_STATUS} from "@api/config";
-import {reqCustomService, reqGetRoutes} from "@features/api";
+import {reqCustomService, reqGetRoutes, reqWithdrawBaseInfo} from "@features/api";
 import LoadingScreen from "@components/LoadingScreen";
 import {reqPayConfig} from "@features/paySlice";
 import {connectHall, disconnectHall} from "@features/actions/hallClient";
+import * as toast from "react-toastify";
 const App = () => {
     const dispatch = useDispatch();
     const fetchStatus=useSelector(getFetchStatus);
@@ -80,13 +81,16 @@ const App = () => {
     }, []);
     useEffect(()=>{
         if (userID!=0){
-            reqPayConfig(dispatch,userInfo);
             dispatch(connectHall());
+            //withdraw
+            dispatch(reqWithdrawBaseInfo());
         }
         else
         {
             dispatch(disconnectHall());
         }
+        //pay
+        reqPayConfig(dispatch,userInfo);
         //customer
         dispatch(reqCustomService());
         // var client = new Colyseus.Client('wss://wstest.ouro777.com:10000');

src/Global.js

@@ -4,6 +4,7 @@ import i18n from './locales/index';
 global.i18n=i18n;
 // global.symbol=symbol;
 // global.symbol_m=symbol_m;
+global.CASH_BASE=100;
 global.DOLLAR="R$";
 global.dispatch=null;
 global.msgBox=null;

src/components/AutoWinList/index.jsx

@@ -14,6 +14,7 @@ import lv_3 from "@assets/lvicon/diamond_mini.png";
 import usdimg from "@assets/lvicon/USD.black.png";
 import symbol from '@assets/symbol-defs.svg';
 import {useNavigate} from "react-router";
+import {numFormatter} from "@utils/helpers";
 
 
 const i18n=global.i18n;
@@ -222,8 +223,9 @@ const AutoWinList=({data})=>{
     },[currIndex]);
     const formatGolds=(golds)=>{
         golds=Number(golds);
-        let str=golds<1000?golds.toFixed(2):(golds/1000).toFixed(2)+"K";
-        return "$"+str;
+        // let str=golds<1000?golds.toFixed(2):(golds/1000).toFixed(2)+"K";
+        let str=numFormatter(golds);
+        return global.DOLLAR+str;
     }
     const renderHAuto=()=>{
         let hlist=getAutoList();

src/features/paySlice.js

@@ -220,6 +220,5 @@ export const reqPayConfig=(dispatch,userInfo)=>{
     dispatch(reqRechargeConfig());
     dispatch(reqFirstPayConfig(userInfo.UserID));
     dispatch(reqGetAccountsPayInfo(userInfo.UserID));
-    dispatch(reqWithdrawBaseInfo());
     // dispatch(reqWithdrawTax());
 }

src/layout/Layout.jsx

@@ -61,6 +61,7 @@ const Layout=()=>{
     const renderInFull=()=>{
         return (
             <div className={`app fluid`} ref={appRef}>
+                <ScrollToTop/>
                 <div className="app_container_full">
                     <Suspense fallback={<LoadingScreen/>}>
                         <CBrowserRouter isLogin={isLogin} routes={inRoutes}/>

src/styles/_global.scss

@@ -44,12 +44,12 @@ body {
 
     &_container_full{
         display: flex;
-        height: 100vh;
+        min-height: 100vh;
         background-color: var(--widget-bg);
     }
 
     &.fluid {
-        display: block;
+        //display: block;
         //display: flex;
         .app_container {
             margin: 0;

src/utils/helpers.js

@@ -8,13 +8,14 @@ import dayjs from 'dayjs';
 import CLUBS from '@constants/clubs';
 
 // represent large numbers in a shortened format
-export const numFormatter = (num, decimals = 0) => {
+export const numFormatter = (num, decimals = 2) => {
+    num=Number(num);
     if (num > 999 && num < 1000000) {
         return (num / 1000).toFixed(decimals) + 'K';
     } else if (num > 1000000) {
-        return (num / 1000000).toFixed(1) + 'M';
-    } else if (num < 900) {
-        return num;
+        return (num / 1000000).toFixed(decimals) + 'M';
+    } else if (num <= 999) {
+        return num.toFixed(decimals);
     }
 }
 

src/widgets/WDeposit/BR/BRDeposit.jsx

@@ -1,6 +1,6 @@
 import styles from './styles.module.scss';
 import {useDispatch, useSelector} from "react-redux";
-import {getUserInfo} from "@features/mainSlice";
+import {getUserInfo, isLogined} from "@features/mainSlice";
 import {getConfig, getFirstPay, getPaymentOrderStatus} from "@features/paySlice";
 import fpayimg from "@assets/pay/fpayimg.png";
 import img_sc from "@assets/pay/img_sc_66.png";
@@ -20,6 +20,7 @@ const BRDeposit=()=>{
     const config=useSelector(getConfig);
     const orderStatus=useSelector(getPaymentOrderStatus);
     const [selectedID,setSelectedID]=useState("0");
+    const isLogin=useSelector(isLogined);
     const getSelectedConfig=()=>{
         let selected=null;
         if (config){
@@ -37,6 +38,10 @@ const BRDeposit=()=>{
         navigate(ROUTE_PATH.PAY_ORDER);
     }
     const onGetPaymentOder=(data)=>{
+        if (!isLogin){
+            navigate(ROUTE_PATH.SIGN_IN);
+            return;
+        }
         if (orderStatus===REQ_STATUS.LOADING)return;
         data.user=user;
         data.callback=onGetPaymentCallback;

src/widgets/WDeposit/DepositHeader.jsx

@@ -2,7 +2,7 @@ import styles from "./styles.module.scss";
 import SvgIcon from "@components/SvgIcon";
 import {ReactComponent as Video} from '@assets/singlesvg/video.svg';
 import {useSelector} from "react-redux";
-import {getUserInfo} from "@features/mainSlice";
+import {getUserInfo, isLogined} from "@features/mainSlice";
 import USD from "@assets/lvicon/USD.black.png";
 import {numFormatter} from "@utils/helpers";
 const i18n=global.i18n;
@@ -10,6 +10,7 @@ const DepositHeader=({...props})=>{
     const route=props.route;
     const close=props.close;
     const user=useSelector(getUserInfo);
+    const isLogin=useSelector(isLogined);
     const renderHeader=()=>{
         let title=route?route.title:"";
         return (
@@ -24,13 +25,17 @@ const DepositHeader=({...props})=>{
                         }}>
                             <SvgIcon className={styles.arrow} herf={"icon_Arrow"}/>
                         </button>
-                        <div className={styles.user}>
-                            <div className={styles.uid}>{i18n.t("deposit.uid")+""+user.UserID}</div>
-                            <div className={styles.gold_con}>
-                                <img className={styles.icon_golds} src={USD}/>
-                                <div className={styles.golds}>{global.DOLLAR+""+numFormatter(user.Score)}</div>
-                            </div>
-                        </div>
+                        {
+                           !isLogin?(<></>):(
+                               <div className={styles.user}>
+                                   <div className={styles.uid}>{i18n.t("deposit.uid")+""+user.UserID}</div>
+                                   <div className={styles.gold_con}>
+                                       <img className={styles.icon_golds} src={USD}/>
+                                       <div className={styles.golds}>{global.DOLLAR+""+numFormatter(user.Score)}</div>
+                                   </div>
+                               </div>
+                           )
+                        }
                     </div>
                     <div className={styles.right}>
                         <button className={styles.right_btn}>

src/widgets/WGame/styles.module.scss

@@ -1,6 +1,9 @@
 .container{
-  width: 100%;
-  //height: 50%;
+  position: fixed;
+  top: 0;
+  bottom: 0;
+  right: 0;
+  left: 0;
   & .content{
     width: 100%;
     height: 100%;

src/widgets/WWithdraw/BR/BRWithdraw.jsx

@@ -17,11 +17,16 @@ const BRWithdraw=()=>{
     const addBtnParam = [200, 500, 1000, 2000, 5000, -1];
     const [addIndex,setAddIndex]=useState(-1);
     const [wdValue,setWdValue]=useState("");
+    const getShowCash=(value)=>{
+        value=Number(value);
+        return value/global.CASH_BASE;
+    }
     const formatInput=(text)=>{
-        let inputNum = Number(text);
+        let Score=user.Score*global.CASH_BASE;
+        let inputNum = Number(text)*global.CASH_BASE;
         inputNum = Math.min(inputNum, info.SumCanExchange);
-        inputNum = Math.min(inputNum, user.Score);
-        return (inputNum > 0) ? (inputNum) : "";
+        inputNum = Math.min(inputNum, Score);
+        return (inputNum > 0) ? (getShowCash(inputNum)) : "";
     }
     const getAddIndexFromValue=(value)=>{
         value=Number(value);
@@ -39,11 +44,11 @@ const BRWithdraw=()=>{
                 <div className={styles.user_con}>
                     <div className={styles.money_con}>
                         <div className={styles.title}>{i18n.t("withdraw.main.total_balance")}</div>
-                        <div className={styles.money}>{global.DOLLAR+numFormatter(user.Score)}</div>
+                        <div className={styles.money}>{global.DOLLAR+" "+numFormatter(user.Score)}</div>
                     </div>
                     <div className={styles.money_con}>
                         <div className={styles.title}>{i18n.t("withdraw.main.withdrawable")}</div>
-                        <div className={styles.money}>{global.DOLLAR+numFormatter(info.SumCanExchange)}</div>
+                        <div className={styles.money}>{global.DOLLAR+" "+numFormatter(getShowCash(info.SumCanExchange))}</div>
                     </div>
                 </div>
                 <div className={styles.line}/>
@@ -62,7 +67,7 @@ const BRWithdraw=()=>{
                                 <button key={index}
                                         className={`${styles.grid_btn} ${addIndex===index?styles.active:''}`}
                                         onClick={()=>{
-                                            let value=item===-1?info.SumCanExchange+"":item+"";
+                                            let value=item===-1?getShowCash(info.SumCanExchange)+"":item+"";
                                             let fvalue=formatInput(value);
                                             let addIndx=value===fvalue?index:-1;
                                             if (addIndx!==-1)setWdValue(fvalue);
@@ -148,8 +153,8 @@ const BRWithdraw=()=>{
     const renderSubmit=()=>{
         let num = info.OrderLimit - info.OrderCount;
         // data.WithDrawMin, data.WithDrawMax
-        let min=info.MinExchange;
-        let max=info.MaxExchange;
+        let min=getShowCash(info.MinExchange);
+        let max=getShowCash(info.MaxExchange);
         return (
             <div className={styles.content}>
                 <button className="button-green">