.

src/components/CustomNav/index.jsx

@@ -7,7 +7,7 @@ import './style.less'
 import { View } from '@tarojs/components'
 
 export default (props) => {
-  const { logo,home, login, title = '首页', noback,goBack } = props
+  const { logo,home, title = '首页', noback } = props
 
   // 菜单胶囊
   const menuBound = useMemo(() => Taro.getMenuButtonBoundingClientRect(), [])
@@ -66,7 +66,7 @@ export default (props) => {
           {
             !logo && !home && (
               !noback && (
-                <View style={{ width: '100%', height: '100%' }} onClick={!login?handleAction:goBack}>
+                <View style={{ width: '100%', height: '100%' }} onClick={handleAction}>
                   <image className='goback' src={goback} />
                 </View>
               )

src/components/LoginModel/index.jsx

@@ -13,7 +13,6 @@ import unChecked from '@/assets/login/unChecked.png'
 import './style.less'
 
 export default (props) => {
-  const {path,close} = props
   const { person,setPerson } = useModel('person')
 
   const [agreement,setAgreement]=useState(false)
@@ -90,8 +89,6 @@ export default (props) => {
           icon: 'none',
           duration: 1000
         })
-        close()
-        Taro.navigateTo({url:path})
       }).catch((e) => {
         Taro.showToast({
           title: '手机号或者验证码不正确',
@@ -109,7 +106,7 @@ export default (props) => {
   return (
     <View className='page-index' style={{position:'absolute', zIndex:9999}}>
       <View className='index-navbar'>
-        <CustomNav login title='登录' goBack={close} />
+        <CustomNav home title='登录' />
       </View>
       <Image src={bgi} className='loginBgi' />
       <View className='index-container loginContent'>

src/components/MyCard/index.jsx

@@ -6,7 +6,10 @@ import MyButton from "../MyButton"
 import './style.less'
 
 export default (props) => {
-  const { detail, order, job, onClick,handleDetail } = props
+  const { detail, order, job, onClick } = props
+  const handleDetail = () => {
+    Taro.navigateTo({ url: '/pages/orderDetail/index' });
+  }
   return (
     <View className='card'>
       <Jianbian status='1' />

src/layouts/index.jsx

@@ -2,21 +2,35 @@
 import Taro from '@tarojs/taro'
 import { useMemo } from 'react'
 import useRouter from '@/utils/hooks/useRouter'
+import LoginModel from "@/components/LoginModel";
 import Spin from "@/components/Spin";
 import { useModel } from '@/store'
+import useLogin from '@/utils/hooks/useLogin'
 
 
 export default (Child) => (props) => {
-  const {person}=useModel('person')
-  const {location,setLocation}=useModel('location')
+  const { person } = useModel('person')
+  const { location, setLocation } = useModel('location')
   const router = useRouter()
-  
+
   if (!location) {
     setLocation(Taro.getStorageSync('location'))
   }
+  //确保不是首页并且没有手机号时
+  const { loginVisible } = useLogin()
 
   // 确保执行过 login 方法，拿到了 person
   const isLoged = useMemo(() => !!person?.personId, [person?.personId])
 
-  return isLoged ? <Child {...props} router={router} location={location} /> : <Spin />
+  return (
+    <>
+      {!isLoged && <Spin />}
+      {
+        isLoged && !loginVisible && <Child {...props} router={router} location={location} />
+      }
+      {
+        isLoged && loginVisible && <LoginModel />
+      }
+    </>
+  )
 }

src/pages/index/components/order/index.jsx

@@ -15,7 +15,6 @@ import './style.less'
 
 
 export default (props) => {
-  const {handleMore,handleDetail}=props
   const [imgList, setImgList] = useState([])  
   const [show, setShow] = useState(false)
   const [path, setPath] = useState()
@@ -24,7 +23,9 @@ export default (props) => {
   const handleSearch = (e) => {
     console.log(e.detail.value)
   }
-  
+  const handleMore = () => {
+    Taro.navigateTo({ url: '/pages/moreOrder/index' });
+  }
   useEffect(() => {
     getBannerList({ position: 'bannerWorker' })
       .then(res => {
@@ -70,11 +71,11 @@ export default (props) => {
           <View className='head'>
             <Image className='headIcon' src={orderImg} />
             <Text className='title'>订单列表</Text>
-            <Text className='more' onClick={handleMore}>更多>></Text>
+            <Text className='more' onClick={handleMore}>更多{">"}{">"}</Text>
           </View>
 
-          <MyCard order handleDetail={handleDetail} />
-          <MyCard order handleDetail={handleDetail} />
+          <MyCard order />
+          <MyCard order />
           <Footer />
         </View>
       </ScrollView>

src/pages/index/index.jsx

@@ -11,7 +11,6 @@ import CustomNav from "@/components/CustomNav";
 import { setAmap } from '@/services/amap'
 import withLayout from '@/layouts'
 import { useModel } from "@/store";
-import LoginModel from "@/components/LoginModel";
 import Order from './components/Order'
 import Job from './components/Job'
 import User from "./components/User";
@@ -19,37 +18,12 @@ import "./index.less";
 
 
 export default withLayout((props) => {
-  const { person } = useModel('person')
   const { router } = props
   let { tab } = router.params
   const { location, setLocation } = useModel('location')
-  const [currentTab, setCurrentTab] = useState(0);
-  const [show, setShow] = useState(false)
-  const [path, setPath] = useState()
   const handleClick = (val) => {
-    if (!person.phone && val != 0) {
-      setPath(`/pages/index/index?tab=${val}`)
-      setShow(true)
-      return
-    }
-    setCurrentTab(val);
+    Taro.reLaunch({ url: `/pages/index/index?tab=${val}` });
   };
-  const handleMore = () => {
-    if (!person.phone) {
-      setPath(`/pages/moreOrder/index`)
-      setShow(true)
-      return
-    }
-    Taro.navigateTo({ url: '/pages/moreOrder/index' });
-  }
-  const handleDetail = () => {
-    if (!person.phone) {
-      setPath(`/pages/orderDetail/index`)
-      setShow(true)
-      return
-    }
-    Taro.navigateTo({ url: '/pages/orderDetail/index' });
-  }
   useEffect(() => {
     if (!location) {
       Taro.getLocation({
@@ -62,44 +36,37 @@ export default withLayout((props) => {
     } else {
       setAmap({ params: 'location=' + location, path: '/v3/geocode/regeo' })
     }
-
-    if (tab) {
-      setCurrentTab(tab - 0)
-    }
-  }, [tab])
+  }, [])
   return (
     <View className='page-index'>
-      {
-        show && <LoginModel path={path} close={() => setShow(false)} />
-      }
       <View className='index-navbar'>
-        <CustomNav home title={currentTab === 0 ? '首页' : currentTab === 1 ? '作业管理' : '我的'} />
+        <CustomNav home title={(!tab || tab == 0) ? '首页' : tab == 1 ? '作业管理' : '我的'} />
       </View>
       <View className='index-container'>
-        {currentTab === 0 && <Order handleMore={handleMore} handleDetail={handleDetail} /> }
-        {currentTab === 1 && <Job />}
-        {currentTab === 2 && <User />}
+        {(!tab || tab == 0) && <Order />}
+        {tab == 1 && <Job />}
+        {tab == 2 && <User />}
       </View>
       <View className='index-tabbar'>
         <View
-          className={['tabberItem', currentTab === 0 ? "activeTabber" : '']}
+          className={['tabberItem', (!tab || tab == 0) ? "activeTabber" : '']}
           onClick={() => handleClick(0)}
         >
-          <Image className='tabberImg' src={currentTab === 0 ? indexActive : indexImg}></Image>
+          <Image className='tabberImg' src={(!tab || tab == 0) ? indexActive : indexImg}></Image>
           <View className='text'>首页</View>
         </View>
         <View
-          className={['tabberItem', currentTab === 1 ? "activeTabber" : '']}
+          className={['tabberItem', tab === 1 ? "activeTabber" : '']}
           onClick={() => handleClick(1)}
         >
-          <Image className='tabberImg' src={currentTab === 1 ? jobActive : job}></Image>
+          <Image className='tabberImg' src={tab == 1 ? jobActive : job}></Image>
           <View className='text'>作业管理</View>
         </View>
         <View
-          className={['tabberItem', currentTab === 2 ? "activeTabber" : '']}
+          className={['tabberItem', tab === 2 ? "activeTabber" : '']}
           onClick={() => handleClick(2)}
         >
-          <Image className='tabberImg' src={currentTab === 2 ? userActive : user}></Image>
+          <Image className='tabberImg' src={tab == 2 ? userActive : user}></Image>
           <View className='text'>个人中心</View>
         </View>
       </View>

src/store/models/person.js

@@ -1,5 +1,4 @@
 import { useState } from "react"
-import Taro, { stopDeviceMotionListening } from '@tarojs/taro'
 import { signIn } from '@/services/login'
 
 export default () => {
@@ -9,7 +8,7 @@ export default () => {
   const login = (params) => {
     signIn(params).then((res) => {
       const { person: taPerson,  sessionKey: skey } = res;
-      // taPerson.phone=null
+      taPerson.phone=null
       setPerson(taPerson);
       setSessionKey(skey);
     })

src/utils/hooks/useLogin.js

@@ -0,0 +1,28 @@
+import Taro, { useRouter } from "@tarojs/taro";
+import { useModel } from '@/store'
+import { useMemo, useState, useEffect } from "react";
+
+const whiteList = [
+  "/pages/index/index"
+]
+
+export default () => {
+  const router = useRouter()
+  const { person } = useModel('person')
+  const [loginVisible, setLoginVisible] = useState(false)
+  let { tab } = router.params
+
+  const isInWhiteList = useMemo(() => whiteList.includes(router.path)&&(!tab||tab==0), [router.path, tab])
+  const hasPhone = useMemo(() => !!person?.phone, [person?.phone])
+  
+  useEffect(() => {
+    if (!isInWhiteList && !hasPhone) {
+      setLoginVisible(true)
+    } else {
+      setLoginVisible(false)
+    }
+  }, [hasPhone, isInWhiteList])
+
+
+  return { loginVisible }
+};