Bläddra i källkod

充值内首冲修复 Checkin 领取了之后弹下首冲

zhejiushizhuce 2 år sedan
förälder
incheckning
33f6487bbb
3 ändrade filer med 19 tillägg och 3 borttagningar
  1. 8 2
      src/features/mainSlice.js
  2. 10 0
      src/widgets/WCheckIn/index.jsx
  3. 1 1
      src/widgets/WDeposit/BR/BRDeposit.jsx

+ 8 - 2
src/features/mainSlice.js

@@ -259,6 +259,7 @@ const reducerRoutes=(state,action)=>{
         let area=global.getLocalAreaID();
         //sport 配置
         let bbConf=null;
+        let popFirst=0;
         if (conf){
             if (!!conf.hall)hallServerUrl=conf.hall;
             if (!!conf.DOLLAR)global.DOLLAR=conf.DOLLAR;
@@ -289,10 +290,11 @@ const reducerRoutes=(state,action)=>{
             }
             if (!!conf.loginOpen)loginOpen=conf.loginOpen;
             if (!!conf.registerOpen)registerOpen=conf.registerOpen;
+            if (!!conf.popFirst)popFirst=conf.popFirst;
         }
         //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,bbConf,accountLogin,area,loginOpen,registerOpen});
+        Object.assign(state, {routes:state.routes,asyncRoutes:data,styles,blocks,...generData,isLogin:isLogin,userInfo,hallServerUrl,promoteInstall,guest,upgradeBonus,popWheel,popBindPhone,firstBonus,openRelief,bbConf,accountLogin,area,loginOpen,registerOpen,popFirst});
         // 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});
     }
 }
@@ -632,7 +634,8 @@ export const Main=createSlice({
         accountLogin:0,
         area:0,
         loginOpen:"",
-        registerOpen:""
+        registerOpen:"",
+        popFirst:0
     },
     reducers: {
         logout:(state, action)=>{
@@ -979,6 +982,9 @@ export const getLoginOpen=(state)=>{
 export const getRegisterOpen=(state)=>{
     return state.main.registerOpen;
 }
+export const getPopFirst=(state)=>{
+    return state.main.popFirst;
+}
 //数据获取
 export default Main.reducer;
 

+ 10 - 0
src/widgets/WCheckIn/index.jsx

@@ -12,6 +12,8 @@ import {reqCheckinCheck, reqCheckinGet, reqRedpackCheck} from "@features/api";
 import {REQ_STATUS} from "@api/config";
 import SmallLoading from "@components/SmallLoading";
 import {formatTime} from "@utils/helpers";
+import {getPopFirst} from "@features/mainSlice";
+import {getFirstPayMulti} from "@features/paySlice";
 const i18n=global.i18n;
 const imgList={
     1:{
@@ -54,6 +56,8 @@ const WCheckIn = ({close}) => {
     const dispatch=useDispatch();
     const NextGetTime=useSelector(getNextGetTime);
     const [leftTime,setLeftTime]=useState(0);
+    const popFirst=useSelector(getPopFirst);
+    const firstPayMulti=useSelector(getFirstPayMulti);
     const resetTimer=()=>{
         if (objInfo.timer!=null){
             clearInterval(objInfo.timer);
@@ -87,6 +91,11 @@ const WCheckIn = ({close}) => {
             },1000);
         }
     },[NextGetTime])
+    const checkFirstPay=()=>{
+        if (!popFirst)return;
+        if (firstPayMulti==null)return;
+        global.showFirstPay();
+    }
     const onClose=()=>{
         setOpen(false);
         if(close)close();
@@ -98,6 +107,7 @@ const WCheckIn = ({close}) => {
         if (payload&&payload.code===200){
             global.showDropCoins();
             close();
+            checkFirstPay();
         }
         // else if (payload&&payload.code===301)
         // {

+ 1 - 1
src/widgets/WDeposit/BR/BRDeposit.jsx

@@ -181,7 +181,7 @@ const BRDeposit=()=>{
                         price: item.money,
                         goodsName: "firstpay",
                         payType: item.id,
-                        GiftsID: item.GiftsID
+                        GiftsID: item.gift_id
                     })
                 }
                 else if (status===1){