.

src/components/MyCard/index.jsx

@@ -22,9 +22,7 @@ export default (props) => {
       <View className='line' />
       <MyCell header='农机名称'>{value?.machineryName||'收割机001'}</MyCell>
       <MyCell header='下单人'>{value?.personName}</MyCell>
-      {
-        detail && <MyCell header='手机号'>{value?.phone||'13613949434'}</MyCell>
-      }
+      <MyCell header='手机号'>{value?.phone}</MyCell>
       <MyCell header='订单时间'>{value?.createDate.substr(0,10)||'2022-03-08'}</MyCell>
       {
         detail && <MyCell header='服务地址'>{value?.address||'河南省南阳市邓州市孟楼镇'}</MyCell>

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

@@ -15,9 +15,14 @@ import './style.less'
 export default (props) => {
   const [imgList, setImgList] = useState([])
   const [orderList, setOrderList] = useState([])
+  const [currentPage,setCurrentPage]=useState(1)
+  const [isMore,setIsMore]=useState(false)
+  const [q,setQ]=useState()
 
   const handleSearch = (e) => {
-    console.log(e.detail.value)
+    setIsMore(false)
+    setCurrentPage(1)
+    setQ(e.detail.value)
   }
   const handleMore = () => {
     Taro.navigateTo({ url: '/pages/moreOrder/index' });
@@ -25,6 +30,22 @@ export default (props) => {
   const handleDetail = (val) => {
     Taro.navigateTo({ url: `/pages/orderDetail/index?id=${val}` });
   }
+  // 上拉加载
+  const handleScrollToLower=()=>{
+    setCurrentPage(currentPage+1)
+  }
+
+  useEffect(()=>{
+    getOrderList({pageNum:currentPage,q:q}).then(res=>{
+      const lst = currentPage === 1 ? res.records || [] : orderList.concat(res.records || [])
+      //长列表加载当下一页没有数据时
+      if (res.records.length==0&&currentPage!=1) {
+        setIsMore(true)
+        return
+      }
+      setOrderList(lst)
+    })
+  },[currentPage,q])
   useEffect(() => {
     getBannerList({ position: 'bannerWorker' })
       .then(res => {
@@ -35,9 +56,6 @@ export default (props) => {
           icon: 'none',
         })
       })
-    getOrderList().then((res) => {
-      setOrderList(res.records)
-    })
   }, [])
   return (
     <View className='orderIndex'>
@@ -52,7 +70,12 @@ export default (props) => {
           <Image src={searchImg} className='searchImg' />
         </View>
       </View>
-      <ScrollView scrollY style={{ height: 'calc(100% - 50px)' }}>
+      <ScrollView
+        scrollY
+        enhanced
+        onScrollToLower={isMore?'':handleScrollToLower}
+        style={{ height: 'calc(100% - 50px)' }}
+      >
         <View>
           <Swiper
             circular
@@ -73,12 +96,14 @@ export default (props) => {
             <Text className='more' onClick={handleMore}>更多{">"}{">"}</Text>
           </View>
           {
-            orderList.length===0?<NullCard value='您还没有新的订单！' />:
-            orderList.map((item)=>{
-              return <MyCard order value={item} key={item.orderId} goDetail={()=>handleDetail(item.orderId)} />
-            })
+            orderList.length === 0 ? <NullCard value='您还没有新的订单！' /> :
+              orderList.map((item) => {
+                return <MyCard order value={item} key={item.orderId} goDetail={() => handleDetail(item.orderId)} />
+              })
           }
-          {/* <Footer /> */}
+          {
+            isMore&&<Footer />
+          }          
         </View>
       </ScrollView>
     </View>

src/pages/moreOrder/index.jsx

@@ -21,6 +21,9 @@ export default withLayout(() => {
     } else {
       setImageShow(true)
     }
+    getOrderList({q:e.detail.value}).then((res) => {
+      setOrderList(res.records)
+    })
   }
   const handleClick = () => {
     setImageShow(false)
@@ -56,7 +59,7 @@ export default withLayout(() => {
           onClick={() => handleChange(0)}
         >
           <View>
-            <Text className='text'>待付款</Text>
+            <Text className='text'>待作业</Text>
             {
               currentTab === 0 && <View className='line' />
             }