F

src/layouts/index.jsx

@@ -19,10 +19,9 @@ export default (props) => {
   } ${className}`;
 
   const currentPage = Taro.getCurrentPages().slice().pop();
-  const isLoginPage = currentPage.route.includes("pages/login/index");
 
   React.useEffect(() => {
-    //  currentPage = Taro.getCurrentPages().slice().pop();
+    const isLoginPage = currentPage.route.includes("pages/login/index");
 
     if (!user) {
       try {
@@ -54,7 +53,7 @@ export default (props) => {
     //     return;
     //   }
     // }
-  }, [current, user, isLoginPage]);
+  }, [current, user]);
 
   // React.useEffect(() => {
   //   console.log("personRef******************");
@@ -106,11 +105,7 @@ export default (props) => {
             </Loading>
           </View>
         )} */}
-        {/* {!isLoginPage ? (
-          <Auth roles={roles}>{props.children}</Auth>
-        ) : (
-          props.children
-        )} */}
+  
         <Auth roles={roles}>{props.children}</Auth>
         {!tabBar && <View className={laySty["pdm-space"]}></View>}
       </View>