.

src/components/Jianbian/index.jsx

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

src/components/MyCard/index.jsx

@@ -19,7 +19,11 @@ export default (props) => {
         }
       </View>
       <View className='line' />
-      <MyCell header='农机名称'>{value?.machineryName}</MyCell>
+      {
+        job?
+        <MyCell header='农机名称'>{value?.machineryName}</MyCell>:
+        <MyCell header='农机类型'>{value?.typeName}</MyCell>
+      }
       <MyCell header='下单人'>{value?.personName}</MyCell>
       <MyCell header='手机号'>{value?.phone}</MyCell>
       <MyCell header='订单时间'>{value?.createDate.substr(0,10)}</MyCell>

src/pages/index/components/User/index.jsx

@@ -16,7 +16,6 @@ import bankCard from '@/assets/user/bankCard.png'
 import './style.less'
 
 export default (props) => {
-  const { setPhone } = useModel('phone')
   const { person } = useModel('person')
 
   const handleAccount = () => {
@@ -43,7 +42,7 @@ export default (props) => {
   return (
     <ScrollView scrollY style={{ height: '100%' }}>
       <View className='personTip'>该账号归{person.nickName||'张三'}所属</View>
-      <View className='userHead'>
+      <View className='userHead' onClick={handleAccount}>
         <Image src={userBgi} className='userBgi' />
         <View className='headcontent' >
           <Image src={person.avatar||avatar} className='avatar' />

src/pages/machineryDetail/index.jsx

@@ -38,7 +38,7 @@ export default withLayout((props) => {
             ))}
           </Swiper>
           <View className='detailContent'>
-            <Jianbian value={machinery?.jobStatus} type='machinery' />
+            <Jianbian value={machinery?.jobStatus} status={machinery?.status} type='machinery' />
             <View className='detialName'>{machinery?.name}</View>
             <View className='title'>
               <Image src={micon} className='detailIcon' />

src/pages/machineryList/Card/index.jsx

@@ -6,7 +6,7 @@ export default (props) => {
   const { value, onClick, goMap } = props
   return (
     <View className='machineryCard'>
-      <Jianbian value={value.jobStatus} type='machinery' />
+      <Jianbian value={value.jobStatus} status={value.status} type='machinery' />
       <Image src={value.thumb}  mode='aspectFill' onClick={onClick} />
       <View className='info'>
         <View className='machineryName' onClick={onClick} >{value.name}</View>

src/pages/machineryMap/index.jsx

@@ -5,13 +5,14 @@ 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 m3 from '@/assets/machinery/repairMachinery.png'
+import MachineryModel from './Model'
 import './style.less'
 
 
-export default withLayout((props) => {  
+export default withLayout((props) => {
   const { router } = props
   const { id } = router.params
   const [show, setShow] = useState(false)
@@ -19,8 +20,8 @@ export default withLayout((props) => {
   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 [lot, setLot] = useState(112.106514)
+  const [lat, setLat] = useState(32.685927)
 
   const locList = [
     {
@@ -74,13 +75,13 @@ export default withLayout((props) => {
   const goList = () => {
     Taro.navigateTo({ url: '/pages/machineryList/index' });
   }
-  const changeRegion=()=>{
+  const changeRegion = () => {
     setShow(false)
   }
-  useEffect(()=>{
-    if (id&&machineryList&&markerList.length!=0) {
-      machineryList.forEach((item,index)=>{
-        if(item.machineryId==id){ 
+  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])
@@ -89,7 +90,7 @@ export default withLayout((props) => {
         }
       })
     }
-  },[id, machineryList, markerList])
+  }, [id, machineryList, markerList])
   useEffect(() => {
     getMachineryList({ location: location }).then((res) => {
       setMachineryList(res.records)
@@ -98,7 +99,7 @@ export default withLayout((props) => {
           id: index,
           longitude: locList[index % 10].longitude,
           latitude: locList[index % 10].latitude,
-          iconPath: item.jobStatus?m1:m2,
+          iconPath: item.status == 0 ? m3 : (item.jobStatus || item.jobStatus == 3) ? m2 : m1,
           width: 50,
           height: 50
         }