.

src/layouts/index.jsx

@@ -10,10 +10,15 @@ export default (Child) => (props) => {
   const router = useRouter()
   
   const location = Taro.getStorageSync('location')
+
   useEffect(()=>{
+    if (router.path==='/pages/login/index') {
+      return
+    }
     if (router.path!=='/pages/index/index'&&!person?.phone) {
-      Taro.reLaunch({ url: '/pages/login/index' });
+      Taro.navigateTo({ url: '/pages/login/index' });
     }
-  },[router.path])
+  },[person?.phone, router?.path])
+
   return <Child {...props} router={router} location={location} />
 }

src/pages/index/index.jsx

@@ -24,7 +24,7 @@ export default withLayout((props) => {
   const [currentTab, setCurrentTab] = useState(0);
   const handleClick = (val) => {
     if (!person.phone) {
-      Taro.reLaunch({ url: '/pages/login/index' });
+      Taro.navigateTo({ url: '/pages/login/index' });
     }      
     setCurrentTab(val);
   };

src/pages/login/index.jsx

@@ -3,6 +3,7 @@ import { useState } from "react"
 import { useModel } from '@/store'
 import { View, Image, Input, Text, Checkbox, Label, Button } from "@tarojs/components"
 import CustomNav from "@/components/CustomNav"
+import withLayout from '@/layouts'
 import MyButton from "@/components/MyButton"
 import {updatePhone, setQcode } from '@/services/login'
 import bgi from '@/assets/login/loginImg.png'
@@ -12,7 +13,7 @@ import unChecked from '@/assets/login/unChecked.png'
 
 import './style.less'
 
-export default (props) => {
+export default withLayout((props) => {
   const { person,setPerson } = useModel('person')
 
   const [agreement,setAgreement]=useState(false)
@@ -89,7 +90,7 @@ export default (props) => {
           icon: 'none',
           duration: 1000
         })
-        Taro.reLaunch({ url: '/pages/index/index?tab=2' });
+        Taro.navigateBack({ detail:1 });
       }).catch((e) => {
         Taro.showToast({
           title: '手机号或者验证码不正确',
@@ -134,4 +135,4 @@ export default (props) => {
       </View>
     </View>
   )
-}
+})