feat

src/app.js

@@ -5,10 +5,10 @@ import { useEffect } from "react";
 import "@antmjs/vantui/lib/index.less";
 
 const App = (props) => {
-  useEffect(() => {
-    const userState = store.getState("user");
-    userState.current();
-  }, []);
+  // useEffect(() => {
+  //   const userState = store.getState("user");
+  //   userState.current();
+  // }, []);
 
   return <Provider>{props.children}</Provider>;
 };

src/layouts/index.jsx

@@ -11,7 +11,7 @@ import laySty from "./layout.module.less";
 export default (props) => {
   const { className, style, roles, tabBar = false, loading } = props;
 
-  const { user, duty } = useModel("user");
+  const { user, duty, current: currentUser } = useModel("user");
   const containerClass = `${laySty["page-conatiner"]} ${
     tabBar ? laySty["with-tabbar"] : ""
   } ${className}`;
@@ -50,17 +50,19 @@ export default (props) => {
     console.log("userRef******************");
     console.log(user);
     console.log(!user);
-    if (!userRef.current&&user) {
-      userRef.current = user;
-    }
+    // if (!userRef.current&&user) {
+    //   userRef.current = user;
+    // }
 
-    if (!userRef.current) {
-      const currentPage = Taro.getCurrentPages().slice().pop();
-      if (!currentPage.route.includes("pages/login/index")) {
-        Taro.navigateTo({
-          url: "/pages/login/index",
-        });
-      }
+    if (!user) {
+      currentUser().catch(() => {
+        const currentPage = Taro.getCurrentPages().slice().pop();
+        if (!currentPage.route.includes("pages/login/index")) {
+          Taro.navigateTo({
+            url: "/pages/login/index",
+          });
+        }
+      })
     }
   }, [user]);
 

src/store/user.js

@@ -10,6 +10,7 @@ import {
 } from "@/services/wxma";
 import { changePassword } from "@/services/sysuser";
 import { ROLE_CITIZEN } from "@/utils/user";
+import { setToken } from "@/utils/token";
 
 export default function useUser() {
   const [person, setPerson] = React.useState();
@@ -62,14 +63,18 @@ export default function useUser() {
   };
 
   const current = () => {
-    currentUser()
-      .then((res) => {
-        setUser(res?.user);
-        initDuty(res?.user);
-      })
-      .catch((e) => {
-        console.log(e);
-      });
+    return new Promise((resolve, reject) => {
+      currentUser()
+        .then((res) => {
+          setUser(res?.user);
+          initDuty(res?.user);
+          resolve(res?.user);
+        })
+        .catch((e) => {
+          console.log(e);
+          reject(e);
+        });
+    });
   };
 
   const signinByPhone = (code) => {
@@ -91,6 +96,10 @@ export default function useUser() {
     console.log(111111)
     setUser(null);
     initDuty(null);
+    setToken();
+    Taro.navigateTo({
+      url: "/pages/login/index",
+    });
   };
 
   const changePwd = (params) => {