|
|
@@ -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;
|
|
|
|