.

src/components/CustomNav/index.jsx

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

src/pages/login/index.jsx → src/components/LoginModel/index.jsx

@@ -1,9 +1,8 @@
 import Taro from "@tarojs/taro"
 import { useState } from "react"
 import { useModel } from '@/store'
-import { View, Image, Input, Text, Checkbox, Label, Button } from "@tarojs/components"
+import { View, Image, Input, Text, 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'
@@ -13,7 +12,8 @@ import unChecked from '@/assets/login/unChecked.png'
 
 import './style.less'
 
-export default withLayout((props) => {
+export default (props) => {
+  const {path,close} = props
   const { person,setPerson } = useModel('person')
 
   const [agreement,setAgreement]=useState(false)
@@ -90,7 +90,8 @@ export default withLayout((props) => {
           icon: 'none',
           duration: 1000
         })
-        Taro.navigateBack({ detail:1 });
+        close()
+        Taro.navigateTo({url:path})
       }).catch((e) => {
         Taro.showToast({
           title: '手机号或者验证码不正确',
@@ -106,9 +107,9 @@ export default withLayout((props) => {
     }
   }
   return (
-    <View className='page-index'>
+    <View className='page-index' style={{position:'absolute', zIndex:9999}}>
       <View className='index-navbar'>
-        <CustomNav home title='登录' />
+        <CustomNav login title='登录' goBack={close} />
       </View>
       <Image src={bgi} className='loginBgi' />
       <View className='index-container loginContent'>
@@ -135,4 +136,4 @@ export default withLayout((props) => {
       </View>
     </View>
   )
-})
+}

src/pages/login/style.less → src/components/LoginModel/style.less

@@ -4,10 +4,20 @@
   position: absolute;
   top: 0;
 }
+.goback{
+  width: 19px;
+  height: 35px;
+  position: absolute;
+  left: 30px;
+  top: 67.5px;
+}
 .loginContent{
   padding: 60px 30px;
   color: #333333;
   font-weight: bold;
+  input{
+    font-size: 34px;
+  }
   .title1{
     padding: 40px 0;
     font-size: 66px;

src/components/MyCard/index.jsx

@@ -6,19 +6,13 @@ import MyButton from "../MyButton"
 import './style.less'
 
 export default (props) => {
-  const { detail, order, job, onClick } = props
-  const handleDetail = () => {
-    Taro.navigateTo({ url: '/pages/orderDetail/index' });
-  }
-  const handleClick = () => {
-    Taro.navigateTo({ url: '/pages/orderDetail/index' });
-  }
+  const { detail, order, job, onClick,handleDetail } = props
   return (
     <View className='card'>
       <Jianbian status='1' />
       <View className='cardHead'>
         {
-          job && <MyCell header='需求时间' job action='详情>>' handleAction={handleClick}>2022-06-02</MyCell>
+          job && <MyCell header='需求时间' job action='详情>>' handleAction={handleDetail}>2022-06-02</MyCell>
         }
         {
           !job && <>

src/layouts/index.jsx

@@ -1,8 +1,7 @@
 
 import Taro from '@tarojs/taro'
-import { useEffect , useMemo } from 'react'
+import { useMemo } from 'react'
 import useRouter from '@/utils/hooks/useRouter'
-import useLogin from '@/utils/hooks/useLogin'
 import Spin from "@/components/Spin";
 import { useModel } from '@/store'
 
@@ -13,16 +12,6 @@ export default (Child) => (props) => {
   
   const location = Taro.getStorageSync('location')
 
-  const { hasPhone } = useLogin()
-
-
-  // Taro.useReady(()=>{
-  //   useLogin(person,router)
-  // })
-  // useEffect(()=>{
-  //   useLogin(person,router)
-  // },[person, person?.phone, router, router?.path])
-
   // 确保执行过 login 方法，拿到了 person
   const isLoged = useMemo(() => !!person?.personId, [person?.personId])
 

src/pages/index/components/Job/index.jsx

@@ -1,3 +1,4 @@
+import Taro from "@tarojs/taro";
 import { View, ScrollView, Image, Button } from "@tarojs/components"
 import MyCard from "@/components/MyCard"
 import { Popup } from "@antmjs/vantui";
@@ -17,12 +18,15 @@ export default (props) => {
     console.log('开始作业')
     setShow(false)
   }
+  const handleDetail = () => {
+    Taro.navigateTo({ url: '/pages/orderDetail/index' });
+  }
   return (
     <ScrollView scrollY style={{ height: '100%' }}>
-      <MyCard job onClick={handleChange} />
-      <MyCard job onClick={handleChange} />
-      <MyCard job onClick={handleChange} />
-      <MyCard job onClick={handleChange} />
+      <MyCard job onClick={handleChange} handleDetail={handleDetail} />
+      <MyCard job onClick={handleChange} handleDetail={handleDetail} />
+      <MyCard job onClick={handleChange} handleDetail={handleDetail} />
+      <MyCard job onClick={handleChange} handleDetail={handleDetail} />
       <Popup
         show={show}
         onClose={onClose}

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

@@ -4,22 +4,27 @@ import { View, Input, Swiper, Image, SwiperItem, Text, ScrollView } from "@taroj
 import positionImg from '@/assets/comm/position.png'
 import searchImg from '@/assets/comm/search.png'
 import orderImg from '@/assets/comm/orderList.png'
+import LoginModel from "@/components/LoginModel";
 import Footer from "@/components/Footer";
 import MyCard from "@/components/MyCard";
+import { useModel } from "@/store";
 
 
 import { getBannerList } from "@/services/banner";
 import './style.less'
 
 
-export default () => {
-  const [imgList, setImgList] = useState([])
+export default (props) => {
+  const {handleMore,handleDetail}=props
+  const [imgList, setImgList] = useState([])  
+  const [show, setShow] = useState(false)
+  const [path, setPath] = useState()
+  const { person } = useModel('person')
+
   const handleSearch = (e) => {
     console.log(e.detail.value)
   }
-  const handleMore = () => {
-    Taro.navigateTo({ url: '/pages/moreOrder/index' });
-  }
+  
   useEffect(() => {
     getBannerList({ position: 'bannerWorker' })
       .then(res => {
@@ -33,6 +38,9 @@ export default () => {
   }, [])
   return (
     <View className='orderIndex'>
+      {
+        show && <LoginModel path={path} close={() => setShow(false)} />
+      }
       <View className='top'>
         <View className='left'>
           <Image src={positionImg} className='pImg' />
@@ -65,8 +73,8 @@ export default () => {
             <Text className='more' onClick={handleMore}>更多>></Text>
           </View>
 
-          <MyCard order />
-          <MyCard order />
+          <MyCard order handleDetail={handleDetail} />
+          <MyCard order handleDetail={handleDetail} />
           <Footer />
         </View>
       </ScrollView>

src/pages/index/index.jsx

@@ -1,4 +1,4 @@
-import Taro from "@tarojs/taro";
+import Taro, { useDidShow } from "@tarojs/taro";
 import { useState, useEffect } from "react";
 import { View, Image } from "@tarojs/components"
 import indexImg from "@/assets/comm/index.png";
@@ -8,49 +8,75 @@ import jobActive from "@/assets/comm/jobActive.png";
 import user from "@/assets/comm/user.png";
 import userActive from "@/assets/comm/userActive.png";
 import CustomNav from "@/components/CustomNav";
-import {setAmap} from '@/services/amap'
+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";
 import "./index.less";
 
+
 export default withLayout((props) => {
-  const {person}=useModel('person')
+  const { person } = useModel('person')
   const { router } = props
   let { tab } = router.params
-  const { location,setLocation } = useModel('location')
+  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) {
-      Taro.navigateTo({ url: '/pages/login/index' });
-    }      
+    if (!person.phone && val != 0) {
+      setPath(`/pages/index/index?tab=${val}`)
+      setShow(true)
+      return
+    }
     setCurrentTab(val);
   };
-  useEffect(() => {  
-    if(!location){
+  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({
-        type:'gcj02',
-        success:function(res){
-          setLocation(res.longitude+','+res.latitude)
-          setAmap({params:'location='+res.longitude+','+res.latitude,path: '/v3/geocode/regeo'})
-        }})
+        type: 'gcj02',
+        success: function (res) {
+          setLocation(res.longitude + ',' + res.latitude)
+          setAmap({ params: 'location=' + res.longitude + ',' + res.latitude, path: '/v3/geocode/regeo' })
+        }
+      })
     } else {
-      setAmap({params:'location='+location,path: '/v3/geocode/regeo'})
+      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 ? '作业管理' : '我的'} />
       </View>
       <View className='index-container'>
-        {currentTab === 0 && <Order />}
+        {currentTab === 0 && <Order handleMore={handleMore} handleDetail={handleDetail} /> }
         {currentTab === 1 && <Job />}
         {currentTab === 2 && <User />}
       </View>

src/pages/login/index.config.js

@@ -1,7 +0,0 @@
-export default {
-  navigationBarTitleText: '登录',
-  navigationStyle: 'custom',
-  styleIsolation: 'shared',
-  enableShareAppMessage: true,
-  disableScroll: true,
-}

src/pages/machineryList/index.jsx

@@ -14,14 +14,14 @@ export default withLayout((props) => {
   const goDetail = (val) => {
     Taro.navigateTo({ url: `/pages/machineryDetail/index?id=${val}` });
   }
-  const goMap = () => {
-    Taro.navigateTo({ url: '/pages/machineryMap/index' });
+  const goMap = (val) => {
+    Taro.navigateTo({ url: `/pages/machineryMap/index?id=${val}` });
   }
   useEffect(() => {
     getMachineryList({ location: location }).then((res) => {
       setMachinery(res.records)
     })
-  }, [])
+  }, [location])
   return (
     <View className='page-index'>
       <View className='index-navbar'>
@@ -31,7 +31,7 @@ export default withLayout((props) => {
         <ScrollView scrollY style={{ height: '100%' }}>
           {
             machinery?.map((item) => {
-              return <MachineryCard value={item} onClick={() => goDetail(item.machineryId)} goMap={() => goMap()} />
+              return <MachineryCard value={item} key={item.machineryId} onClick={() => goDetail(item.machineryId)} goMap={() => goMap(item.machineryId)} />
             })
           }
         </ScrollView>

src/pages/machineryMap/Model/index.jsx

@@ -0,0 +1,20 @@
+import { View, Image } from "@tarojs/components"
+import picon from '@/assets/comm/position.png'
+import './style.less'
+
+export default (props) => {
+  const { value,visible, goDetail, goList } = props
+  return (
+    <View className='showModel' style={{visibility:visible?'inherit':'hidden'}}>
+      <View className='goList' onClick={goList}>{'<'}{'<'} 农机列表</View>
+      <View className='title'>
+        <View className='name'>{value?.name}</View>
+        <View className='action' onClick={() => goDetail(value?.machineryId)}>详情 {">"}{">"}</View>
+      </View>
+      <View className='position'>
+        <Image src={picon} className='picon' />
+        当前位置：&nbsp;&nbsp;邓州市陈楼
+      </View>
+    </View>
+  )
+}

src/pages/machineryMap/Model/style.less

@@ -0,0 +1,37 @@
+.showModel{
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  box-sizing: border-box;
+  background: #FFFFFF;
+  border-radius: 40px 40px 0px 0px;
+  padding: 60px 30px;
+  font-weight: bold;
+  font-size: 30px;
+  color: #222222;
+  .goList{
+    color: #666666;
+  }
+  .title{
+    display: flex;
+    align-items: center;
+    margin:60px 0 40px;
+    .name{
+      font-size: 36px;
+    }
+    .action{
+      color: #666666;
+      position: absolute;
+      right: 30px;
+    }
+  }
+  .position{
+    display: flex;
+    align-items: center;
+    .picon{
+      width: 34px;
+      height: 34px;
+      margin-right: 16px;    
+    }
+  }
+}

src/pages/machineryMap/index.jsx

@@ -5,18 +5,22 @@ import withLayout from '@/layouts'
 import { getMachineryList } from '@/services/machinery'
 import { useModel } from "@/store"
 import CustomNav from "@/components/CustomNav"
+import MachineryModel from './Model'
 import m1 from '@/assets/machinery/greenMachinery.png'
 import m2 from '@/assets/machinery/orangeMachinery.png'
-import picon from '@/assets/comm/position.png'
 import './style.less'
 
 
-export default withLayout((props) => {
+export default withLayout((props) => {  
+  const { router } = props
+  const { id } = router.params
   const [show, setShow] = useState(false)
   const { location } = useModel('location')
   const [machineryList, setMachineryList] = useState([])
   const [markerList, setMarkerList] = useState([])
   const [current, setCurrent] = useState()
+  const [lot,setLot]=useState(112.106514)
+  const [lat,setLat]=useState(32.685927)
 
   const locList = [
     {
@@ -70,6 +74,22 @@ export default withLayout((props) => {
   const goList = () => {
     Taro.navigateTo({ url: '/pages/machineryList/index' });
   }
+  const changeRegion=()=>{
+    setShow(false)
+  }
+  useEffect(()=>{
+    if (id&&machineryList&&markerList.length!=0) {
+      machineryList.forEach((item,index)=>{
+        if(item.machineryId==id){ 
+          setLot(markerList[index].longitude)
+          setLat(markerList[index].latitude)
+          setCurrent(machineryList[index])
+          setShow(true)
+          return
+        }
+      })
+    }
+  },[id, machineryList, markerList])
   useEffect(() => {
     getMachineryList({ location: location }).then((res) => {
       setMachineryList(res.records)
@@ -85,6 +105,7 @@ export default withLayout((props) => {
       }))
     })
   }, [])
+
   return (
     <View className='page-index'>
       <View className='index-navbar'>
@@ -92,28 +113,14 @@ export default withLayout((props) => {
       </View>
       <View className='index-container machineryMap'>
         <Map
-          longitude={112.092716}
-          latitude={32.681642}
+          longitude={lot}
+          latitude={lat}
           markers={markerList}
           className='map'
           onMarkerTap={handleClick}
-          onRegionChange={() => setShow(false)}
+          onRegionChange={changeRegion}
         />
-        {
-          show &&
-          <View className='showModel'>
-            <View className='goList' onClick={goList}>{'<'}{'<'} 农机列表</View>
-            <View className='title'>
-              <View className='name'>{current.name}</View>
-              <View className='action' onClick={() => goDetail(current.machineryId)}>详情 {">"}{">"}</View>
-            </View>
-            <View className='position'>
-              <Image src={picon} className='picon' />
-              当前位置：&nbsp;&nbsp;邓州市陈楼
-            </View>
-          </View>
-        }
-
+        <MachineryModel visible={show} value={current} goDetail={goDetail} goList={goList} />
       </View>
     </View>
   )

src/pages/machineryMap/style.less

@@ -4,41 +4,4 @@
     width: 100vw;
     height: 100%;
   }  
-  .showModel{
-    position: absolute;
-    bottom: 0;
-    width: 100%;
-    box-sizing: border-box;
-    background: #FFFFFF;
-    border-radius: 40px 40px 0px 0px;
-    padding: 60px 30px;
-    font-weight: bold;
-    font-size: 30px;
-    color: #222222;
-    .goList{
-      color: #666666;
-    }
-    .title{
-      display: flex;
-      align-items: center;
-      margin:60px 0 40px;
-      .name{
-        font-size: 36px;
-      }
-      .action{
-        color: #666666;
-        position: absolute;
-        right: 30px;
-      }
-    }
-    .position{
-      display: flex;
-      align-items: center;
-      .picon{
-        width: 34px;
-        height: 34px;
-        margin-right: 16px;    
-      }
-    }
-  }
 }

src/routes.js

@@ -14,10 +14,6 @@ const mainPages = [
     title: '详情',
     page: 'pages/orderDetail/index',
   },
-  {
-    title: '登录',
-    page: 'pages/login/index',
-  },
   {
     title: '农机列表',
     page: 'pages/machineryList/index',

src/store/models/person.js

@@ -9,7 +9,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

@@ -1,46 +0,0 @@
-import Taro, { useRouter, useDidShow } from "@tarojs/taro";
-import { useModel } from '@/store'
-import { useEffect , useMemo } from "react";
-
-const whiteList = [
-  "/pages/login/index",
-  "/pages/index/index"
-]
-
-export default () => {
-  const router = useRouter()
-  const {person} = useModel('person')
-
-  const isInWhiteList = useMemo(() => whiteList.includes(router.path), [router.path])
-  const hasPhone = useMemo(() => !!person?.phone, [person?.phone])
-
-  // 校验跳转
-  // useMemo(() => {
-    // if (!isInWhiteList && !hasPhone) {
-    //   Taro.navigateTo({ url: "/pages/login/index" });
-    // }
-  // }, [hasPhone, isInWhiteList])
-
-  // useDidShow(() => {
-  //   if (!isInWhiteList && !isLoged) {
-  //     Taro.navigateTo({ url: "/pages/login/index" });
-  //   }
-  // })
-
-  useEffect (() => {
-    if (!isInWhiteList && !hasPhone) {
-      Taro.navigateTo({ url: "/pages/login/index" });
-    }
-  }, [hasPhone, isInWhiteList])
-
-
-  // if (router.path === "/pages/login/index") {
-  //   return;
-  // }
-  // if (router.path !== "/pages/index/index" && !person?.phone) {
-  //   Taro.navigateTo({ url: "/pages/login/index" });
-  // }
-
-
-  return { hasPhone, isInWhiteList }
-};