福利条修改 渠道变化更新 bb conf 添加

src/constants/routes.js

@@ -39,7 +39,8 @@ const ROUTE_PATH={
     PRIVACY:"#/privacy",
     SERVICES:"#/services",
     KYC:"#/kyc",
-    CHECK_IN:"#/checkIn"
+    CHECK_IN:"#/checkIn",
+    SPORTS:"/sports"
 }
 
 export {

src/features/mainSlice.js

@@ -23,6 +23,7 @@ import {
 import {toast} from 'react-toastify';
 import {getHttpMsg, localStorageGet, localStorageSet} from "@utils/helpers";
 import {
+    LOCAL_ACTIVITY_C,
     LOCAL_CUSTOM_LOCK,
     LOCAL_FAVO_IDS, LOCAL_GAME_URL,
     LOCAL_IS_LOGIN,
@@ -180,6 +181,7 @@ const reducerRoutes=(state,action)=>{
                 if(user.Phone!==""&&user.Phone.startsWith(user.RegisterLocation)){
                     hasPhone=1;
                 }
+                checkChannel(user);
             }
         }
         let conf=json.conf;
@@ -191,6 +193,8 @@ const reducerRoutes=(state,action)=>{
         let popBindPhone=0;
         let firstBonus=0;
         let openRelief=0;
+        //sport 配置
+        let bbConf=null;
         if (conf){
             if (!!conf.hall)hallServerUrl=conf.hall;
             if (!!conf.DOLLAR)global.DOLLAR=conf.DOLLAR;
@@ -209,15 +213,16 @@ const reducerRoutes=(state,action)=>{
             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;
+            //sport 配置
+            if (!!conf.bb)bbConf=conf.bb;
         }
         //favorites
         // let favorites=getFavorites(json.favorites);
-        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,blocks,...generData,isLogin:isLogin,userInfo,hallServerUrl,promoteInstall,guest,upgradeBonus,popWheel,popBindPhone,firstBonus,openRelief,bbConf});
         // 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});
     }
 }
@@ -241,6 +246,20 @@ const getLocalIsLogin=()=>{
 const getMsg=(payload)=>{
     return getHttpMsg(payload);
 }
+//检查渠道
+const checkChannel=(userInfo)=>{
+    if (userInfo!=null&&userInfo.Channel!=null){
+        let Channel=parseInt(userInfo.Channel);
+        let localC=localStorageGet(LOCAL_ACTIVITY_C,"");
+        if (localC!=null&&localC!==""){
+            localC=parseInt(localC);
+            if (Channel!==localC){
+                localStorageSet(LOCAL_ACTIVITY_C,Channel+"");
+                window.location.replace(window.location.origin);
+            }
+        }
+    }
+}
 const parseLogin=(state,action,arg,isShowMsg=true)=>{
     let payload=action.payload;
     let code=payload.code;
@@ -261,6 +280,7 @@ const parseLogin=(state,action,arg,isShowMsg=true)=>{
             //新注册的
             trackEvent("CompleteRegistration",{external_id:data.UserID})
         }
+        checkChannel(data);
     }
     else
     {
@@ -512,7 +532,9 @@ export const Main=createSlice({
         //是否是guest登录
         guest:0,
         //绑定奖励
-        upgradeBonus:0
+        upgradeBonus:0,
+        //sport conf
+        bbConf:null
     },
     reducers: {
         logout:(state, action)=>{
@@ -813,6 +835,9 @@ export const getFirstBonus=(state)=>{
 export const getOpenRelief=(state)=>{
     return state.main.openRelief;
 }
+export const getBBConf=(state)=>{
+    return state.main.bbConf;
+}
 //数据获取
 export default Main.reducer;
 

src/widgets/WWelfarebar/index.jsx

@@ -9,17 +9,40 @@ import {getProtectInfo} from "@features/protectSlice";
 import {formatCash} from "@utils/helpers";
 import {useThemeProvider} from "@contexts/themeContext";
 import {useSidebar} from "@contexts/sidebarContext";
+import {useLocation} from "react-router-dom";
+import {ROUTE_PATH} from "@constants/routes";
 const i18n=global.i18n;
 const WelfareBtn=({children,open=false,pressDown=false,...props})=>{
+    const [bopen,setBopen]=useState(false);
+    const [show,setShow]=useState(false);
+    useEffect(()=>{
+        if (open){
+            setShow(true);
+            setTimeout(()=>{
+                setBopen(true);
+            },100)
+        }
+        else
+        {
+            setBopen(false);
+            setShow(false);
+        }
+    },[open])
     return (
-        <button
-            className={`${styles.wlf_btn} ${open ? styles.wlf_btn_open : styles.wlf_btn_close} ${pressDown ? styles.wlf_btn_press : ''}`}
-            {...props}
-        >
+        <>
             {
-                children == null ? (<></>) : children
+                show? (
+                    <button
+                        className={`${styles.wlf_btn} ${bopen ? styles.wlf_btn_open : styles.wlf_btn_close} ${pressDown ? styles.wlf_btn_press : ''}`}
+                        {...props}
+                    >
+                        {
+                            children == null ? (<></>) : children
+                        }
+                    </button>
+                ):(<></>)
             }
-        </button>
+        </>
     )
 }
 const WWelfarebar = () => {
@@ -38,6 +61,7 @@ const WWelfarebar = () => {
     const orderInfo=useSelector(getCurrPayOrder);
     const {welfTabState,isMobile}=useThemeProvider();
     const {open} = useSidebar();
+    const {pathname} = useLocation();
     const getWelfTabState=(key)=>{
         if (welfTabState===key)return true;
         return false;
@@ -140,9 +164,13 @@ const WWelfarebar = () => {
             if (open)extra='sidebar-open';
             else extra='sidebar-close';
         }
+        let isClose=false;
+        if (pathname.startsWith(ROUTE_PATH.SPORTS)){
+            isClose=true;
+        }
         return (
             <div className={`${styles.container} ${extra}`}>
-                <div className={styles.content}>
+                <div className={`${styles.content} ${isClose?styles.content_close:''}`}>
                     <WelfareBtn key={"protect"} open={openProtect} pressDown={getWelfTabState(APP_WELFARE.PROTECT)}
                                 onClick={() => {
                                     global.showProtectReward();

src/widgets/WWelfarebar/styles.module.scss

@@ -11,8 +11,12 @@ $leftb_1:"./../../assets/welfare/leftb_1.png";
 .content{
   display: flex;
   flex-direction: column;
+  justify-content: flex-end;
   gap: 0.8rem;
   transition: all var(--transition);
+  &_close{
+    margin-left: -100%;
+  }
 }
 .wlf_btn{
   display: flex;
@@ -33,12 +37,12 @@ $leftb_1:"./../../assets/welfare/leftb_1.png";
   &_open{
     opacity: 1;
     transform: translateX(0%);
-    transition: opacity .3s ease, transform .3s ease;
+    transition: all .3s ease;
   }
   &_close{
     opacity: 0;
     transform: translateX(-100%);
-    transition: opacity .3s ease, transform .3s ease;
+    transition: all .3s ease;
   }
 }
 .wlf_protect{