Merge branch 'xudh' into sport

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/App.js

@@ -44,11 +44,11 @@ import Layout from "@layout/Layout";
 import {
     getBFP,
     getFetchStatus,
-    getHallServerUrl, getKickState, getOpenPay, getPromoteInstall,
+    getHallServerUrl, getKickState, getOpenPay, getPromoteInstall, getPopWheel,
     getUserID,
     getUserInfo,
     isLogined,
-    updateCurrGame, updateOpenPay
+    updateCurrGame, updateOpenPay, getIsGuest, getPopBindPhone
 } from '@features/mainSlice';
 import {useDispatch, useSelector} from "react-redux";
 import {REQ_STATUS} from "@api/config";
@@ -56,7 +56,7 @@ import {
     reqAgentCheck, reqCheckinCheck,
     reqCustomService, reqFavoGet, reqFirstPayConfig, reqGameActivity, reqGameInfo,
     reqGetRoutes,
-    reqMailCheck,
+    reqMailCheck, reqProtectCheck,
     reqRedpackCheck, reqRedpackConfig,
     reqTurnplateIndex,
     reqWithdrawBaseInfo
@@ -78,6 +78,9 @@ import {ROUTE_PATH} from "@constants/routes";
 import {onChangeUser, onChangeUserID} from "@features/actions/mainAction";
 import {isInAppBrowser, isShowInstallBox, openUrlUseChrome} from "@utils/UAUtils";
 import WInstallBox from "@widgets/WInstallBox";
+const objInfo={
+    gameID:0
+}
 const App = () => {
     const dispatch = useDispatch();
     const fetchStatus=useSelector(getFetchStatus);
@@ -98,7 +101,10 @@ const App = () => {
     // const {preLocation,gameID}=usePreviousRoute();
     const serverKick=useSelector(getKickState);
     const promoteInstall=useSelector(getPromoteInstall);
+    const popWheel=useSelector(getPopWheel);
     const openPay=useSelector(getOpenPay);
+    const guest=useSelector(getIsGuest);
+    const popBindPhone=useSelector(getPopBindPhone);
     const muiTheme = createTheme({
         direction: direction,
     });
@@ -177,6 +183,7 @@ const App = () => {
             //Mail红点屏蔽
             dispatch(reqMailCheck());
             dispatch(reqFavoGet());
+            checkOpenBindPrompt();
         }
         else
         {
@@ -246,6 +253,8 @@ const App = () => {
             // time=1000;
             setTimeout(async ()=>{
                 if (!isShowInstallBox())return;
+                let gameID=Number(objInfo.gameID);
+                if (gameID>0)return;
                 global.showInstallBox();
             },time);
         }
@@ -259,6 +268,14 @@ const App = () => {
             }
         },time);
     }
+    //检查打开绑定提示
+    const checkOpenBindPrompt=()=>{
+        if (guest!==1)return;
+        if (popBindPhone!==1)return;
+        if (global.ispopBindPhone===1)return;
+        global.showBindPrompt();
+        global.ispopBindPhone=1;
+    }
     //app Effect
     //初始化
     useEffect(() => {
@@ -278,7 +295,7 @@ const App = () => {
             if (times>0){
                 if (pathname==="/"){
                     if(hash==null||hash===""){
-                        setIsShowWheel(true);
+                        if(popWheel)setIsShowWheel(true);
                         return;
                     }
                 }
@@ -304,6 +321,7 @@ const App = () => {
     useEffect(()=>{
         dispatch(updateCurrGame(gameID))
         dispatch(hallSendState());
+        objInfo.gameID=gameID;
     },[gameID])
     //监听被服务器踢掉
     useEffect(()=>{

src/Global.js

@@ -76,4 +76,28 @@ global.showBindPhone=()=>{
 global.hideBindPhone=()=>{
     if (global.bindPhone)global.bindPhone.hide();
 }
+global.showBindPrompt=()=>{
+    if (global.bindPrompt)global.bindPrompt.show();
+}
+global.hideBindPrompt=()=>{
+    if (global.bindPrompt)global.bindPrompt.hide();
+}
+global.showProtectReward=()=>{
+    if (global.protectReward)global.protectReward.show();
+}
+global.hideProtectReward=()=>{
+    if (global.protectReward)global.protectReward.hide();
+}
+global.showLoadingCircular=(showMask=false)=>{
+    if (global.loadingCircular)global.loadingCircular.show(showMask);
+}
+global.hideLoadingCircular=()=>{
+    if (global.loadingCircular)global.loadingCircular.hide();
+}
+global.showFirstPay=()=>{
+    if (global.firstPay)global.firstPay.show();
+}
+global.hideFirstPay=()=>{
+    if (global.firstPay)global.firstPay.hide();
+}
 //wd pass

src/api/config.js

@@ -103,3 +103,6 @@ export const APP_BIND_SMS=BASE_PREFIX+"bindsms";
 export const APP_SMS_LOGIN=BASE_PREFIX+"smslogin";
 //apk
 export const APP_GAME_APK=BASE_PREFIX+"apk";
+//protect
+export const APP_PROTECT_CHECK=BASE_PREFIX+"protect/check";
+export const APP_PROTECT_GET=BASE_PREFIX+"protect/get";

src/app/store.js

@@ -11,6 +11,7 @@ import RedPackReducer from '@features/redpackSlice';
 import AgentReducer from '@features/agentSlice';
 import ActivityReducer from '@features/activitySlice';
 import CheckInReducer from '@features/checkInSlice';
+import ProtectReducer from '@features/protectSlice';
 export default configureStore({
     reducer: {
         // todos: TodosReducer,
@@ -25,6 +26,7 @@ export default configureStore({
         agent:AgentReducer,
         activity:ActivityReducer,
         checkIn:CheckInReducer,
+        protect:ProtectReducer,
     },
     middleware:(getDefaultMiddleware => {
         let middlewares=getDefaultMiddleware();

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/components/Loading/LoadingCircular.jsx

@@ -0,0 +1,33 @@
+import React, {useEffect, useState} from "react";
+import {CircularProgress} from "@mui/material";
+
+const LoadingCircular=()=>{
+    const [isShow, setIsShow] = useState(false);
+    const [showMask,setShowMask]=useState(false);
+    const show=(showMask=false)=>{
+        setIsShow(true);
+        setShowMask(showMask);
+    }
+    const hide=()=>{
+        setIsShow(false);
+    }
+    useEffect(()=>{
+        const loadingCircular={
+            show,
+            hide
+        };
+        global.loadingCircular=loadingCircular;
+    },[])
+    return (
+        <>
+            {
+                isShow? (
+                    <div className={`loading-circular ${showMask?'loading-circular_mask':''}`}>
+                        <CircularProgress color="success" size={40} thickness={4}/>
+                    </div>
+                ):(<></>)
+            }
+        </>
+    )
+}
+export default LoadingCircular;

src/components/LoadingScreen.jsx

@@ -5,12 +5,21 @@ import Spring from '@components/Spring';
 // assets
 // import ball from '@assets/logo.json';
 import logo from '@assets/logo.json';
+import {useEffect, useRef} from "react";
 
 const LoadingScreen = ({...props}) => {
+    const loadRef = useRef(null);
+    useEffect(()=>{
+        return ()=>{
+            if (loadRef.current!=null){
+                loadRef.current.destroy();
+            }
+        }
+    },[])
     return (
         <Spring {...props} className="d-flex align-items-center justify-content-center flex-1 w-100 h-100">
             {/*<Lottie animationData={ball} />*/}
-            <Lottie animationData={logo} />
+            <Lottie animationData={logo} lottieRef={loadRef}/>
         </Spring>
     )
 }

src/constants/app.js

@@ -16,9 +16,15 @@ const APP_SERVER={
     SERVER_URL:"wss://wstest.ouro777.com:10000",
     ROOM_HALL:"hall",
 }
+const APP_WELFARE={
+    PROTECT:0,
+    FIRST_PAY:1,
+    BIND:2
+}
 export {
     APP_THEME,
     APP_GENDER,
     APP_CHANNEL,
-    APP_SERVER
+    APP_SERVER,
+    APP_WELFARE
 };

src/contexts/themeContext.js

@@ -67,6 +67,7 @@ export const ThemeProvider = ({children}) => {
     const isLogin=useSelector(isLogined);
     const user=useSelector(getUserInfo);
     const {preLocation,gameID}=usePreviousRoute();
+    const [welfTabState,setWelfTabState]=useState(-1);
     const initWindowSize=()=>{
         if (isMobile())global.device="m";
         else global.device="d";
@@ -210,7 +211,9 @@ export const ThemeProvider = ({children}) => {
                 toggleSoundOpen,
                 //preroute hook
                 preLocation,
-                gameID
+                gameID,
+                welfTabState,
+                setWelfTabState
             }}>
             {children}
         </ThemeContext.Provider>

src/features/api.js

@@ -31,7 +31,7 @@ import {
     APP_MAIL_TAKE,
     APP_PAGE_MODULES,
     APP_PAY_ORDER_LIST,
-    APP_PAYMENT_ORDER,
+    APP_PAYMENT_ORDER, APP_PROTECT_CHECK, APP_PROTECT_GET,
     APP_RECHARGE_CONFIG,
     APP_REDPACK_CHECK,
     APP_REDPACK_CONFIG,
@@ -829,4 +829,30 @@ export const reqSMSLogin=createAsyncThunk(
         return response;
     }
 )
+//protect
+export const reqProtectCheck=createAsyncThunk(
+    APP_PROTECT_CHECK,
+    async (arg,thunkAPI)=>{
+        let params={
+            url:APP_PROTECT_CHECK,
+        }
+        const response=await Http.get(params);
+        return response;
+    }
+)
+export const reqProtectGet=createAsyncThunk(
+    APP_PROTECT_GET,
+    async (arg,thunkAPI)=>{
+        let params={
+            url:APP_PROTECT_GET,
+        }
+        const response=await Http.get(params);
+        if (response&&response.code==200){
+            // let updateAddScore
+            let ProtectNum=Number(formatCash(arg.ProtectNum));
+            thunkAPI.dispatch(updateAddScore(ProtectNum));
+        }
+        return response;
+    }
+)
 //api

src/features/checkInSlice.js

@@ -18,7 +18,7 @@ const reducerCheckinCheck=(state,action,arg)=>{
                 for (let i = 0; i < config.length; i++) {
                     let item=config[i];
                     let DayNumber=parseInt(item.DayNumber);
-                    let RecordDay=parseInt(item.RecordDay.substring(i,i+1))>0?1:0;
+                    let RecordDay=parseInt(data.RecordDay.substring(i,i+1))>0?1:0;
                     let RewScore=parseInt(formatCash(item.RewardScore,true));
                     let SignInDay=parseInt(item.SignInDay);
                     RewardDay.push(DayNumber);

src/features/mainSlice.js

@@ -169,6 +169,7 @@ const reducerRoutes=(state,action)=>{
         let user=json.user;
         let isLogin=0;
         let userInfo={};
+        let hasPhone=0;
         if (user){
             if (typeof user=="object"){
                 isLogin=1;
@@ -178,6 +179,10 @@ const reducerRoutes=(state,action)=>{
                 // global.dispatch(reqPayConfig(user));
                 let sign=user.sign;
                 if (sign!=null)localStorageSet(LOCAL_SIGN,sign);
+
+                if(user.Phone!==""&&user.Phone.startsWith(user.RegisterLocation)){
+                    hasPhone=1;
+                }
             }
         }
         let conf=json.conf;
@@ -185,6 +190,10 @@ const reducerRoutes=(state,action)=>{
         let promoteInstall=0;
         let guest=0;
         let upgradeBonus=0;
+        let popWheel=0;
+        let popBindPhone=0;
+        let firstBonus=0;
+        let openRelief=0;
         if (conf){
             if (!!conf.hall)hallServerUrl=conf.hall;
             if (!!conf.DOLLAR)global.DOLLAR=conf.DOLLAR;
@@ -199,10 +208,20 @@ const reducerRoutes=(state,action)=>{
             //guest
             if (!!conf.guest)guest=conf.guest;
             if (!!conf.upgradeBonus)upgradeBonus=conf.upgradeBonus;
+            //弹出转盘
+            if (!!conf.popWheel)popWheel=conf.popWheel;
+            //弹出绑定电话奖励,并显示浮标
+            if (!!conf.popBindPhone)popBindPhone=hasPhone?0:conf.popBindPhone;
+            console.log("hasPhonehasPhonehasPhonehasPhone"+popBindPhone+"hasPhonehasPhone"+hasPhone)
+            //显示首冲浮标
+            if (!!conf.firstBonus)firstBonus=conf.firstBonus;
+            //显示救济浮标
+            if (!!conf.openRelief)openRelief=conf.openRelief;
         }
         //favorites
         // let favorites=getFavorites(json.favorites);
-        Object.assign(state, {routes:state.routes,asyncRoutes:data,styles:styles,blocks:blocks,...generData,isLogin:isLogin,userInfo:userInfo,hallServerUrl:hallServerUrl,promoteInstall:promoteInstall,guest:guest,upgradeBonus:upgradeBonus});
+        Object.assign(state, {routes:state.routes,asyncRoutes:data,styles,blocks,...generData,isLogin:isLogin,userInfo,hallServerUrl,promoteInstall,guest,upgradeBonus,popWheel,popBindPhone,firstBonus,openRelief});
+        // Object.assign(state, {routes:state.routes,asyncRoutes:data,styles:styles,blocks:blocks,...generData,isLogin:isLogin,userInfo:userInfo,hallServerUrl:hallServerUrl,promoteInstall:promoteInstall,guest:guest,upgradeBonus:upgradeBonus});
     }
 }
 const routesStatus=(state,status,arg)=>{
@@ -772,6 +791,9 @@ export const getKickState=(state)=>{
 export const getPromoteInstall=(state)=>{
     return state.main.promoteInstall;
 }
+export const getPopWheel=(state)=>{
+    return state.main.popWheel;
+}
 export const getOpenPay=(state)=>{
     return state.main.openPay;
 }
@@ -785,6 +807,15 @@ export const getIsGuest=(state)=>{
 export const getUpgradeBonus=(state)=>{
     return state.main.upgradeBonus;
 }
+export const getPopBindPhone=(state)=>{
+    return state.main.popBindPhone;
+}
+export const getFirstBonus=(state)=>{
+    return state.main.firstBonus;
+}
+export const getOpenRelief=(state)=>{
+    return state.main.openRelief;
+}
 //数据获取
 export default Main.reducer;
 

src/features/paySlice.js

@@ -253,9 +253,9 @@ export const Pay=createSlice({
         updatePayFinish:((state, action) => {
             if (state.currPayOrder!=null){
                 state.currPayOrder.status="success";
+                //充值完成 message={Golds:12.xx,PayNum:10}
+                toast.success(i18n.t("deposit.order_info.success"));
             }
-            //充值完成 message={Golds:12.xx,PayNum:10}
-            toast.success(i18n.t("deposit.order_info.success"));
         }),
         setChangePayPassType:((state, action) => {
             state.changePayPassType=action.payload;
@@ -283,6 +283,9 @@ export const {updatePayFinish,setChangePayPassType} = Pay.actions;
 export const getConfig=(state)=>{
     return state.pay.config;
 }
+export const getOFirstPay=(state)=>{
+    return state.pay.firstconfig;
+}
 export const getFirstPay=(state)=>{
     let firstconfig=state.pay.firstconfig;
     let config=state.pay.config;

src/features/protectSlice.js

@@ -0,0 +1,63 @@
+import {createSlice} from "@reduxjs/toolkit";
+import {REQ_STATUS} from "@api/config";
+import {buildReqReducer, reqProtectCheck, reqProtectGet} from "@features/api";
+import {getHttpMsg} from "@utils/helpers";
+import {toast} from "react-toastify";
+const reducerProtectCheck=(state,action,arg)=>{
+    let payload=action.payload;
+    if (payload&&payload.code===200){
+        let data=payload.data;
+        if (data!=null){
+            let info=data[0];
+            if (info!=null)state.protectInfo=info;
+        }
+    }
+}
+const protectCheckStatus=(state,status,arg)=>{
+    state.status.ProtectCheck=status;
+}
+
+const reducerProtectGet=(state,action,arg)=>{
+    let payload=action.payload;
+    let msg=getHttpMsg(payload);
+    if (payload&&payload.code===200){
+        let CurProtectTimes=state.protectInfo.CurProtectTimes!=null?Number(state.protectInfo.CurProtectTimes):0;
+        CurProtectTimes=CurProtectTimes-1;
+        state.protectInfo.CurProtectTimes=CurProtectTimes;
+        if (msg!=null&&msg!="")toast.success(msg);
+    }
+    else
+    {
+        if (msg!=null&&msg!="")toast.error(msg);
+    }
+    if (arg.callback!=null)arg.callback(payload);
+}
+const protectGetStatus=(state,status,arg)=>{
+    state.status.ProtectGet=status;
+}
+
+export const ProtectSlice = createSlice({
+    name: "protect",
+    initialState: {
+        protectInfo: {},
+        status:{
+            ProtectCheck:REQ_STATUS.NONE,
+            ProtectGet:REQ_STATUS.NONE,
+        }
+    },
+    reducers: {
+
+    },
+    extraReducers: (builder) => {
+        buildReqReducer(builder,reqProtectCheck,reducerProtectCheck,protectCheckStatus);
+        buildReqReducer(builder,reqProtectGet,reducerProtectGet,protectGetStatus);
+    }
+})
+export const {} = ProtectSlice.actions;
+export const getProtectInfo=(state)=>{
+    return state.protect.protectInfo;
+}
+export const getProtectGetStatus=(state)=>{
+    return state.protect.status.ProtectGet;
+}
+export default ProtectSlice.reducer;

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,12 +15,15 @@ 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";
 import {useSelector} from "react-redux";
 import {getMailNew} from "@features/mailSlice";
 import {checkIsStandalone} from "@utils/helpers";
+import {useThemeProvider} from "@contexts/themeContext";
+import {APP_THEME} from "@constants/app";
 const i18n=global.i18n;
 
 const BottomNav = () => {
@@ -29,7 +32,8 @@ const BottomNav = () => {
     const isStoreRoute = useStoreRoute();
     const {setCartOpen} = useShopProvider();
     const mailNew=useSelector(getMailNew);
-    const isStandalone=checkIsStandalone()
+    const isStandalone=checkIsStandalone();
+    const {theme} = useThemeProvider();
 
     // return (
     //     <div className={styles.container}>
@@ -65,49 +69,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} ${theme===APP_THEME.LIGHT?styles.bottomicon_light:''}`}>
+                    <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} ${theme===APP_THEME.LIGHT?styles.bottomicon_light:''}`}>
+                    <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.3rem",stroke:"#24262b 4px"}}/>
+
+                <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} ${theme===APP_THEME.LIGHT?styles.bottomicon_light:''}`}>
+                    <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} ${theme===APP_THEME.LIGHT?styles.bottomicon_light:''}`}>
+                    <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,22 @@
             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;
+        }
+        &_light{
+            fill: url(#gradient-vertical-dark) #fffee7;
+            g{
+                fill: url(#gradient-vertical-dark) #fffee7;
+            }
+        }
+    }
+
     & .icon_yellow{
         width: 2.8rem;
         height: 2.8rem;
@@ -57,6 +73,10 @@
         color: #d5c0a4;
         line-height: 2rem;
     }
+    & .bottomtxt{
+        line-height: 1rem;
+        padding-bottom: 0.1rem;
+    }
 }
 
 .menu_item {

src/layout/Layout.jsx

@@ -32,6 +32,11 @@ import useEdgeGesture from "@hooks/useEdgeGesture";
 import MailNew from "@components/MailNew";
 import WInstallBox from "@widgets/WInstallBox";
 import WBindPhone from "@widgets/WBindPhone";
+import WBindPrompt from "@widgets/WBindPrompt";
+import WWelfarebar from "@widgets/WWelfarebar";
+import WProtect from "@widgets/WProtect";
+import LoadingCircular from "@components/Loading/LoadingCircular";
+import WFirstPay from "@widgets/WFirstPay";
 const PageNotFound = lazy(() => import('@pages/PageNotFound'));
 
 const Layout=({...props})=>{
@@ -84,6 +89,7 @@ const Layout=({...props})=>{
                     <Sidebar/>
                     <Navbar/>
                     {isMobile() && <BottomNav/>}
+                    <WWelfarebar/>
                 </div>
             </>
         )
@@ -124,6 +130,9 @@ const Layout=({...props})=>{
                 }}></WHallWheel>
                 {/*<WInstallBox/>*/}
                 <WBindPhone/>
+                <WBindPrompt/>
+                <WProtect/>
+                <WFirstPay/>
             </>
         )
     }
@@ -132,6 +141,7 @@ const Layout=({...props})=>{
             <>
                 <DropCoins/>
                 <MailNew/>
+                <LoadingCircular/>
             </>
         )
     }

src/locales/languages/en_US.json

@@ -21,7 +21,7 @@
       "msg": "Message",
       "agent_policy": "Agent Policy",
       "cashwheel": "Receive R$100 for free",
-      "check_in": "All Bonus Days"
+      "check_in": "Daily Bonus"
     },
     "casino": "Casino",
     "slots": "Slots",
@@ -32,6 +32,9 @@
     "recent": "Recent",
     "new_release": "New Releases",
     "bingo": "Bingo",
+    "crash": "Crash Games",
+    "minigames": "Mini Games",
+    "casualgames": "Casual Games",
     "blackjack": "Blackjack",
     "table_games": "Table Games",
     "sports": "Sports",
@@ -617,6 +620,20 @@
     "btn_submit": "SUBMIT",
     "tips": "Link your Mobile and get {0} chips reward"
   },
+  "bindPrompt": {
+    "title": "Binding reward",
+    "content": "After binding, you can login to the game via your mobile phone number, which is safe!",
+    "tips": "Play guest accounts. If you replace or reinstall your phone, you will lose your account. Immediate membership is recommended"
+  },
+  "protect": {
+    "title": "Relief Funds",
+    "des": "You can get it when your balance is less than ",
+    "tips": "Only {0} time a day",
+    "btn_get": "Get"
+  },
+  "firstPay": {
+    "only_need": "Only need"
+  },
   "web": {
     "activity": {
       "redpack_not_available": "There is no RedPack",
@@ -704,6 +721,10 @@
       "code_too_long": "Phone code is too long",
       "already_bound": "The phone number is already bound",
       "code_incorrect_or_expired": "The code is incorrect or has expired"
+    },
+    "protect": {
+      "score_limit": "Score limit reached",
+      "times_limit": "Protect times limit reached"
     }
   }
 }

src/locales/languages/es_MX.json

@@ -29,6 +29,9 @@
     "recent": "Recientes",
     "new_release": "Nuevos Lanzamientos",
     "bingo": "Bingo",
+    "crash": "Juegos de Choque",
+    "minigames": "Mini Juegos",
+    "casualgames": "Juegos Casuales",
     "blackjack": "Blackjack",
     "table_games": "Juegos de Mesa",
     "sports": "Deportes",
@@ -42,7 +45,7 @@
     "quest": "MISION",
     "spin": "GIRAR",
     "log_out": "Cerrar sesión",
-    "check_in": "REGISTRARSE"
+    "check_in": "Bonus Diario"
   },
   "tab": {
     "withdraw": "Retirar",
@@ -606,6 +609,20 @@
     "btn_submit": "ENVIAR",
     "tips": "Vincula tu móvil y obtén una recompensa de {0} fichas"
   },
+  "bindPrompt": {
+    "title": "Recompensa vinculante",
+    "content": "Después de la vinculación, podrás iniciar sesión en el juego a través de tu número de teléfono móvil, ¡lo cual es seguro!",
+    "tips": "Juega cuentas de invitados. Si reemplaza o reinstala su teléfono, perderá su cuenta. Se recomienda membresía inmediata"
+  },
+  "protect": {
+    "title": "Fondos de ayuda",
+    "des": "Puedes obtenerlo cuando tu saldo sea inferior a ",
+    "tips": "Sólo {0} vez al día",
+    "btn_get": "Obtener"
+  },
+  "firstPay": {
+    "only_need": "Solo necesito"
+  },
   "web": {
     "activity": {
       "redpack_not_available": "No hay RedPack",
@@ -693,6 +710,10 @@
       "code_too_long": "El código de teléfono es demasiado largo",
       "already_bound": "El número de teléfono ya está vinculado",
       "code_incorrect_or_expired": "El código es incorrecto o ha expirado"
+    },
+    "protect": {
+      "score_limit": "Límite de puntos alcanzado",
+      "times_limit": "Límite de veces de protección alcanzado"
     }
   }
 }

src/locales/languages/pt_BR.json

@@ -29,6 +29,9 @@
     "recent": "Recentes",
     "new_release": "Novos Lançamentos",
     "bingo": "Bingo",
+    "crash": "Jogos de Colisão",
+    "minigames": "Mini Jogos",
+    "casualgames": "Jogos Casuais",
     "blackjack": "Blackjack",
     "table_games": "Jogos de Mesa",
     "sports": "Esportes",
@@ -42,7 +45,7 @@
     "quest": "MISSÃO",
     "spin": "GIRAR",
     "log_out": "Sair",
-    "check_in": "CHECK-IN"
+    "check_in": "Bônus Diário"
   },
   "tab": {
     "withdraw": "Saque",
@@ -606,6 +609,20 @@
     "btn_submit": "ENVIAR",
     "tips": "Vincule seu celular e ganhe {0} fichas de recompensa"
   },
+  "bindPrompt": {
+    "title": "Recompensa vinculativa",
+    "content": "Após a vinculação, você pode fazer login no jogo usando seu número de celular, que é seguro!",
+    "tips": "Jogue contas de convidados. Se substituir ou reinstalar o telefone, você perderá sua conta. Recomenda-se adesão imediata"
+  },
+  "protect": {
+    "title": "Fundos de Socorro",
+    "des": "Você pode obtê-lo quando seu saldo for inferior a ",
+    "tips": "Apenas {0} vez por dia",
+    "btn_get": "Obter"
+  },
+  "firstPay": {
+    "only_need": "Só precisa"
+  },
   "web": {
     "activity": {
       "redpack_not_available": "Não há RedPack",
@@ -693,6 +710,10 @@
       "code_too_long": "O código do telefone é muito longo",
       "already_bound": "O número de telefone já está vinculado",
       "code_incorrect_or_expired": "O código está incorreto ou expirou"
+    },
+    "protect": {
+      "score_limit": "Limite de pontos atingido",
+      "times_limit": "Limite de vezes de proteção atingido"
     }
   }
 }

src/locales/languages/ru_RU.json

@@ -29,6 +29,9 @@
     "recent": "Недавние",
     "new_release": "Новинки",
     "bingo": "Бинго",
+    "crash": "Аварийные Игры",
+    "minigames": "Мини Игры",
+    "casualgames": "Повседневные Игры",
     "blackjack": "Блэкджек",
     "table_games": "Настольные игры",
     "sports": "Спорт",
@@ -606,6 +609,20 @@
     "btn_submit": "ПОДТВЕРДИТЬ",
     "tips": "Свяжите свой мобильный телефон и получите награду - {0} фишек"
   },
+  "bindPrompt": {
+    "title": "Обязательное вознаграждение",
+    "content": "После привязки вы сможете войти в игру через свой номер мобильного телефона, это безопасно!",
+    "tips": "Играйте в гостевые аккаунты. Если вы замените или переустановите свой телефон, вы потеряете свой аккаунт. Рекомендуется немедленное членство"
+  },
+  "protect": {
+    "title": "Фонды помощи",
+    "des": "Вы можете получить его, когда ваш баланс будет меньше ",
+    "tips": "Только {0} раз в день",
+    "btn_get": "Получать"
+  },
+  "firstPay": {
+    "only_need": "Нужно только"
+  },
   "web": {
     "activity": {
       "redpack_not_available": "Нет RedPack",
@@ -693,6 +710,10 @@
       "code_too_long": "Код телефона слишком длинный",
       "already_bound": "Номер телефона уже привязан",
       "code_incorrect_or_expired": "Код неверен или истек"
+    },
+    "protect": {
+      "score_limit": "Достигнут предел очков",
+      "times_limit": "Достигнут предел количества защит"
     }
   }
 }

src/locales/languages/zh_TW.json

@@ -29,6 +29,9 @@
     "recent": "最近",
     "new_release": "新發布",
     "bingo": "賓果",
+    "crash": "碰撞遊戲",
+    "minigames": "迷你遊戲",
+    "casualgames": "休閒遊戲",
     "blackjack": "二十一點",
     "table_games": "桌上遊戲",
     "sports": "體育",
@@ -606,6 +609,20 @@
     "btn_submit": "提交",
     "tips": "連接您的手機並獲得 {0} 積分獎勵"
   },
+  "bindPrompt": {
+    "title": "綁定獎勵",
+    "content": "綁定後即可透過手機號碼登入遊戲，安全！",
+    "tips": "玩訪客帳戶。如果您更換或重新安裝手機，您將遺失您的帳戶。建議立即加入會員"
+  },
+  "protect": {
+    "title": "救濟基金",
+    "des": "當您的餘額低於 ",
+    "tips": "每天僅限{0}次",
+    "btn_get": "獲得"
+  },
+  "firstPay": {
+    "only_need": "只需要"
+  },
   "web": {
     "activity": {
       "redpack_not_available": "沒有紅包",
@@ -693,6 +710,10 @@
       "code_too_long": "電話代碼過長",
       "already_bound": "電話號碼已綁定",
       "code_incorrect_or_expired": "代碼不正確或已過期"
+    },
+    "protect": {
+      "score_limit": "已達到分數限制",
+      "times_limit": "已達到保護次數限制"
     }
   }
 }

src/pages/PageNotFound.jsx

@@ -1,11 +1,11 @@
 // components
-import PageHeader from '@layout/PageHeader';
+// import PageHeader from '@layout/PageHeader';
 import Error404 from '@components/Error404';
 
 const PageNotFound = () => {
     return (
         <>
-            <PageHeader title="Page not found" />
+            {/*<PageHeader title="Page not found" />*/}
             <Error404/>
         </>
     )

src/styles/_global.scss

@@ -230,5 +230,19 @@ input, input::placeholder {
     width: 100vw;
     height: 100vh;
 }
+.loading-circular{
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+    position: fixed;
+    inset: 0px;
+    z-index: var(--zindex-effect);
+    background-color: rgba(0, 0, 0, 0);
+    transition: all var(--transition);
+    &_mask{
+        background-color: rgba(0, 0, 0, 0.3);
+    }
+}
 body.progressier-blurring > *:not(.no-blurring){-webkit-filter:none !important;filter: none !important;pointer-events:none;z-index: 888 !important;}
 

src/styles/_vars.scss

@@ -65,6 +65,7 @@ $width-desktop-big-max:1564px;
     --side-open:250px;
     --side-close:65px;
     --zindex-in:500;
+    --zindex-welfare:600;
     --zindex-second:1000;
     --zindex-drawer:1200;
     --zindex-popup:1300;

src/widgets/WBindPhone/index.jsx

@@ -14,6 +14,8 @@ import SmallLoading from "@components/SmallLoading";
 import {CircularProgress} from "@mui/material";
 import {toast} from "react-toastify";
 import {reqBindSMS, reqSendCode} from "@features/api";
+import {APP_WELFARE} from "@constants/app";
+import {useThemeProvider} from "@contexts/themeContext";
 const i18n=global.i18n;
 const objInfo={
     cdTimer:null
@@ -28,6 +30,7 @@ const WBindPhone=({})=>{
     const upgradBonus=useSelector(getUpgradeBonus);
     const regCoins=formatCash(upgradBonus,0);
     const dispatch=useDispatch();
+    const {setWelfTabState}=useThemeProvider();
     const {register, handleSubmit, formState: {errors}, control} = useForm({
         defaultValues: {
             phone: '',
@@ -39,9 +42,11 @@ const WBindPhone=({})=>{
     // /bindsms    {phone,code,password,repassword}
     const show=()=>{
         setIsShow(true);
+        setWelfTabState(APP_WELFARE.BIND);
     }
     const hide=()=>{
         setIsShow(false);
+        setWelfTabState(-1);
     }
     const validatePhone=(value)=>{
         return validateCountryPhone(country,value);

src/widgets/WBindPrompt/index.jsx

@@ -0,0 +1,57 @@
+import {useEffect, useState} from "react";
+import {useSelector} from "react-redux";
+import {getUpgradeBonus} from "@features/mainSlice";
+import {formatCash} from "@utils/helpers";
+import Modal from "@mui/material/Modal";
+import Fade from "@mui/material/Fade";
+import styles from "./styles.module.scss";
+import Grow from "@mui/material/Grow";
+const i18n=global.i18n;
+const WBindPrompt=({})=>{
+    const [isShow, setIsShow] = useState(false);
+    const upgradBonus=useSelector(getUpgradeBonus);
+    const regCoins=formatCash(upgradBonus,0);
+    const show=()=>{
+        setIsShow(true);
+    }
+    const hide=()=>{
+        setIsShow(false);
+    }
+    const onOpenBind=()=>{
+        hide();
+        global.showBindPhone();
+    }
+    useEffect(()=>{
+        const bindPrompt={
+            show,
+            hide
+        };
+        global.bindPrompt=bindPrompt;
+        return ()=>{
+        }
+    },[])
+    return (
+        <Modal open={isShow} onClose={()=>{
+            hide()
+        }} closeAfterTransition>
+            <Fade in={isShow} timeout={500}>
+                <div className={styles.continer}>
+                    <Grow in={isShow} timeout={500}>
+                        <div className={styles.bind_con} onClick={onOpenBind}>
+                            <div className={styles.content}>
+                                <span className={styles.title}>{i18n.t("bindPrompt.title")}</span>
+                                <span className={styles.reward}>{global.DOLLAR+""+regCoins}</span>
+                                <span className={styles.des}>{i18n.t("bindPrompt.content")}</span>
+                                <button className={styles.btn_now}>
+                                    <img src={require('@assets/bindPrompt/connect_now_'+i18n.language+'.png')}/>
+                                </button>
+                            </div>
+                            <span className={styles.tips}>{i18n.t("bindPrompt.tips")}</span>
+                        </div>
+                    </Grow>
+                </div>
+            </Fade>
+        </Modal>
+    )
+}
+export default WBindPrompt;

src/widgets/WBindPrompt/styles.module.scss

@@ -0,0 +1,78 @@
+$bg:"./../../assets/bindPrompt/bg.png";
+$btn:"./../../assets/bindPrompt/btn.png";
+.continer{
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  height: 100%;
+  padding: 1rem;
+  pointer-events: none;
+  position: relative;
+}
+.bind_con{
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  max-width: 25.875rem;
+  background: url($bg);
+  aspect-ratio: 773/497;
+  background-size: 100% 100%;
+  pointer-events: auto;
+  align-items: center;
+  justify-content: space-between;
+  & .content{
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    align-items: center;
+    padding: 1.8rem 1rem 0rem 4rem;
+    transform: rotate(-6deg);
+    gap: 0.75rem;
+    & .title{
+      color: #6a005e;
+      font-weight: bold;
+      font-size: 1.1rem;
+    }
+    & .reward{
+      color: #3244c3;
+      font-weight: bold;
+      font-size: 2.3rem;
+    }
+    & .des{
+      color: #6a005e;
+      padding: 0rem 2.5rem;
+      font-size: 0.8rem;
+      line-height: 1rem;
+    }
+    & .btn_now{
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: center;
+      background: url($btn);
+      width: 50%;
+      aspect-ratio: 248/85;
+      background-size: 100% 100%;
+      transform: rotate(5.5deg);
+      margin-top: -1rem;
+      img{
+        transform: rotate(-5.5deg);
+        height: 30%;
+        width: auto;
+      }
+    }
+  }
+  & .tips{
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+    padding: 0.4rem 1rem 1.8rem 4rem;
+    color: #fff;
+    transform: rotate(-6deg);
+    line-height: 0.8rem;
+    font-size: 0.5rem;
+  }
+}

src/widgets/WCheckIn/index.jsx

@@ -124,7 +124,7 @@ const WCheckIn = ({close}) => {
             RewardDay.slice(0,4),
             RewardDay.slice(4,7),
         ]
-        let nDayNumber=checkInData.nDayNumber;
+        let nDayNumber=checkInData.NextDayNumber;
         if (nDayNumber>7)nDayNumber=7;
         let cbRecord=checkInData.cbRecord;
         let itemIndex=0;

src/widgets/WFirstPay/index.jsx

@@ -0,0 +1,132 @@
+import {useEffect, useState} from "react";
+import styles from "./styles.module.scss";
+import Modal from "@mui/material/Modal";
+import Fade from "@mui/material/Fade";
+import Grow from "@mui/material/Grow";
+import {useDispatch, useSelector} from "react-redux";
+import {getOFirstPay, getPaymentOrderStatus} from "@features/paySlice";
+import {ROUTE_PATH} from "@constants/routes";
+import {REQ_STATUS} from "@api/config";
+import {reqPaymentOrder} from "@features/api";
+import {useNavigate} from "react-router-dom";
+import {getUserInfo} from "@features/mainSlice";
+import SmallLoading from "@components/SmallLoading";
+import {useThemeProvider} from "@contexts/themeContext";
+import {APP_WELFARE} from "@constants/app";
+const i18n=global.i18n;
+
+const WFirstPay=()=>{
+    const [isShow, setIsShow] = useState(false);
+    const firstPayConf=useSelector(getOFirstPay);
+    const dispatch = useDispatch();
+    const navigate=useNavigate();
+    const user=useSelector(getUserInfo);
+    const orderStatus=useSelector(getPaymentOrderStatus);
+    const {setWelfTabState}=useThemeProvider();
+    const show=()=>{
+        setIsShow(true);
+        setWelfTabState(APP_WELFARE.FIRST_PAY);
+    }
+    const hide=()=>{
+        setIsShow(false);
+        setWelfTabState(-1);
+    }
+    useEffect(()=>{
+        const firstPay={
+            show,
+            hide
+        };
+        global.firstPay=firstPay;
+        return ()=>{
+        }
+    },[])
+    const onGetPaymentCallback=()=>{
+        hide();
+        navigate(ROUTE_PATH.PAY_ORDER);
+    }
+    const onGetPaymentOder=(data)=>{
+        if (orderStatus===REQ_STATUS.LOADING)return;
+        data.user=user;
+        data.callback=onGetPaymentCallback;
+        dispatch(reqPaymentOrder(data));
+    }
+    const renderMain=()=>{
+        if (firstPayConf==null)return (<></>);
+        let first_pay=firstPayConf.first_pay;
+        let give=0;
+        let money=0;
+        let total=0;
+        let precent="";
+        if (first_pay!=null){
+            give=Number(first_pay.give);
+            money=Number(first_pay.money);
+            total=give+money;
+            precent='+'+Math.floor(give*100/money)+'%';
+        }
+        return (
+            <div className={styles.f_main}>
+                <img className={styles.bglight} src={require('@assets/firstPay/bglight.png')}/>
+                <div className={styles.pack_con}>
+                    <div className={styles.percent_con}>
+                        <div data-title={precent} className={styles.text}>{precent}</div>
+                    </div>
+                    <div className={styles.bonus_con}>
+                        <div data-title={total} className={styles.bonus}>{total}</div>
+                    </div>
+                </div>
+            </div>
+        )
+    }
+    const renderPayBtn=()=>{
+        if (firstPayConf==null)return (<></>);
+        let first_pay=firstPayConf.first_pay;
+        let money=0;
+        let payType=0;
+        if (first_pay!=null){
+            money=Number(first_pay.money);
+            let gear=first_pay.gear;
+            if (gear!=null){
+                gear=JSON.parse(gear);
+                if (gear)gear=gear[0];
+                payType=gear.id;
+            }
+        }
+        return (
+            <button className={styles.f_btnpay} onClick={()=>{
+                onGetPaymentOder({
+                    price:money,
+                    goodsName:"firstpay",
+                    payType:payType,
+                    GiftsID:201
+                })
+            }}>
+                {
+                    orderStatus===REQ_STATUS.LOADING?(<SmallLoading fill={"#fff"}/>):(
+                        <>
+                            <span data-title={i18n.t("firstPay.only_need")}
+                                  className={styles.label}>{i18n.t("firstPay.only_need")}</span>
+                            <span data-title={global.DOLLAR + money}
+                                  className={styles.pay_num}>{global.DOLLAR + money}</span>
+                        </>
+                    )
+                }
+            </button>
+        )
+    }
+    return (
+        <Modal open={isShow} onClose={hide} closeAfterTransition>
+            <Fade in={isShow} timeout={500}>
+                <div className={styles.container}>
+                    <Grow in={isShow} timeout={500}>
+                        <div className={styles.f_con}>
+                            <img className={styles.title} src={require(`@assets/firstPay/${i18n.language}.png`)}/>
+                            {renderMain()}
+                            {renderPayBtn()}
+                        </div>
+                    </Grow>
+                </div>
+            </Fade>
+        </Modal>
+    )
+}
+export default WFirstPay;

src/widgets/WFirstPay/styles.module.scss

@@ -0,0 +1,171 @@
+$bg:"./../../assets/firstPay/pack.png";
+$btnbg:"./../../assets/firstPay/button.png";
+$pbg:"./../../assets/firstPay/percent.png";
+.container{
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  height: 100%;
+  padding: 1rem;
+  pointer-events: none;
+  position: relative;
+}
+.f_con{
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  max-width: 25.875rem;
+  pointer-events: auto;
+  align-items: center;
+  position:relative;
+  gap: 0.5rem;
+  & .title{
+    max-width: 90%;
+    height: auto;
+  }
+  & .f_main{
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    width: 80%;
+    aspect-ratio: 583/442;
+    height: auto;
+    position: relative;
+    & .bglight{
+      width: 127%;
+      position: absolute;
+      z-index: 1;
+      pointer-events: none;
+      animation: bg_light_ani 20s linear infinite;
+      transform: translateZ(0);
+    }
+    & .pack_con{
+      display: flex;
+      flex-direction: column;
+      position: absolute;
+      align-items: center;
+      justify-content: flex-end;
+      z-index: 2;
+      width: 100%;
+      aspect-ratio: 583/442;
+      background: url($bg);
+      background-size: 100% 100%;
+      & .percent_con{
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+        position: absolute;
+        z-index: 2;
+        background: url($pbg);
+        background-size: 100% 100%;
+        width: 24%;
+        aspect-ratio: 137/136;
+        right: 16%;
+        bottom: 15%;
+        transform: rotate(-10deg);
+        & .text{
+          &::before{
+            content: attr(data-title);
+            position: absolute;
+            background-image: linear-gradient(to right,#ffd63c,#ffd63c, #fdfdd1);
+            background-clip: text;
+            -webkit-background-clip: text;
+            -webkit-text-fill-color: transparent;
+            -webkit-text-stroke: 0px #483be3;
+            font-weight: bold;
+            font-size: 1rem;
+            pointer-events: none;
+          }
+          font-weight: bold;
+          font-size: 1rem;
+          -webkit-text-stroke: 2px #483be3;
+          filter: drop-shadow(0 1px 1px #3615a0);
+        }
+      }
+      & .bonus_con{
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+        width: 100%;
+        height: 21%;
+        & .bonus{
+          &::before{
+            content: attr(data-title);
+            position: absolute;
+            background-image: linear-gradient(to bottom,#fffd5a 0%,#fffd5a 30%,#fffdea 60%,#ffb643 70%);
+            background-clip: text;
+            -webkit-background-clip: text;
+            -webkit-text-fill-color: transparent;
+            -webkit-text-stroke: 0px #483be3;
+            font-weight: bold;
+            font-size: 1.8rem;
+            pointer-events: none;
+          }
+          font-weight: bold;
+          font-size: 1.8rem;
+          filter: drop-shadow(0 3px 1px #120519);
+        }
+      }
+    }
+  }
+  & .f_btnpay{
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+    margin-top: 0.8rem;
+    width: 48%;
+    aspect-ratio: 347/91;
+    background: url($btnbg);
+    background-size: 100% 100%;
+    font-weight: bold;
+    font-size: 1.1rem;
+    gap: 0.5rem;
+    & .label{
+      margin-top: -0.3rem;
+      color: #fff;
+      -webkit-text-stroke: 4px #1c4014;
+      &::before{
+        content: attr(data-title);
+        position: absolute;
+        background-image: linear-gradient(to bottom,#fff,#fff);
+        background-clip: text;
+        -webkit-background-clip: text;
+        -webkit-text-fill-color: transparent;
+        -webkit-text-stroke: 0px #1c4014;
+        font-weight: bold;
+        font-size: 1.1rem;
+      }
+    }
+    & .pay_num{
+      margin-top: -0.3rem;
+      font-size: 1.2rem;
+      color: #f4eb00;
+      -webkit-text-stroke: 4px #830662;
+      &::before{
+        content: attr(data-title);
+        position: absolute;
+        background-image: linear-gradient(to bottom,#f4eb00,#f4eb00);
+        background-clip: text;
+        -webkit-background-clip: text;
+        -webkit-text-fill-color: transparent;
+        -webkit-text-stroke: 0px #830662;
+        font-weight: bold;
+        font-size: 1.2rem;
+      }
+    }
+  }
+}
+@keyframes bg_light_ani {
+  0%{
+    transform: rotate(0deg);
+  }
+  100%{
+    transform: rotate(1turn);
+  }
+}

src/widgets/WGame/WDGame/WDGame.jsx

@@ -92,8 +92,10 @@ const WDGame=()=>{
         let url=gameCardInfo.link;
         if (gameCardInfo.level>0)url+="&level="+gameCardInfo.level;
         if (url==null)return;
-        if (url.indexOf("?")===-1)url=url+"?sign="+sign;
-        else url=url+"&sign="+sign;
+        let _d=global.device;
+        let _t=Date.now()+"_"+global.width+"_"+global.height;
+        if (url.indexOf("?")===-1)url=url+"?sign="+sign+"&_d="+_d+"&_t="+_t;
+        else url=url+"&sign="+sign+"&_d="+_d+"&_t="+_t;
         setGameURL(url);
     }
     const parseInfo=()=>{
@@ -180,7 +182,7 @@ const WDGame=()=>{
         let play_num=gameInfo.play_num!=null?gameInfo.play_num:0;
         return (
             <div className={`${styles.game_area} ${movieMode?styles.movie_mode:''}`}>
-                <div className={`${styles.game_action_wrap} ${styles.game_action_wrap_top}`}></div>
+                {/*<div className={`${styles.game_action_wrap} ${styles.game_action_wrap_top}`}></div>*/}
                 <div className={styles.game_main}>
                     <div className={styles.game_iframe_wrap}>
                         {

src/widgets/WProtect/index.jsx

@@ -0,0 +1,99 @@
+import {useEffect, useState} from "react";
+import Fade from "@mui/material/Fade";
+import Modal from "@mui/material/Modal";
+import styles from "./styles.module.scss";
+import Grow from "@mui/material/Grow";
+import SmallLoading from "@components/SmallLoading";
+import {useDispatch, useSelector} from "react-redux";
+import {getProtectGetStatus, getProtectInfo} from "@features/protectSlice";
+import {formatCash, stringFormat} from "@utils/helpers";
+import {REQ_STATUS} from "@api/config";
+import {reqProtectGet} from "@features/api";
+import {APP_WELFARE} from "@constants/app";
+import {useThemeProvider} from "@contexts/themeContext";
+const i18n=global.i18n;
+const WProtect = () => {
+    const [isShow, setIsShow] = useState(false);
+    const protectInfo=useSelector(getProtectInfo);
+    const status=useSelector(getProtectGetStatus);
+    const dispatch = useDispatch();
+    const {setWelfTabState}=useThemeProvider();
+    const show=()=>{
+        setIsShow(true);
+        setWelfTabState(APP_WELFARE.PROTECT);
+    }
+    const hide=()=>{
+        setIsShow(false);
+        setWelfTabState(-1);
+    }
+    const callback=(payload)=>{
+        if (payload&&payload.code===200){
+            hide();
+        }
+    }
+    const onGetProtect=()=>{
+        if (status===REQ_STATUS.LOADING)return;
+        let CurProtectTimes=protectInfo.CurProtectTimes!=null?parseInt(protectInfo.CurProtectTimes):0;
+        if (CurProtectTimes<=0)return;
+        let ProtectNum=protectInfo.ProtectNum!=null?parseInt(protectInfo.ProtectNum):0;
+        dispatch(reqProtectGet({callback:callback,ProtectNum:ProtectNum}));
+    }
+    useEffect(()=>{
+        const protectReward={
+            show,
+            hide
+        };
+        global.protectReward=protectReward;
+        return ()=>{
+        }
+    },[])
+    const renderInfo=()=>{
+        let ProtectLimit=protectInfo.ProtectLimit?formatCash(Number(protectInfo.ProtectLimit),0):0;
+        let ProtectNum=protectInfo.ProtectNum?formatCash(Number(protectInfo.ProtectNum),0):0;
+        let ProtectTimes=protectInfo.ProtectTimes?parseInt(protectInfo.ProtectTimes):0;
+        return (
+            <div className={styles.p_info}>
+                <span className={styles.title}>{i18n.t("protect.title")}</span>
+                <div className={styles.des}>
+                    {i18n.t("protect.des")}
+                    <span className={styles.coin}>{global.DOLLAR + ProtectLimit}</span>
+                </div>
+                <div className={styles.rewad}>{global.DOLLAR + ProtectNum}</div>
+                <span className={styles.tips}>{stringFormat(i18n.t("protect.tips"),[ProtectTimes])}</span>
+            </div>
+        )
+    }
+    const renderGetBtn=()=>{
+        return (
+            <button className={styles.p_get_btn} onClick={onGetProtect}>
+                {
+                    status===REQ_STATUS.LOADING?(<SmallLoading fill={"#fff"}/>): (
+                        <span className={styles.text}>
+                            {i18n.t("protect.btn_get")}
+                        </span>
+                    )
+                }
+            </button>
+        )
+    }
+    return (
+        <Modal open={isShow} onClose={hide} closeAfterTransition>
+            <Fade in={isShow} timeout={500}>
+                <div className={styles.container}>
+                    <Grow in={isShow} timeout={500}>
+                    <div className={styles.p_con}>
+                            <button className={styles.p_close} onClick={hide}>
+                                <img src={require("@assets/protect/p_close.png")}/>
+                            </button>
+                            <div className={styles.p_content}>
+                                {renderInfo()}
+                                {renderGetBtn()}
+                            </div>
+                        </div>
+                    </Grow>
+                </div>
+            </Fade>
+        </Modal>
+)
+}
+export default WProtect;

src/widgets/WProtect/styles.module.scss

@@ -0,0 +1,101 @@
+$bg:"./../../assets/protect/p_bg.png";
+$btn_bg:"./../../assets/protect/p_btn.png";
+.container{
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  height: 100%;
+  padding: 1rem;
+  pointer-events: none;
+  position: relative;
+}
+.p_con{
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  max-width: 25.875rem;
+  background: url($bg);
+  aspect-ratio: 719/571;
+  background-size: 100% 100%;
+  pointer-events: auto;
+  align-items: center;
+  position:relative;
+}
+.p_content{
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+  height: 100%;
+}
+.p_info{
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 1rem;
+  width: 100%;
+  height: 100%;
+  & .title{
+    margin-top: 15.5%;
+    font-size: 1.1rem;
+    font-weight: bold;
+    color: #f4eb90;
+  }
+  & .des{
+    font-weight: bold;
+    color: #fff;
+    width: 48%;
+    line-height: 1rem;
+    & .coin{
+      color: #ffcc00;
+    }
+  }
+  & .rewad{
+    margin-top: 12%;
+    font-size: 1.2rem;
+    font-weight: bold;
+    color: #fbd630;
+    text-shadow:
+            -1px -1px 0 #d82b2f,
+            1px -1px 0 #d82b2f,
+            -1px  1px 0 #d82b2f,
+            1px  1px 0 #d82b2f;
+  }
+  & .tips{
+    margin-top: -1rem;
+    font-weight: bold;
+    font-size: 0.75rem;
+    color: #2563c8;
+  }
+}
+.p_get_btn{
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  width: 38%;
+  background: url($btn_bg);
+  background-size: 100% 100%;
+  aspect-ratio: 275/105;
+  margin-left: 0.5rem;
+  margin-bottom: 0.6rem;
+  color: #116f02;
+  font-size: 1.1rem;
+  font-weight: bold;
+  & .text{
+    margin-top: -0.3rem;
+  }
+}
+.p_close{
+  position: absolute;
+  z-index: 2;
+  top: 1rem;
+  right: 2rem;
+  img{
+    width: 2.5rem;
+    height: auto;
+  }
+}

src/widgets/WWelfarebar/index.jsx

@@ -0,0 +1,174 @@
+import styles from './styles.module.scss';
+import {useEffect, useState} from "react";
+import {reqFirstPayConfig, reqProtectCheck} from "@features/api";
+import {useDispatch, useSelector} from "react-redux";
+import {getFirstBonus, getOpenRelief, getPopBindPhone, getUserInfo} from "@features/mainSlice";
+import {APP_WELFARE} from "@constants/app";
+import {getCurrPayOrder, getOFirstPay} from "@features/paySlice";
+import {getProtectInfo} from "@features/protectSlice";
+import {formatCash} from "@utils/helpers";
+import {useThemeProvider} from "@contexts/themeContext";
+import {useSidebar} from "@contexts/sidebarContext";
+const i18n=global.i18n;
+const WelfareBtn=({children,open=false,pressDown=false,...props})=>{
+    return (
+        <button
+            className={`${styles.wlf_btn} ${open ? styles.wlf_btn_open : styles.wlf_btn_close} ${pressDown ? styles.wlf_btn_press : ''}`}
+            {...props}
+        >
+            {
+                children == null ? (<></>) : children
+            }
+        </button>
+    )
+}
+const WWelfarebar = () => {
+    const dispatch = useDispatch();
+    const user = useSelector(getUserInfo);
+    //0:1,1:1,2:1
+    // const [openState, setOpenState] = useState({});
+    const [openProtect, setOpenProtect] = useState(0);
+    const [openFirst, setOpenFirst] = useState(0);
+    const [openBind, setOpenBind] = useState(0);
+    const firstPayConf = useSelector(getOFirstPay);
+    const popBindPhone=useSelector(getPopBindPhone);
+    const firstBonus=useSelector(getFirstBonus);
+    const openRelief=useSelector(getOpenRelief);
+    const protectInfo=useSelector(getProtectInfo);
+    const orderInfo=useSelector(getCurrPayOrder);
+    const {welfTabState,isMobile}=useThemeProvider();
+    const {open} = useSidebar();
+    const getWelfTabState=(key)=>{
+        if (welfTabState===key)return true;
+        return false;
+    }
+    const changeNewState=(key,state)=>{
+        // let newOpenState= Object.assign({},openState);
+        // newOpenState[key]=state;
+        // setOpenState(newOpenState);
+        // state=1;
+        switch (key){
+            case APP_WELFARE.PROTECT:
+                setOpenProtect(state);
+                break;
+            case APP_WELFARE.FIRST_PAY:
+                setOpenFirst(state);
+                break;
+            case APP_WELFARE.BIND:
+                setOpenBind(state);
+                break;
+        }
+    }
+    const checkProtect=()=>{
+        let state=0;
+        if (openRelief){
+            if (protectInfo!=null){
+                if (user.UserID>0){
+                    // let CurProtectTimes=protectInfo.CurProtectTimes!=null?parseInt(protectInfo.CurProtectTimes):0;
+                    // if (CurProtectTimes>0)state=1;
+                    state=1;
+                }
+            }
+        }
+        changeNewState(APP_WELFARE.PROTECT,state);
+    }
+    const checkProtectLimit=()=>{
+        if (protectInfo!=null){
+            let ProtectLimit=protectInfo.ProtectLimit;
+            if (ProtectLimit!=null){
+                ProtectLimit=Number(ProtectLimit);
+                ProtectLimit=Number(formatCash(ProtectLimit))
+                let Score=user.Score;
+                if (Score<=ProtectLimit){
+                    dispatch(reqProtectCheck());
+                }
+            }
+        }
+    }
+    const checkFirstPay=()=>{
+        let state=0;
+        if (firstBonus){
+            if (user.UserID>0){
+                if (firstPayConf!=null)state=1;
+            }
+        }
+        changeNewState(APP_WELFARE.FIRST_PAY,state);
+    }
+    const checkFirstPayStatus=()=>{
+        if (orderInfo!=null){
+            if (orderInfo.status==="success"){
+                dispatch(reqFirstPayConfig());
+            }
+        }
+    }
+    const checkBind=()=>{
+        let state=0;
+        if (popBindPhone){
+            if (user.UserID>0){
+                if (user.Phone==null||user.Phone===""){
+                    state=1;
+                }
+            }
+        }
+        changeNewState(APP_WELFARE.BIND,state);
+    }
+    useEffect(()=>{
+        let UserID=user.UserID;
+        if (UserID>0){
+            dispatch(reqProtectCheck());
+            dispatch(reqFirstPayConfig());
+        }
+    },[user.UserID]);
+    useEffect(() => {
+        checkProtectLimit();
+    }, [user.Score]);
+    useEffect(()=>{
+        checkFirstPay();
+    },[firstPayConf]);
+    useEffect(()=>{
+        checkBind();
+    },[popBindPhone,user.Phone]);
+    useEffect(()=>{
+        checkProtect();
+    },[protectInfo])
+    useEffect(()=>{
+        checkFirstPayStatus();
+    },[orderInfo])
+    const renderBar=()=>{
+        let extra='';
+        if (!isMobile()){
+            if (open)extra='sidebar-open';
+            else extra='sidebar-close';
+        }
+        return (
+            <div className={`${styles.container} ${extra}`}>
+                <div className={styles.content}>
+                    <WelfareBtn key={"protect"} open={openProtect} pressDown={getWelfTabState(APP_WELFARE.PROTECT)}
+                                onClick={() => {
+                                    global.showProtectReward();
+                                }}>
+                        <img className={styles.wlf_protect} src={require("@assets/welfare/fundos_"+i18n.language+".png")}/>
+                    </WelfareBtn>
+                    <WelfareBtn key={"first_pay"} open={openFirst} pressDown={getWelfTabState(APP_WELFARE.FIRST_PAY)}
+                                onClick={() => {
+                                    global.showFirstPay();
+                                }}>
+                        <img className={styles.wlf_first} src={require("@assets/welfare/first_"+i18n.language+".png")}/>
+                    </WelfareBtn>
+                    <WelfareBtn key={"bind"} open={openBind} pressDown={getWelfTabState(APP_WELFARE.BIND)}
+                                onClick={() => {
+                                    global.showBindPhone();
+                                }}>
+                        <img className={styles.wlf_bind} src={require("@assets/welfare/veri_"+i18n.language+".png")}/>
+                    </WelfareBtn>
+                </div>
+            </div>
+        )
+    }
+    return (
+        <>
+            {renderBar()}
+        </>
+    )
+}
+export default WWelfarebar;

src/widgets/WWelfarebar/styles.module.scss

@@ -0,0 +1,59 @@
+$leftb:"./../../assets/welfare/leftb.png";
+$leftb_1:"./../../assets/welfare/leftb_1.png";
+.container{
+  display: flex;
+  flex-direction: column;
+  position: fixed;
+  z-index: var(--zindex-welfare);
+  left: 0;
+  bottom: 12rem;
+}
+.content{
+  display: flex;
+  flex-direction: column;
+  gap: 0.8rem;
+  transition: all var(--transition);
+}
+.wlf_btn{
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+  pointer-events: auto;
+  width: 5rem;
+  aspect-ratio: 144/162;
+  background: url($leftb);
+  background-size: 100% 100%;
+  &_press{
+    background: url($leftb_1);
+    background-size: 100% 100%;
+  }
+  opacity: 0;
+  transform: translateX(-100%);
+  &_open{
+    opacity: 1;
+    transform: translateX(0%);
+    transition: opacity .3s ease, transform .3s ease;
+  }
+  &_close{
+    opacity: 0;
+    transform: translateX(-100%);
+    transition: opacity .3s ease, transform .3s ease;
+  }
+}
+.wlf_protect{
+  width: 5rem;
+  height: auto;
+  margin-left: 0.5rem;
+  margin-top: 0.1rem;
+}
+.wlf_first{
+  width: 3.2rem;
+  height: auto;
+  margin-left: -0.5rem;
+}
+.wlf_bind{
+  width: 3.5rem;
+  height: auto;
+  margin-left: -0.5rem;
+}