F

src/layouts/index.jsx

 export default (props) => {
   const { className, style, roles, tabBar = false, loading } = props;
 
-  const { person, user, duty } = useModel("user");
+  // person,
+  const { user, duty } = useModel("user");
   const containerClass = `${laySty["page-conatiner"]} ${
     tabBar ? laySty["with-tabbar"] : ""
   } ${className}`;
   const userRef = useRef();
   const personRef = useRef();
 
-  React.useEffect(() => {
-    if (!userRef.current && !personRef.current) {
-      userRef.current = person;
-      personRef.current = user;
-    }
-    if (!user) {
-      userRef.current = null;
-    }
-    console.log("personRef******************");
-    console.log(personRef.current);
-    console.log("userRef******************");
-    console.log(userRef.current);
-    console.log(personRef.current && !userRef.current);
-
-    if (personRef.current && !userRef.current) {
-      const currentPage = Taro.getCurrentPages().slice().pop();
-      console.log(currentPage.route);
-      if ("pages/login/index" !== currentPage.route) {
-        Taro.navigateTo({
-          url: "/pages/login/index",
-        });
-      }
-    }
-  }, [person, user]);
-
   // React.useEffect(() => {
+  //   if (!userRef.current && !personRef.current) {
+  //     userRef.current = person;
+  //     personRef.current = user;
+  //   }
+  //   if (!user) {
+  //     userRef.current = null;
+  //   }
   //   console.log("personRef******************");
-  //   console.log(person);
+  //   console.log(personRef.current);
   //   console.log("userRef******************");
-  //   console.log(user);
-  //   console.log(person && !user);
+  //   console.log(userRef.current);
+  //   console.log(personRef.current && !userRef.current);
 
-  //   if (person && !user) {
+  //   if (personRef.current && !userRef.current) {
   //     const currentPage = Taro.getCurrentPages().slice().pop();
+  //     console.log(currentPage.route);
   //     if ("pages/login/index" !== currentPage.route) {
   //       Taro.navigateTo({
   //         url: "/pages/login/index",
   //   }
   // }, [person, user]);
 
+  React.useEffect(() => {
+    console.log("personRef******************");
+    // console.log(person);
+    console.log("userRef******************");
+    console.log(user);
+    console.log(!user);
+
+    if (!user) {
+      const currentPage = Taro.getCurrentPages().slice().pop();
+      if (!currentPage.route.includes("pages/login/index")) {
+        Taro.navigateTo({
+          url: "/pages/login/index",
+        });
+      }
+    }
+  }, [user]);
+
   Taro.useShareAppMessage(() => {
     return {
       title: "文明霍山",
       <Dialog id="vanDialog" />
       <NavLoading loading={loading} />
       <View className={containerClass} style={style}>
-        {!person && (
+        {/* {!person && (
           <View className={laySty.loading}>
             <Loading size="32px" vertical>
               加载中...
             </Loading>
           </View>
-        )}
+        )} */}
         <Auth roles={roles}>{props.children}</Auth>
 
         {!tabBar && <View className={laySty["pdm-space"]}></View>}

src/store/user.js

   const maLogin = (code) => {
     login(code)
       .then((res) => {
-        setPerson(res.person);
+        // setPerson(res.person);
         Taro.setStorage({ key: "personId", data: res.person.personId });
         Taro.setStorage({ key: "sessionKey", data: res.sessionKey });
       })
   };
 
   const signOut = () => {
+    console.log(111111)
     setUser(null);
     initDuty(null);
   };