flx

src/components/List/index.jsx

@@ -14,7 +14,7 @@ export default React.forwardRef((props, ref) => {
     onDataChange,
     noData,
     className,
-    refres,//刷新复位
+    refresOff,//刷新复位
     refresherEnabled,
     ...leftProps
   } = props
@@ -35,12 +35,44 @@ export default React.forwardRef((props, ref) => {
       setForceUpdate(forceUpdate + 1)
     }
   }
+  //下拉刷新回弹结束
+  const listPullDown = () => refresOff()
 
-  const loadingOff = () => {
-    refres()
+  const fetchList = () => {
+    if (!request) return;
+
+    setLoading(true)
+    request({
+      ...params,
+      pageSize,
+      pageNum: pageRef.current.current
+    }).then((res) => {
+      const { records, ...pageInfo } = res || {}
+
+      const lst = pageInfo.current === 1 ? records || [] : list.concat(records || [])
+      setList(lst)
+      setHasMore(pageInfo.current < pageInfo.pages)
+
+      if (onDataChange) {
+        onDataChange(lst, { paramsChanged: pageInfo.current === 1 })
+      }
+
+      pageRef.current = pageInfo
+      setLoading(false)
+
+    }).catch((err) => {
+
+      console.error(err)
+      setLoading(false)
+
+      if (onError) {
+        onError(err)
+      }
+    })
   }
 
-  const fetchList = () => {
+  //刷新的请求
+  const getList = () => {
     if (!request) return;
 
     setLoading(true)
@@ -50,6 +82,7 @@ export default React.forwardRef((props, ref) => {
       pageNum: pageRef.current.current
     }).then((res) => {
       const { records, ...pageInfo } = res || {}
+
       const lst = pageInfo.current === 1 ? records || [] : list.concat(records || [])
       setList(lst)
       setHasMore(pageInfo.current < pageInfo.pages)
@@ -59,9 +92,13 @@ export default React.forwardRef((props, ref) => {
       }
 
       pageRef.current = pageInfo
+      listPullDown()
+
       setLoading(false)
 
     }).catch((err) => {
+      Taro.stopPullDownRefresh()
+
       console.error(err)
       setLoading(false)
 
@@ -107,8 +144,7 @@ export default React.forwardRef((props, ref) => {
       scrollY
       enhanced
       refresherEnabled={refresherEnabled}
-
-      onRefresherrefresh={fetchRef.current = fetchList}
+      onRefresherrefresh={getList}
       onScrollToLower={handleScrollToLower}
       className={`${className} ${uqCls} list-view`}
     >

src/shop/components/ShopKeeper/shopKeeper.jsx

@@ -45,6 +45,7 @@ export default (props) => {
       title: '刷新成功',
       icon: 'none'
     })
+
     setTimeout(() => {
       setRefres(true)
 
@@ -158,13 +159,14 @@ export default (props) => {
           {/* 未核销 */}
           {activeTab === 0 &&
             <view style={{ height: '45vh' }}>
+
               <List
                 style={{ height: '100%' }}
                 request={getVerifiedOrder}
                 params={queryParams}
                 onDataChange={setAllList}
                 refresherEnabled={refres}
-                refres={refresOff}
+                refresOff={refresOff}
                 noData={<NoData />}
                 render={({ item, index }) =>
                   <ShopUnused key={(index)} item={item} />}
@@ -182,8 +184,9 @@ export default (props) => {
                 request={getVerifiedOrder}
                 params={queryParams}
                 refresherEnabled={refres}
-
                 onDataChange={setAllList}
+                refresOff={refresOff}
+
                 render={({ item, index }) => <ShopUsed verifiedOrder={verifiedOrder} key={(index)} item={item} />}
               >
               </List>

src/shop/components/Sparead/spreadMoney.jsx

@@ -89,7 +89,6 @@ export default (props) => {
             params={queryParams}
             noData={<NoData />}
             refresherEnabled
-
             render={({ item, index }) => <ShopCommission key={(index)} item={item} />}
           >
           </List>

src/shop/pages/spread/spreadIndex.config.js

@@ -2,7 +2,7 @@ export default {
   navigationBarTitleText: '十公里',
   navigationStyle: 'custom',
   disableScroll: true,
-
+  enablePullDownRefresh: true,
   usingComponents: {
     "mp-tabbar": "weui-miniprogram/tabbar/tabbar",
     "mp-tabs": "../../../components/tabs/index",

src/shop/pages/spread/spreadIndex.jsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useRef } from 'react'
 import CustomNav from '@/components/CustomNav'
-import { useRouter } from '@tarojs/taro'
+import Taro, { useRouter } from '@tarojs/taro'
 import { getShopList, getShopMoney, getVerifiedOrder } from '@/services/shopBoss'
 import { withSubscribeMessage } from '@/utils/subscribeMessage'
 import withLayout from '@/layouts'
@@ -20,7 +20,7 @@ import { View } from '@tarojs/components'
 export default withLayout((props) => {
   const { router, person } = props
   const { params } = useRouter()
-  const { tab,shopOrderId } = params || {}
+  const { tab, shopOrderId } = params || {}
   const [currentTab, setCurrentTab] = useState(0)
   //顶部的商铺列表
   const [shopList, setShopList] = useState([])
@@ -29,7 +29,7 @@ export default withLayout((props) => {
   // const shopOrderId='1a8deba868489b0be19cba941e6f577e'
   const shopId = shop?.shopId
 
-  
+
   const [amountType, setAmountType] = useState('order')
   const [isVerified, setisVerified] = useState(0)
   const [shopMoney, setShopMoney] = useState([])
@@ -52,9 +52,9 @@ export default withLayout((props) => {
       const { shopList: list, shop: current } = res
       setShopList(list)
       if (shopOrderId) {
-        setShop(list.filter(x=>x.shopId==shopOrderId)[0])
+        setShop(list.filter(x => x.shopId == shopOrderId)[0])
       }
-      else{
+      else {
         setShop(current)
       }
     })