.

src/components/MyCard/index.jsx

@@ -1,5 +1,5 @@
 import Taro from "@tarojs/taro"
-import { View, Text } from '@tarojs/components'
+import { View } from '@tarojs/components'
 import Jianbian from "@/components/Jianbian"
 import MyCell from "../MyCell"
 import MyButton from "../MyButton"
@@ -7,27 +7,26 @@ import './style.less'
 
 export default (props) => {
   const { detail, order, job, value, onClick,goDetail } = props
-  
   return (
     <View className='card'>
       <Jianbian status={job?value?.status:value?.workStatus} />
       <View className='cardHead'>
         {
-          job && <MyCell header='需求时间' job action='详情>>' handleAction={goDetail}>2022-06-02</MyCell>
+          job && <MyCell header='需求时间' job action='详情>>' handleAction={goDetail}>{value?.appointmentDate?.substr(0,10)}</MyCell>
         }
         {
-          !job && <MyCell header='需求时间'>2022-06-02</MyCell>
+          !job && <MyCell header='需求时间'>{value?.appointmentDate?.substr(0,10)}</MyCell>
         }
       </View>
       <View className='line' />
-      <MyCell header='农机名称'>{value?.machineryName||'收割机001'}</MyCell>
+      <MyCell header='农机名称'>{value?.machineryName}</MyCell>
       <MyCell header='下单人'>{value?.personName}</MyCell>
       <MyCell header='手机号'>{value?.phone}</MyCell>
-      <MyCell header='订单时间'>{value?.createDate.substr(0,10)||'2022-03-08'}</MyCell>
+      <MyCell header='订单时间'>{value?.createDate.substr(0,10)}</MyCell>
       {
-        detail && <MyCell header='服务地址'>{value?.address||'河南省南阳市邓州市孟楼镇'}</MyCell>
+        detail && <MyCell header='服务地址'>{value?.address}</MyCell>
       }
-      <MyCell header='作业时间'>上午06:00--晚上21:00</MyCell>
+      <MyCell header='作业时间'><View>{value?.startDate}</View><View>{value?.endDate}</View></MyCell>
       <MyCell header='订单费用'>{(value?.charges&&value.charges/100)||600}元</MyCell>
       {
         job &&value.status!=3&& <MyButton value={value.status==0?'开始作业':'完成作业'} onClick={onClick} />

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

@@ -1,9 +1,7 @@
 import Taro from "@tarojs/taro";
 import { useState, useEffect } from "react";
 import { View, Input, Image, Text, ScrollView } from "@tarojs/components"
-import CustomNav from "@/components/CustomNav";
 import searchImg from '@/assets/comm/search.png'
-import withLayout from '@/layouts'
 import NullCard from "@/components/NullCard";
 import MyCard from "@/components/MyCard";
 import Footer from "@/components/Footer";
@@ -21,7 +19,6 @@ export default () => {
 
   const handleSearch = (e) => {
     if (e.detail.value) {
-      console.log(e.detail.value)
       setImageShow(false)
     } else {
       setImageShow(true)

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

@@ -1,16 +1,17 @@
 import React, { useState, useEffect } from "react"
 import Taro from "@tarojs/taro";
-import { View, Input, Swiper, Image, SwiperItem, Text, ScrollView,Button } from "@tarojs/components"
+import { View, Input, Swiper, Image, SwiperItem, Text, ScrollView, Button } from "@tarojs/components"
 import { Popup } from "@antmjs/vantui";
 import positionImg from '@/assets/comm/position.png'
 import searchImg from '@/assets/comm/search.png'
 import orderImg from '@/assets/comm/orderList.png'
 import PositionImg from '@/assets/job/positionImg.png'
 import Footer from "@/components/Footer";
+import { useModel } from "@/store";
 import MyCard from "@/components/MyCard";
 import NullCard from "@/components/NullCard";
 import { getBannerList } from "@/services/banner";
-import { getJobList } from '@/services/job'
+import { getJobList, toggleJob, overJob } from '@/services/job'
 import './style.less'
 
 
@@ -19,49 +20,54 @@ export default (props) => {
   const [jobList, setJobList] = useState([])
   const [currentPage, setCurrentPage] = useState(1)
   const [isMore, setIsMore] = useState(false)
-  const [q, setQ] = useState()
-  
+  const { address } = useModel('location')
   const [show, setShow] = useState(false)
-  const [area,setArea]=useState()
+  const [area, setArea] = useState()
   const [showOver, setShowOver] = useState(false)
+  const [job, setJob] = useState()
 
   const handleSearch = (e) => {
-    setIsMore(false)
-    setCurrentPage(1)
-    setQ(e.detail.value)
+    Taro.navigateTo({ url: `/pages/index/index?tab=1` });
   }
   const handleDetail = (val) => {
-    Taro.navigateTo({ url: `/pages/orderDetail/index?id=${val}` });
+    Taro.navigateTo({ url: `/pages/orderDetail/index?id=${val}&job=1` });
   }
   // 上拉加载
   const handleScrollToLower = () => {
     setCurrentPage(currentPage + 1)
   }
-  const handleChange = () => {
-    setShow(true)
-    // setShowOver(true)
+  const handleWork = (val) => {
+    setJob(val)
+    if (val.status == 0) {
+      setShow(true)
+    } else {
+      setShowOver(true)
+    }
   }
   const onClose = () => {
     setShow(false)
+    setJob()
   }
   const handleOk = () => {
     console.log('开始作业')
-    setShow(false)
+    toggleJob(job.jobId, { mode: false }).then(() => {
+      setShow(false)
+    })
   }
-  const handleArea=(e)=>{
+  const handleArea = (e) => {
     setArea(e.detail.value)
   }
-  const onOverClose=()=>{
+  const onOverClose = () => {
     setArea()
     setShowOver(false)
   }
-  const handleOverOk=()=>{
+  const handleOverOk = () => {
     if (area) {
       console.log(666)
     }
   }
   useEffect(() => {
-    getJobList({ pageNum: currentPage, q: q }).then(res => {
+    getJobList({ pageNum: currentPage }).then(res => {
       const lst = currentPage === 1 ? res.records || [] : jobList.concat(res.records || [])
       //长列表加载当下一页没有数据时
       if (res.records.length == 0 && currentPage != 1) {
@@ -70,7 +76,7 @@ export default (props) => {
       }
       setJobList(lst)
     })
-  }, [currentPage, q])
+  }, [currentPage])
   useEffect(() => {
     getBannerList({ position: 'bannerWorker' })
       .then(res => {
@@ -90,8 +96,8 @@ export default (props) => {
           <Text>邓州市</Text>
           <View className='icon' />
         </View>
-        <View className='searchClass'>
-          <Input type='text' className='searchInput' onBlur={handleSearch} placeholder='搜索关键字查询订单' />
+        <View className='searchClass' onClick={handleSearch}>
+          <Input type='text' disabled className='searchInput' placeholder='搜索关键字查询订单' />
           <Image src={searchImg} className='searchImg' />
         </View>
       </View>
@@ -120,7 +126,7 @@ export default (props) => {
           {
             jobList.length === 0 ? <NullCard value='您还没有新的作业订单！' /> :
               jobList.map((item) => {
-                return <MyCard job value={item} key={item.JobId} onClick={handleChange} goDetail={handleDetail} />
+                return <MyCard job value={item} key={item.JobId} onClick={() => handleWork(item)} goDetail={() => handleDetail(item.jobId)} />
               })
           }
           {
@@ -134,7 +140,7 @@ export default (props) => {
         >
           <Image src={PositionImg} className='pImg' />
           <View>当前位置在</View>
-          <View>河南省南阳市邓州市孟楼镇</View>
+          <View>{address}</View>
           <Button className='btn' onClick={handleOk}>确认</Button>
         </Popup>
         <Popup

src/pages/index/components/order/style.less

@@ -90,94 +90,95 @@
         color: #666666;
       }
     }
-    .tanchuang{
-      text-align: center;
-      font-size: 34px;
-      font-weight: 800;
-      color: #323232;
-      width: calc(100vw - 60px);
-      padding: 142px 130px;
-      box-shadow: 0px 0px 44px 0px rgba(0, 0, 0, 0.08);
+    
+  }
+  .tanchuang{
+    text-align: center;
+    font-size: 34px;
+    font-weight: 800;
+    color: #323232;
+    width: calc(100vw - 60px);
+    padding: 142px 130px;
+    box-shadow: 0px 0px 44px 0px rgba(0, 0, 0, 0.08);
+    border-radius: 40px;
+    .bankInput{
+      background: #FFF;
+      border: 2px solid #F2F2F2;
       border-radius: 40px;
-      .bankInput{
-        background: #FFF;
-        border: 2px solid #F2F2F2;
-        border-radius: 40px;
-        display: flex;
-        align-items: center;
-        padding: 36px 30px;
-        margin-top: 30px;
-        height: 108px;
-        box-sizing: border-box;
-        .header{
-          font-size: 48px;
-          font-weight: 500;
-          color: #333;
-          flex: none;
-          margin-right: 20px;
-        }
-        .body{
-          flex: 1;
-          font-size: 32px;
-          font-weight: 400;
-        }
-      }
-      .pImg{
-        width: 80px;
-        height: 77px;
-        margin-bottom: 52px;
-      }
-      view{
-        text-align: left;
-        line-height: 46px;
+      display: flex;
+      align-items: center;
+      padding: 36px 30px;
+      margin-top: 30px;
+      height: 108px;
+      box-sizing: border-box;
+      .header{
+        font-size: 48px;
+        font-weight: 500;
+        color: #333;
+        flex: none;
+        margin-right: 20px;
       }
-      .btn{
-        width: 200px;
-        height: 88px;
-        background: linear-gradient(0deg, #00AE39, #A0E067);
-        border-radius: 34px;
+      .body{
+        flex: 1;
         font-size: 32px;
-        color: #FFFFFF;  
-        margin-top: 100px;  
+        font-weight: 400;
       }
     }
-    .tanchuang2{
-      text-align: center;
-      font-size: 34px;
-      font-weight: 800;
-      color: #323232;
-      width: calc(100vw - 60px);
-      padding: 80px 30px;
-      box-shadow: 0px 0px 44px 0px rgba(0, 0, 0, 0.08);
+    .pImg{
+      width: 80px;
+      height: 77px;
+      margin-bottom: 52px;
+    }
+    view{
+      text-align: left;
+      line-height: 46px;
+    }
+    .btn{
+      width: 200px;
+      height: 88px;
+      background: linear-gradient(0deg, #00AE39, #A0E067);
+      border-radius: 34px;
+      font-size: 32px;
+      color: #FFFFFF;  
+      margin-top: 100px;  
+    }
+  }
+  .tanchuang2{
+    text-align: center;
+    font-size: 34px;
+    font-weight: 800;
+    color: #323232;
+    width: calc(100vw - 60px);
+    padding: 80px 30px;
+    box-shadow: 0px 0px 44px 0px rgba(0, 0, 0, 0.08);
+    border-radius: 40px;
+    .bankInput{
+      border: 2px solid #F2F2F2;
       border-radius: 40px;
-      .bankInput{
-        border: 2px solid #F2F2F2;
-        border-radius: 40px;
-        display: flex;
-        align-items: center;
-        padding: 36px 30px;
-        box-sizing: border-box;
-        .header{
-          font-weight: 500;
-          color: #333;
-          flex: none;
-        }
-        .body{
-          flex: 1;
-          font-size: 32px;
-          font-weight: 400;
-        }
+      display: flex;
+      align-items: center;
+      padding: 36px 30px;
+      box-sizing: border-box;
+      .header{
+        font-weight: 500;
+        color: #333;
+        flex: none;
       }
-      .btn{
-        width: 200px;
-        height: 88px;
-        background: linear-gradient(0deg, #00AE39, #A0E067);
-        border-radius: 34px;
+      .body{
+        flex: 1;
         font-size: 32px;
-        color: #FFFFFF;  
-        margin-top: 50px;  
+        font-weight: 400;
       }
     }
+    .btn{
+      width: 200px;
+      height: 88px;
+      background: linear-gradient(0deg, #00AE39, #A0E067);
+      border-radius: 34px;
+      font-size: 32px;
+      color: #FFFFFF;  
+      margin-top: 50px;  
+    }
   }
 }
 

src/pages/index/index.jsx

@@ -22,7 +22,7 @@ import "./index.less";
 export default withLayout((props) => {
   const { router } = props
   let { tab } = router.params
-  const { location, setLocation } = useModel('location')
+  const { location, setLocation, setAddress } = useModel('location')
   const { person } = useModel('person')
   const [currentTab, setCurrentTab] = useState(0)
   const [show, setShow] = useState(false)
@@ -41,11 +41,17 @@ export default withLayout((props) => {
         type: 'gcj02',
         success: function (res) {
           setLocation(res.longitude + ',' + res.latitude)
-          setAmap({ params: 'location=' + res.longitude + ',' + res.latitude, path: '/v3/geocode/regeo' })
+          setAmap({ params: 'location=' + res.longitude + ',' + res.latitude, path: '/v3/geocode/regeo' }).then(res2 => {
+            //josn对象取值
+            setAddress(JSON.parse(res2)['regeocode'].formatted_address)
+          })
         }
       })
     } else {
-      setAmap({ params: 'location=' + location, path: '/v3/geocode/regeo' })
+      setAmap({ params: 'location=' + location, path: '/v3/geocode/regeo' }).then(res2 => {
+        //josn对象取值
+        setAddress(JSON.parse(res2)['regeocode'].formatted_address)
+      })
     }
   }, [])
   useEffect(() => {

src/pages/orderDetail/index.jsx

@@ -2,19 +2,26 @@ import { View } from "@tarojs/components"
 import CustomNav from "@/components/CustomNav"
 import MyCard from "@/components/MyCard"
 import withLayout from '@/layouts'
-import { useEffect , useState } from "react"
+import { useEffect, useState } from "react"
 import { getOrderDetail } from "@/services/order"
+import { getJobDetail } from '@/services/job'
 
 
 export default withLayout((props) => {
   const { router } = props
-  let { id } = router.params
-  const [value,setValue]=useState()
-  useEffect(()=>{
-    getOrderDetail(id).then((res)=>{
-      setValue(res)
-    })
-  },[id])
+  let { id, job } = router.params
+  const [value, setValue] = useState()
+  useEffect(() => {
+    if (job) {
+      getJobDetail(id).then(res => {
+        setValue(res)
+      })
+    } else {
+      getOrderDetail(id).then((res) => {
+        setValue(res)
+      })
+    }
+  }, [id])
   return (
     <View className='page-index'>
       <View className='index-navbar'>

src/services/job.js

@@ -19,7 +19,7 @@ import request from '@/utils/request'
  * @param {*} data
  * @returns
  */
-export const toggleJob = (id, data) => request(`/worker/work-job/${id}/pause`, { method: 'put', data });
+export const toggleJob = (id, data) => request(`/work-job/${id}/pause`, { method: 'put', data });
 
 /**
  * 完成作业

src/store/models/location.js

@@ -2,9 +2,11 @@ import { useState } from "react";
 
 export default function useLocation() {
   const [location, setLocation] = useState()
-
+  const [address,setAddress]=useState()
   return {
     location,
     setLocation,
+    address,
+    setAddress
   }
 }