.

project.private.config.json

@@ -0,0 +1,24 @@
+{
+  "condition": {
+    "plugin": {
+      "list": []
+    },
+    "game": {
+      "list": []
+    },
+    "gamePlugin": {
+      "list": []
+    },
+    "miniprogram": {
+      "list": [
+        {
+          "name": "",
+          "pathName": "pages/machineryList/index",
+          "query": "",
+          "scene": null,
+          "launchMode": "default"
+        }
+      ]
+    }
+  }
+}

src/components/Jianbian/index.jsx

@@ -2,16 +2,18 @@ import { View } from '@tarojs/components'
 import './style.less'
 
 export default (props) => {
-  const { status } = props
+  const { status, value, type } = props
   return (
     <View className={['jianbian',
-      status == 1 ? 'waitClass' :
-        status == 2 ? 'workingClass' :
-          status == 3 ? 'overClass' : ''
+      type == 'machinery' ?
+        (value ? 'workingClass' : 'waitClass') :
+        status == 1 ? 'waitClass' :
+          status == 2 ? 'workingClass' :
+            status == 3 ? 'overClass' : ''
     ]}
     >
       <View className='text'>
-        {status == 1 ? '待作业' : status == 2 ? '进行中' : status == 3 ? '已完成' : ''}
+        {type == 'machinery' ? (value ? '使用中' : '空闲中') : status == 1 ? '待作业' : status == 2 ? '进行中' : status == 3 ? '已完成' : ''}
       </View>
     </View>
   )

src/pages/index/index.jsx

@@ -18,7 +18,7 @@ import "./index.less";
 
 export default withLayout((props) => {
   const { router } = props
-  let { tab, isLogin } = router.params
+  let { tab } = router.params
   const { location,setLocation } = useModel('location')
   const [currentTab, setCurrentTab] = useState(0);
   const handleClick = (val) => {
@@ -47,7 +47,7 @@ export default withLayout((props) => {
       <View className='index-container'>
         {currentTab === 0 && <Order />}
         {currentTab === 1 && <Job />}
-        {currentTab === 2 && <User isLogin={isLogin} />}
+        {currentTab === 2 && <User />}
       </View>
       <View className='index-tabbar'>
         <View

src/pages/login/index.jsx

@@ -89,7 +89,7 @@ export default (props) => {
           icon: 'none',
           duration: 1000
         })
-        Taro.reLaunch({ url: '/pages/index/index?tab=2&&isLogin=true' });
+        Taro.reLaunch({ url: '/pages/index/index?tab=2' });
       }).catch((e) => {
         Taro.showToast({
           title: '手机号或者验证码不正确',

src/pages/machineryDetail/index.jsx

@@ -1,28 +1,24 @@
+import { useEffect, useState } from "react"
 import { View, Image, ScrollView, Swiper, SwiperItem } from "@tarojs/components"
 import CustomNav from "@/components/CustomNav"
 import Jianbian from "@/components/Jianbian"
 import withLayout from '@/layouts'
-import banner1 from '@/assets/banner/1.jpg'
-import banner2 from '@/assets/banner/2.jpg'
+import { useModel } from "@/store"
+import { getMachineryDetail } from '@/services/machinery'
 import clockImg from '@/assets/machinery/date.png'
 import micon from '@/assets/machinery/micon2.png'
 import './style.less'
 
 export default withLayout((props) => {
-  const imgList = [
-    {
-      thumb: banner1
-    },
-    {
-      thumb: banner1
-    },
-    {
-      thumb: banner1
-    },
-    {
-      thumb: banner1
-    }
-  ]
+  const { router } = props
+  const { id } = router.params
+  const { location } = useModel('location')
+  const [machinery, setMachinery] = useState()
+  useEffect(() => {
+    getMachineryDetail(id, { location: location, attached: true }).then((res) => {
+      setMachinery(res)
+    })
+  }, [])
   return (
     <View className='page-index'>
       <View className='index-navbar'>
@@ -35,29 +31,31 @@ export default withLayout((props) => {
             autoplay
             className='swiper'
           >
-            {imgList.map((item, inx) => (
+            {machinery?.imagesList?.map((item, inx) => (
               <SwiperItem key={inx}>
-                <Image src={item.thumb} mode='widthFix' className='storeImage' />
+                <Image src={item.url} mode='widthFix' className='storeImage' />
               </SwiperItem>
             ))}
           </Swiper>
           <View className='detailContent'>
-            <Jianbian status='1' />
-            <View className='detialName'>收割机001--S001</View>
+            <Jianbian value={machinery?.jobStatus} type='machinery' />
+            <View className='detialName'>{machinery?.name}</View>
             <View className='detailTime'>
               <Image src={clockImg} className='clockImg' />
               距离上次使用时间为三天
             </View>
             <View className='title'>
               <Image src={micon} className='detailIcon' />
-              作业详情
+              农机详情
               <Image src={micon} className='detailIcon' />
             </View>
             <View>
-              <Image src={banner1} className='contentImg' />
-              <View className='contentText'>6666666</View>
-              <Image src={banner2} className='contentImg' />
-              <Image src={banner1} className='contentImg' />
+              {machinery?.contentList?.map(item => {
+                return (item.contentType === 'image' ?
+                  <Image src={item.content} className='contentImg' /> :
+                  <View className='contentText'>{item.content}</View>
+                )
+              })}
             </View>
           </View>
         </ScrollView>

src/pages/machineryList/Card/index.jsx

@@ -1,18 +1,17 @@
-import { View,Image } from "@tarojs/components"
+import { View, Image } from "@tarojs/components"
 import Jianbian from "@/components/Jianbian"
-import banner1 from '@/assets/banner/2.jpg'
 import './style.less'
 
 export default (props) => {
-  const {onClick,goMap}=props
+  const { value, onClick, goMap } = props
   return (
-  <View className='machineryCard'>
-    <Jianbian status='1' />
-    <Image src={banner1} mode='aspectFill' onClick={onClick} />
-    <View className='info'>
-      <View className='machineryName' onClick={onClick} >收割机001--S01</View>
-      <View className='goMap' onClick={goMap}>进入地图 {">"}{">"}</View>
-    </View>    
-  </View>
+    <View className='machineryCard'>
+      <Jianbian value={value.jobStatus} type='machinery' />
+      <Image src={value.thumb}  mode='aspectFill' onClick={onClick} />
+      <View className='info'>
+        <View className='machineryName' onClick={onClick} >{value.name}</View>
+        <View className='goMap' onClick={goMap}>进入地图 {">"}{">"}</View>
+      </View>
+    </View>
   )
 }

src/pages/machineryList/index.jsx

@@ -1,27 +1,27 @@
-import { useEffect } from "react"
+import { useEffect, useState } from "react"
 import Taro from "@tarojs/taro"
 import { View, ScrollView } from "@tarojs/components"
 import CustomNav from "@/components/CustomNav"
 import withLayout from '@/layouts'
-import {getMachineryList} from '@/services/machinery'
+import { getMachineryList } from '@/services/machinery'
 import { useModel } from "@/store"
 import MachineryCard from './Card'
 import './style.less'
 
 export default withLayout((props) => {
   const { location } = useModel('location')
-
-  const goDetail=()=>{
-    Taro.navigateTo({ url: '/pages/machineryDetail/index' });
+  const [machinery, setMachinery] = useState([])
+  const goDetail = (val) => {
+    Taro.navigateTo({ url: `/pages/machineryDetail/index?id=${val}` });
   }
-  const goMap=()=>{
+  const goMap = () => {
     Taro.navigateTo({ url: '/pages/machineryMap/index' });
   }
-  useEffect(()=>{
-    getMachineryList({location:location}).then((res)=>{
-      
+  useEffect(() => {
+    getMachineryList({ location: location }).then((res) => {
+      setMachinery(res.records)
     })
-  },[])
+  }, [])
   return (
     <View className='page-index'>
       <View className='index-navbar'>
@@ -29,9 +29,11 @@ export default withLayout((props) => {
       </View>
       <View className='index-container machineryListContent'>
         <ScrollView scrollY style={{ height: '100%' }}>
-          <MachineryCard onClick={()=>goDetail()}  goMap={()=>goMap()} />
-          <MachineryCard />
-          <MachineryCard />
+          {
+            machinery?.map((item) => {
+              return <MachineryCard value={item} onClick={() => goDetail(item.machineryId)} goMap={() => goMap()} />
+            })
+          }
         </ScrollView>
       </View>
     </View>

src/pages/machineryMap/index.jsx

@@ -1,43 +1,90 @@
 import Taro from "@tarojs/taro"
-import { useState } from "react"
+import { useState, useEffect } from "react"
 import { View, Map, Image } from "@tarojs/components"
 import withLayout from '@/layouts'
+import { getMachineryList } from '@/services/machinery'
+import { useModel } from "@/store"
 import CustomNav from "@/components/CustomNav"
 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) => {
   const [show, setShow] = useState(false)
-  const markers = [
+  const { location } = useModel('location')
+  const [machineryList, setMachineryList] = useState([])
+  const [markerList, setMarkerList] = useState([])
+  const [current, setCurrent] = useState()
+
+  const locList = [
+    {
+      longitude: 112.106514,
+      latitude: 32.685927
+    },
+    {
+      longitude: 112.100406,
+      latitude: 32.673406
+    },
+    {
+      longitude: 112.06397,
+      latitude: 32.670488
+    },
+    {
+      longitude: 112.05434,
+      latitude: 32.685684
+    },
     {
-      id: 1,
-      longitude: 112.105348,
-      latitude: 32.697352,
-      iconPath: m1,
-      width: 50,
-      height: 50
+      longitude: 112.058724,
+      latitude: 32.701302
     },
     {
-      id: 2,
-      longitude: 112.120295,
-      latitude: 32.686656,
-      iconPath: m2,
-      width: 50,
-      height: 50
-    }
+      longitude: 112.015102,
+      latitude: 32.665504
+    },
+    {
+      longitude: 112.010503,
+      latitude: 32.685502
+    },
+    {
+      longitude: 112.097747,
+      latitude: 32.651764
+    },
+    {
+      longitude: 112.149705,
+      latitude: 32.664957
+    },
+    {
+      longitude: 112.16185,
+      latitude: 32.701241
+    },
   ]
   const handleClick = (e) => {
-    console.log(e.markerId)
+    setCurrent(machineryList[e.markerId])
     setShow(true)
   }
-  const goDetail = () => {
-    Taro.navigateTo({ url: '/pages/machineryDetail/index' });
+  const goDetail = (val) => {
+    Taro.navigateTo({ url: `/pages/machineryDetail/index?id=${val}` });
   }
-  const goList=()=>{
+  const goList = () => {
     Taro.navigateTo({ url: '/pages/machineryList/index' });
   }
+  useEffect(() => {
+    getMachineryList({ location: location }).then((res) => {
+      setMachineryList(res.records)
+      setMarkerList(res.records.map((item, index) => {
+        return {
+          id: index,
+          longitude: locList[index % 10].longitude,
+          latitude: locList[index % 10].latitude,
+          iconPath: item.jobStatus?m1:m2,
+          width: 50,
+          height: 50
+        }
+      }))
+    })
+  }, [])
   return (
     <View className='page-index'>
       <View className='index-navbar'>
@@ -47,7 +94,7 @@ export default withLayout((props) => {
         <Map
           longitude={112.092716}
           latitude={32.681642}
-          markers={markers}
+          markers={markerList}
           className='map'
           onMarkerTap={handleClick}
           onRegionChange={() => setShow(false)}
@@ -57,8 +104,8 @@ export default withLayout((props) => {
           <View className='showModel'>
             <View className='goList' onClick={goList}>{'<'}{'<'} 农机列表</View>
             <View className='title'>
-              <View className='name'>收割机001--S001</View>
-              <View className='action' onClick={goDetail}>详情 {">"}{">"}</View>
+              <View className='name'>{current.name}</View>
+              <View className='action' onClick={() => goDetail(current.machineryId)}>详情 {">"}{">"}</View>
             </View>
             <View className='position'>
               <Image src={picon} className='picon' />

src/services/machinery.js

@@ -5,7 +5,7 @@ import request from '@/utils/request'
  * @param {*} id 
  * @returns 
  */
- export const getMachineryDetail = (id, params) => request(`/machinery-sunmmary/${id}`, { params })
+ export const getMachineryDetail = (id, params) => request(`/machinery-summary/${id}`, { params })
 
 
  /**