Merge branch 'xudh' into sport

src/components/GameItem/styles.module.scss

@@ -5,7 +5,8 @@
   scroll-snap-align: start;
   width: 100%;
   //border-radius: var(--border-radius);
-  transition: all var(--transition);
+  //transition: all var(--transition);
+  transition: filter var(--transition),transform var(--transition);
   will-change: transform;
   & .game_img_wrap{
     display: flex;

src/components/GameTabs/index.jsx

@@ -93,7 +93,7 @@ const GameTabs=({data})=>{
                         return (
                             <Fragment key={index}>
                                 <Suspense fallback={<SmallLoading/>}>
-                                    <Comp data={item}></Comp>
+                                    <Comp key={"Comp_"+tabIndex+"_"+index} data={item}></Comp>
                                 </Suspense>
                             </Fragment>
                         )

src/features/mainSlice.js

@@ -221,7 +221,10 @@ const reducerRoutes=(state,action)=>{
             //显示救济浮标
             if (!!conf.openRelief)openRelief=conf.openRelief;
             //sport 配置
-            if (!!conf.bb)bbConf=conf.bb;
+            if (!!conf.bb){
+                bbConf=conf.bb;
+                if(userInfo!=null)userInfo.bb=bbConf;
+            }
         }
         //favorites
         // let favorites=getFavorites(json.favorites);
@@ -270,6 +273,9 @@ const parseLogin=(state,action,arg,isShowMsg=true)=>{
     //success
     if (code==200){
         let data=payload.data;
+        if (data.bb==null){
+            if (state.userInfo!=null)data.bb=state.userInfo.bb;
+        }
         state.userInfo=data;
         state.isLogin=1;
         // localStorageSet(LOCAL_USER_INFO,JSON.stringify(data));

src/widgets/WSecurity/index.jsx

@@ -15,6 +15,7 @@ const WSecurity = ({ close }) => {
     const navigate = useNavigate();
     const user=useSelector(getUserInfo);
     const dispatch = useDispatch();
+    const isShowPWD=user != null && user.Phone != null && user.Phone !== "";
     return (
         <div className={styles.container}>
             <Spring className={styles.content} type={"slideUp"}>
@@ -22,25 +23,29 @@ const WSecurity = ({ close }) => {
                     {i18n.t("security.title")}
                 </div>
                 <div className={styles.line}></div>
-                <div className={styles.item}>
-                    <div className={styles.item_title_con}>
-                        <PhonePassIcon className={styles.icon}></PhonePassIcon>
-                        <div className={styles.title}>{i18n.t("security.login_pass_title")}</div>
-                    </div>
-                    <div>{i18n.t("security.login_pass_des")}</div>
-                    <button className={`button-green ${styles.button}`} onClick={()=>{
-                        navigate(ROUTE_PATH.EDIT_PWD)
-                    }}>{i18n.t("security.login_pass_title")}</button>
-                </div>
+                {
+                    isShowPWD? (
+                        <div className={styles.item}>
+                            <div className={styles.item_title_con}>
+                                <PhonePassIcon className={styles.icon}></PhonePassIcon>
+                                <div className={styles.title}>{i18n.t("security.login_pass_title")}</div>
+                            </div>
+                            <div>{i18n.t("security.login_pass_des")}</div>
+                            <button className={`button-green ${styles.button}`} onClick={() => {
+                                navigate(ROUTE_PATH.EDIT_PWD)
+                            }}>{i18n.t("security.login_pass_title")}</button>
+                        </div>
+                    ):(<></>)
+                }
                 <div className={styles.item}>
                     <div className={styles.item_title_con}>
                         <WithdrawPassIcon className={styles.icon}></WithdrawPassIcon>
                         <div className={styles.title}>{i18n.t("security.withdraw_pass_title")}</div>
                     </div>
                     <div>{i18n.t("security.withdraw_pass_des")}</div>
-                    <button className={`button-green ${styles.button}`} onClick={()=>{
-                        let InsurePass=Number(user.InsurePass);
-                        let type=InsurePass;
+                    <button className={`button-green ${styles.button}`} onClick={() => {
+                        let InsurePass = Number(user.InsurePass);
+                        let type = InsurePass;
                         dispatch(setChangePayPassType(InsurePass));
                         navigate(ROUTE_PATH.CHANGE_PAY_PASS)
                     }}>{i18n.t("security.withdraw_pass_title")}</button>