set pages

config/dev.js

@@ -3,8 +3,8 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    // HOST: '"https://machine.njyunzhi.com"',
-    HOST: '"http://192.168.89.25:7080"',
+    HOST: '"https://machine.njyunzhi.com"',
+    // HOST: '"http://192.168.89.25:7080"',
     OSS: '""',
     // VERSION: '"2.0.33"',
   },

src/components/CustomNav/index.jsx

@@ -47,8 +47,8 @@ export default (props) => {
 
   const handleAction = () => {
     if (home || logo) return;
-
     if (Taro.getCurrentPages().length > 1) {
+
       Taro.navigateBack({ delta: 1 })
     }
   }

src/components/LoginModel/index.jsx

@@ -16,7 +16,7 @@ import './style.less'
 
 export default (props) => {
 
-  const { isLoginVisible, loginType } = props
+  const { isLoginVisible, loginType, tab } = props
 
   const { person, setPerson } = useModel('userData')
 
@@ -94,6 +94,8 @@ export default (props) => {
 
 
   const getUserLogin = () => {
+    Taro.navigateTo({ url: `/pages/index/index?tab=${tab}` });
+
     if (InputPhoneValue === '' || !(/^1[3456789]\d{9}$/.test(InputPhoneValue))) {
       console.log('提示')
       Taro.showToast({
@@ -115,9 +117,11 @@ export default (props) => {
           setPerson(e.person)
           // Taro.navigateTo({ url: path });
           if (loginType) {
+
             Taro.navigateBack({
               delta: 1
             })
+
           } else {
             myClosure()
 

src/layouts/index.jsx

@@ -13,13 +13,8 @@ import useLogin from '@/utils/hooks/useLogin'
 export default (Child) => (props) => {
   const { person } = useModel('userData')
   const router = useRouter()
-  console.log("🚀 ~ file: index.jsx ~ line 16 ~ router", router)
-
-
   const { loginVisible } = useLogin()
 
-
-
   // 确保执行过 login 方法，拿到了 person
   const isLoged = useMemo(() => !!person?.personId, [person?.personId])
 

src/pages/LoginPage/index.jsx

@@ -11,7 +11,7 @@ export default (props) => {
   const [isShow, setIsShow] = useState(false)
 
   const $instance = Taro.getCurrentInstance()
-  const { login } = $instance.router.params
+  const { login, tab } = $instance.router.params
 
   useEffect(() => {
     setIsShow(true)
@@ -20,7 +20,7 @@ export default (props) => {
   return (
     <View className='page-index'>
       <View>
-        <LoginModel isLoginVisible={isShow} loginType={login} />
+        <LoginModel isLoginVisible={isShow} loginType={login} tab={tab} />
       </View>
     </View>
   )

src/pages/index/index.jsx

@@ -37,12 +37,8 @@ export default withLayout((props) => {
 
 
   console.log("🚀 ~ file: index.jsx ~ line 24 ~ withLayout ~ tab", tab)
-
   const [currentTab, setCurrentTab] = useState(0)
-
   const [isDidShow, setIsDidShow] = useState(0)
-
-
   const [tabsIndex, setTabsIndex] = useState(0)
 
 
@@ -51,44 +47,33 @@ export default withLayout((props) => {
 
 
   useDidShow(() => {
-    setIsDidShow(isDidShow + 1)
+    console.log('useDidShow',);
+
     if (!person?.phone) {
       console.log('还是未登录',);
       setCurrentTab(0)
-
-
-    } else {
-      setCurrentTab(tabsIndex)
-      // handleTabChange(tabsIndex)
-
-      console.log('已登陆',);
-
     }
   })
 
   useEffect(() => {
+    // setCurrentTab(index)
+
     if (tab) {
       setCurrentTab(tab - 0)
-
-
     }
     // setIsShow(true)
   }, [tab,])
 
-
   const handleClick = (index) => {
     // Taro.switchTab({
     //   url: '/pages/InformationPage/index'
     // })
-
-
     if (!person?.phone) {
-      setTabsIndex(index)
-      Taro.navigateTo({ url: `/pages/LoginPage/index?login=true` })
+      Taro.navigateTo({ url: `/pages/LoginPage/index?login=true&tab=${index}` })
       // setIsShow(true)
     } else {
-      setCurrentTab(index)
-
+      Taro.redirectTo({ url: `/pages/index/index?tab=${index}` });
+      // setCurrentTab(index)
     }
   }
 
@@ -106,7 +91,7 @@ export default withLayout((props) => {
         {currentTab === 1 && <Orders router={router} />}
         {currentTab === 2 && <Information router={router} />}
 
-        {currentTab === 3 && <Mine isDidShow={isDidShow} router={router} />}
+        {currentTab === 3 && <Mine router={router} />}
       </view>
       <view className='index-tabbar'>
         <View

src/pages/index/tabs/Information.jsx

@@ -16,7 +16,6 @@ export default withLayout((props) => {
 
   const goInfoMationInfo = (res) => {
     Taro.navigateTo({ url: `/pages/InformationInfo/index?id=${res}` })
-
   }
   useEffect(() => {
     getNewsList().then((res) => {