|
|
@@ -218,7 +218,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);
|
|
|
@@ -267,6 +270,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));
|