feats

src/layout/useScreen.js

@@ -10,7 +10,7 @@ export default function useScreen(cityId, person) {
   const dispatch = useDispatch()
 
   const [firstScreen, setFirstScreen] = useState()
-  const canShow = useSelector(s => !s.system.firstScreen.filter(x => x === cityId)[0])
+  const cityShow = useSelector(s => s.system.firstScreen.filter(x => x.cityId === cityId)[0])
   const toggle = useCallback(
     () => dispatch({ type: 'TOGGLE_FIRSTSCREEN', payload: { cityId } }),
     [cityId, dispatch],
@@ -29,7 +29,5 @@ export default function useScreen(cityId, person) {
     }
   }, [cityId, toggle, person?.personId])
 
-  const show = canShow && firstScreen
-
-  return [firstScreen, show, toggle]
+  return [firstScreen, cityShow?.visible, toggle]
 }

src/reducers/system.js

@@ -45,12 +45,18 @@ export default function(state = INITIAL_STATE, action) {
     }
     case 'TOGGLE_FIRSTSCREEN': {
       const { cityId } = action.payload
-      const showed = state.firstScreen.filter(x => x === cityId)[0]
-
-      if (!showed) {
+      let cityState = state.firstScreen.filter(x => x.cityId === cityId)[0]
+console.log('---------cityState-------->', cityState)
+      if (!cityState) {
+        return {
+          ...state,
+          firstScreen: state.firstScreen.concat({ cityId, showed: true, visible: true })
+        };
+      } else if (cityState.showed && cityState.visible) {
+        const firstScreen = state.firstScreen.map(x => x.cityId === cityId ? { ...x, visible: false } : x)
         return {
           ...state,
-          firstScreen: state.firstScreen.concat(cityId)
+          firstScreen,
         };
       }