.

config/dev.js

@@ -3,7 +3,8 @@ module.exports = {
     NODE_ENV: '"development"',
   },
   defineConstants: {
-    HOST: '"https://machine.njyunzhi.com"',
+    HOST: '"http://192.168.89.147:7080"',
+    // HOST: '"https://machine.njyunzhi.com"',
     // OSS: '"yz-shigongli.oss-accelerate.aliyuncs.com"',
     // VERSION: '"3.0.3_2021-12-23"',
   },

src/pages/index/index.jsx

@@ -1,9 +1,8 @@
 import Taro from "@tarojs/taro";
-import { useEffect, useState } from "react";
+import { useEffect } from "react";
 import { View, Image } from "@tarojs/components"
 import withLayout from '@/layouts'
 import CustomNav from "@/components/CustomNav";
-import LoginModel from "@/components/LoginModel";
 import indexImg from "@/assets/comm/index.png";
 import indexActive from "@/assets/comm/indexActive.png";
 import job from "@/assets/comm/job.png";

src/pages/machineryList/Card/style.less

@@ -17,6 +17,10 @@
     .machineryName{
       font-size: 36px;
       color: #222222;
+      width: 65vw;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      overflow: hidden;
     }
     .goMap{
       position: absolute;

src/pages/machineryList/index.jsx

@@ -1,40 +1,68 @@
 import { useEffect, useState } from "react"
-import Taro from "@tarojs/taro"
+import Taro, {useDidShow}from "@tarojs/taro"
 import { View, ScrollView } from "@tarojs/components"
 import CustomNav from "@/components/CustomNav"
 import NullCard from "@/components/NullCard";
+import Footer from "@/components/Footer";
 import withLayout from '@/layouts'
-import { getMachineryList } from '@/services/machinery'
 import { useModel } from "@/store"
+import { getMachineryList } from '@/services/machinery'
 import MachineryCard from './Card'
 import './style.less'
 
 export default withLayout((props) => {
   const { location } = useModel('location')
   const [machinery, setMachinery] = useState([])
+  const [currentPage, setCurrentPage] = useState(1)
+  const [isMore, setIsMore] = useState(false)
+
   const goDetail = (val) => {
     Taro.navigateTo({ url: `/pages/machineryDetail/index?id=${val}` });
   }
   const goMap = (val) => {
     Taro.navigateTo({ url: `/pages/machineryMap/index?id=${val}` });
   }
-  useEffect(() => {
-    getMachineryList({ location: location }).then((res) => {
-      setMachinery(res.records)
+   // 上拉加载
+   const handleScrollToLower = () => {
+    setCurrentPage(currentPage + 1)
+  }
+  const getList = () => {
+    getMachineryList({ location: location,pageNum: currentPage }).then(res => {
+      const lst = currentPage === 1 ? res.records || [] : machinery.concat(res.records || [])
+      //长列表加载当下一页没有数据时
+      if (res.records.length == 0 && currentPage != 1) {
+        setIsMore(true)
+        return
+      }
+      setMachinery(lst)
     })
-  }, [location])
+  }
+  useDidShow(() => {
+    getList();
+  })
+  useEffect(() => {
+    getList();
+  }, [currentPage,location])
+  
   return (
     <View className='page-index'>
       <View className='index-navbar'>
         <CustomNav title='农机列表' />
       </View>
       <View className='index-container machineryListContent'>
-        <ScrollView scrollY style={{ height: '100%' }}>
+        <ScrollView scrollY
+          enhanced
+          onScrollToLower={isMore ? '' : handleScrollToLower}
+          style={{ height: '100%' }}
+        >
           {
             machinery.length === 0 ? <NullCard value='您还没有农机！' /> :
-            machinery?.map((item) => {
-              return <MachineryCard value={item} key={item.machineryId} onClick={() => goDetail(item.machineryId)} goMap={() => goMap(item.machineryId)} />
-            })
+              machinery?.map((item) => {
+                return <MachineryCard value={item} key={item.machineryId} onClick={() => goDetail(item.machineryId)} goMap={() => goMap(item.machineryId)} />
+              })
+          }
+          {
+            machinery.length === 0 || isMore && <Footer />
           }
         </ScrollView>
       </View>