fit

src/app.config.js

@@ -10,6 +10,11 @@ export default {
     navigationBarBackgroundColor: '#fff',
     navigationBarTitleText: 'WeChat',
     navigationBarTextStyle: 'black'
-  }
+  },
+  permission: {
+    'scope.userLocation': {
+      desc: '您的位置信息将方便您更好的小程序体验'
+    }
+  },
 }
 

src/app.js

@@ -13,6 +13,27 @@ class App extends Component {
   onLaunch (options) {
     // 登录获取人员信息
 
+    Taro.getLocation({
+      success (res) {
+        const location = `${res.longitude},${res.latitude}`
+        Taro.setStorageSync('location', location)
+
+      },
+      fail (err) {
+        console.error(err)
+        // reject(err)
+        Taro.showToast({
+          title: '获取定位失败',
+          icon: 'none',
+        })
+        // 默认邓州
+        const location = '112.087493,32.687609';
+        Taro.setStorageSync('location', location)
+
+
+      }
+    })
+
     const { logins } = store.getModel('userData').getState()
 
     Taro.login({

src/pages/CheckDetails/index.jsx

@@ -1,16 +1,37 @@
-import { useState } from "react"
-import { Image, View, Text } from "@tarojs/components"
+import { useState, useEffect } from "react"
+import { Image, View, Text, Swiper, SwiperItem } from "@tarojs/components"
 import Taro from "@tarojs/taro"
 import CustomNav from "@/components/CustomNav"
 
 import ButtontWX from "@/components/ButtontWX"
 import decorate from "@/assets/icons/comm/decorate.png"
 import addresss from '@/assets/mineImgaes/addresss.png'//地址
+import { getMachineryInfo } from "@/services/homes"
+
+
 import './style.less'
 
 
 
 export default (props) => {
+  console.log("🚀 ~ file: index.jsx ~ line 14 ~ props", props)
+
+  const $instance = Taro.getCurrentInstance()
+  const { id, location } = $instance.router.params
+
+  const [carsInfo, setCarsInfo] = useState({})
+  const [imagesList, setImagesList] = useState([])
+
+  useEffect(() => {
+
+    getMachineryInfo(id, { location: location, attached: true }).then((e) => {
+      setImagesList(e.imagesList)
+      setCarsInfo(e)
+      console.log('e', e);
+    })
+
+  }, [$instance.router.params, id, location])
+  console.log("🚀 ~ file: index.jsx ~ line 23 ~ carsInfo", carsInfo)
 
 
   const startReserve = () => {
@@ -33,12 +54,23 @@ export default (props) => {
 
         <View >
 
-          <Image style={{ width: '100%' }} src='http://img3.jc001.cn/img/001/1/1512/15566fd0311736f.jpg' />
+          {/* <Image style={{ width: '100%' }} src='http://img3.jc001.cn/img/001/1/1512/15566fd0311736f.jpg' /> */}
+          <Swiper
+            mode='scaleToFill'
+            className='swiper-box-info'
+
+          >
+            {imagesList.map((item, inx) => (
+              <SwiperItem key={inx}>
+                <Image src={item.url} className='storeImageinfo' />
+              </SwiperItem>
+            ))}
+          </Swiper>
 
           <View className='CarsContent-TextBox'>
             <View className='CheckDetails-bottom-box-flaxBox-liftText'>
-              <View className='CheckDetails-bottom-box-flaxBox-liftText-Titles'>不知家收割机</View>
-              <View className='CheckDetails-bottom-box-flaxBox-liftText-price'>2188/<Text>公顷</Text></View>
+              <View className='CheckDetails-bottom-box-flaxBox-liftText-Titles'>{carsInfo?.name}</View>
+              <View className='CheckDetails-bottom-box-flaxBox-liftText-price'>{carsInfo?.price}/<Text>公顷</Text></View>
             </View>
             <View className='content-header-box-map-Info' onClick={() => goMapInfo('222888')}>
               <View className='content-header-box-map-Info-liftCentent'>
@@ -46,7 +78,7 @@ export default (props) => {
                 <View>距离当前位置8.8公里&gt;&gt;</View>
               </View>
             </View>
-            <View className='content-header-box-map-Info-carsName'>农机手小李的收割机</View>
+            <View className='content-header-box-map-Info-carsName'>{carsInfo?.orgName}</View>
             <View className='startReserve-centent'>
               <View className='articleTitle-box-Details'>
                 <Image src={decorate} />

src/pages/CheckDetails/style.less

@@ -1,7 +1,15 @@
+.swiper-box-info {
+  height: calc(calc(100vw - 4vh) * 0.62);
+  // height: 37vh;
+  .storeImageinfo {
+    width: 100vw;
+  }
+}
+
 .CarsContent-TextBox {
   padding: 40px 30px;
   position: relative;
-  top: -9vh;
+  top: -6vh;
   background-color: #fff;
   border-radius: 40px 40px 0px 0px;
   .CheckDetails-bottom-box-flaxBox-liftText {

src/pages/index/index.config.js

@@ -5,6 +5,7 @@ export default {
 
   styleIsolation: 'shared',
   enableShareAppMessage: true,
+  onReachBottomDistance: 1,
   disableScroll: true,
   usingComponents: {
     "mp-tabbar": "weui-miniprogram/tabbar/tabbar",

src/pages/index/tabs/Homes.jsx

@@ -1,35 +1,80 @@
 
 import { View, Swiper, Image, SwiperItem, Text, Input } from "@tarojs/components"
+import { useEffect, useState, useMemo } from "react"
+import Taro, { useReachBottom } from "@tarojs/taro"
 import ButtontWX from '@/components/ButtontWX'
-import Taro from "@tarojs/taro"
 import addresss from '@/assets/mineImgaes/addresss.png'//地址
 import searchs from '@/assets/homesImgaes/searchs.png'//搜索图片
 import carsListImga from '@/assets/homesImgaes/carsListImga.png'//农机列表图片
 
+import { getHomeBanner, getMachinery, } from "@/services/homes"
+
 
 
 import './HomesCss/style.less'
 
 export default (props) => {
-  // const { SwiperItem } = Swiper
-
-  const carsList = [
-    { carsName: '联合收割机', carsUrl: 'http://img3.jc001.cn/img/001/1/1512/15566fd0311736f.jpg', jiage: '300', carsLocation: '3.9' },
-    { carsName: '水稻播种机', carsUrl: 'http://img3.jc001.cn/img/001/1/1512/15566fd031719b1.jpg', jiage: '300', carsLocation: '3.9' },
-    { carsName: '秸秆统一处理 型号：GB2312', carsUrl: 'http://img3.jc001.cn/img/001/1/1512/15566fd03201503.jpg', jiage: '免费', carsLocation: '3.9' },
-    { carsName: '花生稻子小麦收割一体机', carsUrl: 'http://img3.jc001.cn/img/001/1/1512/15566fd0324f649.jpg', jiage: '550', carsLocation: '3.9' },
-    { carsName: '拖拉机', carsUrl: 'https://image.cnhnb.com/image/jpg/miniapp/2020/03/26/ef945970d2cc4948b61d45ce57ac1179.jpg', jiage: '180', carsLocation: '3.9' },
-    { carsName: '自行车', carsUrl: 'https://image.cnhnb.com/image/jpg/miniapp/2020/03/26/e8745759793d48398f82e6658186686a.jpg', jiage: '20', carsLocation: '3.9' },
-  ]
-
-  const imglist = [
-    { url: 'https://profile.csdnimg.cn/3/1/5/0_qq_42551866' },
-    { url: 'https://profile.csdnimg.cn/3/1/5/0_qq_42551866' },
-    { url: 'https://profile.csdnimg.cn/3/1/5/0_qq_42551866' },
-    { url: 'https://profile.csdnimg.cn/3/1/5/0_qq_42551866' },
-    { url: 'https://profile.csdnimg.cn/3/1/5/0_qq_42551866' },
-    { url: 'https://profile.csdnimg.cn/3/1/5/0_qq_42551866' },
-  ]
+  const location = Taro.getStorageSync('location')
+  const [bannerHome, setBannerHome] = useState([])
+  const [carsList, setCarsList] = useState([])
+
+  let pageSize = 10;//每页加载的数据量
+  let pageNum = 1;//当前页
+  let totalPage = 0;//总页数
+  let resultData = [];
+
+  useEffect(() => {
+    getHomeBanner({ position: 'banner' }).then((e) => {
+      console.log('e', e);
+      // let bame = e.filter(ele => ele.position == "banner")
+      setBannerHome(e)
+    })
+    getMachinery(location, {
+      pageSize: 3,
+      pageNum: 1,
+    }).then((e) => {
+      setCarsList(e.records)
+    })
+
+  }, [])
+
+
+  useReachBottom(() => {
+    console.log('chufa',);
+
+    if (pageNum < totalPage) {
+      pageNum += 1;
+      //加载下一页
+      loadData()
+      console.log('chufa',);
+    } else {
+      Taro.showToast({
+        icon: "none",
+        title: '没有更多数据了',
+      })
+    }
+  }, [1])
+
+
+
+
+  const loadData = () => {
+    getMachinery(location, {
+      pageSize: pageSize,
+      pageNum: pageNum,
+    }).then((e) => {
+      pageNum = e.data.content.pageNum;
+      totalPage = e.data.content.totalPageNum;
+      resultData = e.data.content.rows;
+
+      setCarsList(e.records)
+    })
+  }
+
+
+  console.log("🚀 ~ file: Homes.jsx ~ line 36 ~ imglist ~ imglist", bannerHome)
+
+
 
   const handleSearch = (e) => {
     console.log(e.detail.value)
@@ -45,7 +90,7 @@ export default (props) => {
 
   }
   const goCarsInfo = (res) => {
-    Taro.navigateTo({ url: `/pages/CheckDetails/index?id=${res}` })
+    Taro.navigateTo({ url: `/pages/CheckDetails/index?id=${res}&location=${location}` })
 
   }
   const goMapInfo = (res) => {
@@ -74,9 +119,9 @@ export default (props) => {
         autoplay
         className='swiper-box'
       >
-        {imglist.map((item, inx) => (
+        {bannerHome.map((item, inx) => (
           <SwiperItem key={inx}>
-            <Image src={item.url} mode='widthFix' className='storeImage' />
+            <Image src={item.thumb} mode='widthFix' className='storeImage' />
           </SwiperItem>
         ))}
       </Swiper>
@@ -92,20 +137,20 @@ export default (props) => {
         carsList.map((item, index) => {
           return (
             <View key={index} className='carsListImga-bottom-box'>
-              <Image src={item.carsUrl} onClick={() => goCarsInfo(item.id)} />
+              <Image src={item.thumb} onClick={() => goCarsInfo(item.machineryId)} />
               <View className='carsListImga-bottom-box-flaxBox'>
                 <View className='carsListImga-bottom-box-flaxBox-liftText'>
-                  <View className='carsListImga-bottom-box-flaxBox-liftText-Titles'>{item.carsName}</View>
-                  <View className='carsListImga-bottom-box-flaxBox-liftText-price'>{item.jiage}/<Text>公顷</Text></View>
+                  <View className='carsListImga-bottom-box-flaxBox-liftText-Titles'>{item.name}</View>
+                  <View className='carsListImga-bottom-box-flaxBox-liftText-price'>{item.price}/<Text>公顷</Text></View>
                 </View>
                 <View className='carsListImga-bottom-box-flaxBox-rightBut'>
                   <ButtontWX onClick={startReserve} butText='预约' butWidth={80} butHeight={34} butFontSize={19} butBorderRadius={0} />
                 </View>
               </View>
-              <View className='content-header-box-map' onClick={() => goMapInfo(item.mapId)}>
+              <View className='content-header-box-map' onClick={() => goMapInfo(item.machineryId)}>
                 <View className='content-header-box-map-liftCentent'>
                   <Image src={addresss} />
-                  <View>距离当前位置{item.carsLocation}公里</View>
+                  <View>距离当前位置公里</View>
                 </View>
                 <View className='content-header-box-map-rightCentent'>进入地图&gt;&gt;</View>
               </View>

src/pages/index/tabs/Mine.jsx

@@ -1,7 +1,7 @@
 
 import { View, Image } from "@tarojs/components"
 import Taro from "@tarojs/taro"
-import { useState, useEffect } from "react"
+import { useState, useEffect, useMemo } from "react"
 import UserCellBox from '@/components/UserCellBox'
 import addresss from '@/assets/mineImgaes/addresss.png'//地址
 import aboutUs from '@/assets/mineImgaes/aboutUs.png'//关于我们
@@ -29,12 +29,11 @@ export default (props) => {
   const $instance = Taro.getCurrentInstance()
 
 
-  useEffect(() => {
+  const userInfo = useMemo(() => {
     console.log($instance.router.params)
     if ($instance.router.params.userOk || person.phone) {
       setIsLoginBox(true)
-    } else {
-      console.log('没有',);
+      return { phone: person.phone, nickName: person.nickName }
     }
   }, [$instance.router.params, person])
 
@@ -49,6 +48,7 @@ export default (props) => {
     // setIsLoginBox(true)
   }
   const goToPages = (res) => {
+
     switch (res) {
       case 0:
         Taro.navigateTo({ url: '/pages/AboutUsPage/index' })
@@ -90,8 +90,8 @@ export default (props) => {
                 <View className='setPassword'>修改密码</View>
                 <Image className='User-Avatar-background-trueBox-userImg' src='https://profile.csdnimg.cn/3/1/5/0_qq_42551866' />
                 <View className='User-Avatar-background-trueBox-name'>
-                  <View >鲍zhangchao</View>
-                  <View >{person.phone}</View>
+                  <View >{userInfo.nickName}</View>
+                  <View >{userInfo.phone}</View>
                 </View>
 
               </View>

src/services/homes.js

@@ -0,0 +1,25 @@
+
+import request from '@/utils/request'
+/**
+ * banner轮播图
+ * @param {*} data 
+ * @returns 
+ */
+export const getHomeBanner = (data) => request(`/banner`, { data, method: 'get' })
+
+/**
+ * 农机列表
+ * @param {*} data 
+ * @returns 
+ */
+export const getMachinery = (pram, data) => request(`/machinery?location=${pram}`, { data, method: 'get' })
+
+
+
+/**
+ * 农机详情
+ * @param {*} data 
+ * @returns 
+ */
+export const getMachineryInfo = (pram, data) => request(`/machinery-summary/${pram}`, { data, method: 'get' })
+

src/utils/codeSegment.js

@@ -15,4 +15,6 @@ export function getQueryString (params) {
   })
 
   return arr.filter(Boolean).join('&')
-}
+}
+
+