Merge branch 'master' into xudh

Conflicts:
	src/features/mainSlice.js

src/App.js

@@ -44,11 +44,11 @@ import Layout from "@layout/Layout";
 import {
     getBFP,
     getFetchStatus,
-    getHallServerUrl, getKickState, getPromoteInstall,
+    getHallServerUrl, getKickState, getOpenPay, getPromoteInstall,
     getUserID,
     getUserInfo,
     isLogined,
-    updateCurrGame
+    updateCurrGame, updateOpenPay
 } from '@features/mainSlice';
 import {useDispatch, useSelector} from "react-redux";
 import {REQ_STATUS} from "@api/config";
@@ -96,6 +96,7 @@ const App = () => {
     // const {preLocation,gameID}=usePreviousRoute();
     const serverKick=useSelector(getKickState);
     const promoteInstall=useSelector(getPromoteInstall);
+    const openPay=useSelector(getOpenPay);
     const muiTheme = createTheme({
         direction: direction,
     });
@@ -286,6 +287,13 @@ const App = () => {
             },time);
         }
     },[promoteInstall])
+    //监听打开pay
+    useEffect(()=>{
+        if (openPay===1){
+            navigate(ROUTE_PATH.PAY,{replace:true});
+            dispatch(updateOpenPay(0));
+        }
+    },[openPay])
     //app Effect
 
     const renderLayout=()=>{

src/api/request.js

@@ -38,6 +38,13 @@ const checkResponse=(data)=>{
                 }
             });
         }
+        else if (data.code===777){
+            let action={
+                type:"main/updateOpenPay",
+                payload:1,
+            }
+            if (global.dispatch)global.dispatch(action);
+        }
     }
 }
 const service = axios.create({

src/features/mainSlice.js

@@ -2,7 +2,6 @@ import { initTrackAll ,trackEvent} from "../tracking/TrackAll"
 import {createAsyncThunk, createSlice} from "@reduxjs/toolkit";
 import {routes} from "@db/routes";
 import {
-    ROUTE_PATH,
     ROUTE_TYPE_CUSTOM,
     ROUTE_TYPE_FULL,
     ROUTE_TYPE_IN,
@@ -419,7 +418,8 @@ export const Main=createSlice({
         favorites:[],
         gameID:0,
         serverKick:0,
-        promoteInstall:0
+        promoteInstall:0,
+        openPay:0
     },
     reducers: {
         logout:(state, action)=>{
@@ -473,12 +473,8 @@ export const Main=createSlice({
         updateServerKick:(state,action)=>{
             state.serverKick=action.payload;
         },
-        updateGameRoute:(state,action)=>{
-            let route=state.allMap[ROUTE_PATH.GAME+"/*"];
-            if (route!=null){
-                let type=action.payload;
-                route.type=type;
-            }
+        updateOpenPay:(state,action)=>{
+            state.openPay=action.payload;
         }
     },
     extraReducers: (builder) => {
@@ -499,7 +495,7 @@ export const Main=createSlice({
         buildReqReducer(builder,reqFavoGet,reducerFavoGet,null);
     },
 })
-export const {logout,updateUserInfo,updateUserScore,updateAddScore,updateGameLike,updateCurrGame,updateServerKick,updateGameRoute} = Main.actions;
+export const {logout,updateUserInfo,updateUserScore,updateAddScore,updateGameLike,updateCurrGame,updateServerKick,updateOpenPay} = Main.actions;
 //数据获取
 export const getFetchStatus=(state)=>{
     return state.main.status;
@@ -668,6 +664,9 @@ export const getKickState=(state)=>{
 export const getPromoteInstall=(state)=>{
     return state.main.promoteInstall;
 }
+export const getOpenPay=(state)=>{
+    return state.main.openPay;
+}
 //数据获取
 export default Main.reducer;