.

src/components/Jianbian/index.jsx

@@ -8,12 +8,12 @@ export default (props) => {
       type == 'machinery' ?
         (value ? 'workingClass' : 'waitClass') :
         status == 0 ? 'waitClass' :
-          status == 1 ? 'workingClass' :
+          status == 1 || status == 2 ? 'workingClass' :
             status == 3 ? 'overClass' : ''
     ]}
     >
       <View className='text'>
-        {type == 'machinery' ? (value ? '使用中' : '空闲中') : status == 0 ? '待作业' : status == 1 ? '进行中' : status == 3 ? '已完成' : ''}
+        {type == 'machinery' ? (value ? '使用中' : '空闲中') : status == 0 ? '待作业' : status == 1 || status == 2 ? '进行中' : status == 3 ? '已完成' : ''}
       </View>
     </View>
   )

src/components/MyCard/index.jsx

@@ -12,10 +12,11 @@ export default (props) => {
       <Jianbian status={job?value?.status:value?.workStatus} />
       <View className='cardHead'>
         {
-          job && <MyCell header='需求时间' job action='详情>>' handleAction={goDetail}>{value?.appointmentDate?.substr(0,10)}</MyCell>
+          //首页作业列表卡片
+          job &&!detail&& <MyCell header='需求时间' job action='详情>>' handleAction={goDetail}>{value?.appointmentDate?.substr(0,10)}</MyCell>
         }
         {
-          !job && <MyCell header='需求时间'>{value?.appointmentDate?.substr(0,10)}</MyCell>
+          (!job||job&&detail) && <MyCell header='需求时间'>{value?.appointmentDate?.substr(0,10)}</MyCell>
         }
       </View>
       <View className='line' />
@@ -29,7 +30,7 @@ export default (props) => {
       <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} />
+        job &&value?.status!=3&&!detail&& <MyButton value={value?.status==0?'开始作业':'完成作业'} onClick={onClick} />
       }
       {
         order && <View className='line' />

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

@@ -49,9 +49,18 @@ export default (props) => {
     setJob()
   }
   const handleOk = () => {
-    console.log('开始作业')
-    toggleJob(job.jobId, { mode: false }).then(() => {
-      setShow(false)
+    toggleJob(job.jobId, { mode: true }).then(() => {
+      //目测有bug
+      getJobList({ pageNum: currentPage }).then(res => {
+        const lst = currentPage === 1 ? res.records || [] : jobList.concat(res.records || [])
+        //长列表加载当下一页没有数据时
+        if (res.records.length == 0 && currentPage != 1) {
+          setIsMore(true)
+          return
+        }
+        setJobList(lst)
+        onClose()
+      })
     })
   }
   const handleArea = (e) => {
@@ -62,8 +71,31 @@ export default (props) => {
     setShowOver(false)
   }
   const handleOverOk = () => {
-    if (area) {
-      console.log(666)
+    //正整数或两位小数
+    const test2 = /^\d+(\.\d{1,2})?$/.test(area)
+    if (test2) {
+      overJob(job.jobId,{...job,area:area}).then(res=>{
+        Taro.showToast({
+          title: '恭喜完成作业',
+          icon: 'none',
+        })
+        getJobList({ pageNum: currentPage }).then(res2 => {
+          const lst = currentPage === 1 ? res2.records || [] : jobList.concat(res2.records || [])
+          //长列表加载当下一页没有数据时
+          if (res2.records.length == 0 && currentPage != 1) {
+            setIsMore(true)
+            return
+          }
+          setJobList(lst)
+          onOverClose()
+        })
+      })
+    }
+    else{
+      Taro.showToast({
+        title: '请输入正确的面积整数或最多两位小数',
+        icon: 'none',
+      })
     }
   }
   useEffect(() => {
@@ -154,7 +186,6 @@ export default (props) => {
           </View>
           <Button className='btn' onClick={handleOverOk}>确认</Button>
         </Popup>
-
       </ScrollView>
     </View>
   )

src/pages/orderDetail/index.jsx

@@ -21,14 +21,16 @@ export default withLayout((props) => {
         setValue(res)
       })
     }
-  }, [id])
+  }, [id, job])
   return (
     <View className='page-index'>
       <View className='index-navbar'>
         <CustomNav title='更多' />
       </View>
       <View className='index-container'>
-        <MyCard detail value={value} />
+        {
+          job?<MyCard detail job value={value} />:<MyCard detail value={value} />
+        }
       </View>
     </View>
   )

src/services/job.js

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