|
@@ -166,6 +166,7 @@ const reducerRoutes=(state,action)=>{
|
|
|
let user=json.user;
|
|
let user=json.user;
|
|
|
let isLogin=0;
|
|
let isLogin=0;
|
|
|
let userInfo={};
|
|
let userInfo={};
|
|
|
|
|
+ let hasPhone=0;
|
|
|
if (user){
|
|
if (user){
|
|
|
if (typeof user=="object"){
|
|
if (typeof user=="object"){
|
|
|
isLogin=1;
|
|
isLogin=1;
|
|
@@ -175,6 +176,10 @@ const reducerRoutes=(state,action)=>{
|
|
|
// global.dispatch(reqPayConfig(user));
|
|
// global.dispatch(reqPayConfig(user));
|
|
|
let sign=user.sign;
|
|
let sign=user.sign;
|
|
|
if (sign!=null)localStorageSet(LOCAL_SIGN,sign);
|
|
if (sign!=null)localStorageSet(LOCAL_SIGN,sign);
|
|
|
|
|
+
|
|
|
|
|
+ if(user.Phone!==""&&user.Phone.startsWith(user.RegisterLocation)){
|
|
|
|
|
+ hasPhone=1;
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
let conf=json.conf;
|
|
let conf=json.conf;
|
|
@@ -182,6 +187,10 @@ const reducerRoutes=(state,action)=>{
|
|
|
let promoteInstall=0;
|
|
let promoteInstall=0;
|
|
|
let guest=0;
|
|
let guest=0;
|
|
|
let upgradeBonus=0;
|
|
let upgradeBonus=0;
|
|
|
|
|
+ let popWheel=0;
|
|
|
|
|
+ let popBindPhone=0;
|
|
|
|
|
+ let firstBonus=0;
|
|
|
|
|
+ let openRelief=0;
|
|
|
if (conf){
|
|
if (conf){
|
|
|
if (!!conf.hall)hallServerUrl=conf.hall;
|
|
if (!!conf.hall)hallServerUrl=conf.hall;
|
|
|
if (!!conf.DOLLAR)global.DOLLAR=conf.DOLLAR;
|
|
if (!!conf.DOLLAR)global.DOLLAR=conf.DOLLAR;
|
|
@@ -196,10 +205,19 @@ const reducerRoutes=(state,action)=>{
|
|
|
//guest
|
|
//guest
|
|
|
if (!!conf.guest)guest=conf.guest;
|
|
if (!!conf.guest)guest=conf.guest;
|
|
|
if (!!conf.upgradeBonus)upgradeBonus=conf.upgradeBonus;
|
|
if (!!conf.upgradeBonus)upgradeBonus=conf.upgradeBonus;
|
|
|
|
|
+ //弹出转盘
|
|
|
|
|
+ if (!!conf.popWheel)popWheel=conf.popWheel;
|
|
|
|
|
+ //弹出绑定电话奖励,并显示浮标
|
|
|
|
|
+ if (!!conf.popBindPhone)popBindPhone=hasPhone?0:conf.popBindPhone;
|
|
|
|
|
+ //显示首冲浮标
|
|
|
|
|
+ if (!!conf.firstBonus)firstBonus=conf.firstBonus;
|
|
|
|
|
+ //显示救济浮标
|
|
|
|
|
+ if (!!conf.openRelief)openRelief=conf.openRelief;
|
|
|
}
|
|
}
|
|
|
//favorites
|
|
//favorites
|
|
|
// let favorites=getFavorites(json.favorites);
|
|
// let favorites=getFavorites(json.favorites);
|
|
|
- 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});
|
|
|
|
|
|
|
+ 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:styles,blocks:blocks,...generData,isLogin:isLogin,userInfo:userInfo,hallServerUrl:hallServerUrl,promoteInstall:promoteInstall,guest:guest,upgradeBonus:upgradeBonus});
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
const routesStatus=(state,status,arg)=>{
|
|
const routesStatus=(state,status,arg)=>{
|
|
@@ -769,6 +787,9 @@ export const getKickState=(state)=>{
|
|
|
export const getPromoteInstall=(state)=>{
|
|
export const getPromoteInstall=(state)=>{
|
|
|
return state.main.promoteInstall;
|
|
return state.main.promoteInstall;
|
|
|
}
|
|
}
|
|
|
|
|
+export const getPopWheel=(state)=>{
|
|
|
|
|
+ return state.main.popWheel;
|
|
|
|
|
+}
|
|
|
export const getOpenPay=(state)=>{
|
|
export const getOpenPay=(state)=>{
|
|
|
return state.main.openPay;
|
|
return state.main.openPay;
|
|
|
}
|
|
}
|