flx

src/components/List/index.jsx

@@ -14,6 +14,7 @@ export default React.forwardRef((props, ref) => {
     onDataChange,
     noData,
     className,
+    refres,
     ...leftProps
   } = props
 
@@ -65,6 +66,7 @@ export default React.forwardRef((props, ref) => {
     })
   }
 
+
   const fetchRef = useRef()
   fetchRef.current = fetchList
 
@@ -85,7 +87,38 @@ export default React.forwardRef((props, ref) => {
       }).exec()
     })
   }, [])
+  const asd = () => {
+    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)
+      refres()
+
+
+    }).catch((err) => {
+      console.error(err)
+      setLoading(false)
+      refres()
+
+      if (onError) {
+        onError(err)
+      }
+    })
+
+  }
   // https://developers.weixin.qq.com/miniprogram/dev/api/ui/scroll/ScrollViewContext.html
   // ScrollViewContext 透传给父组件
   //https://zh-hans.reactjs.org/docs/hooks-reference.html#useimperativehandle
@@ -97,6 +130,8 @@ export default React.forwardRef((props, ref) => {
     <ScrollView
       scrollY
       enhanced
+      refresherEnabled={props}
+      onRefresherrefresh={asd}
       onScrollToLower={handleScrollToLower}
       {...leftProps}
       className={`${className} ${uqCls} list-view`}

src/hotel/components/HouseManage/houseManage.jsx

@@ -167,6 +167,8 @@ export default React.forwardRef((props, ref) => {
           request={getRoomList}
           params={queryParams}
           onDataChange={setDetail}
+          refresherEnabled={false}
+
           noData="暂无房源信息"
         >
           <view className='waterfall'>

src/hotel/components/Income/income.jsx

@@ -13,11 +13,11 @@ import './income.less'
 const getList = id => params => getAccountLogList(id, params)
 
 export default (props) => {
-  const {  hotel, account } = props
+  const { hotel, account } = props
 
   const queryParams = useMemo(() => ({}), [])
 
-  const fetchAPI = useMemo(()=>account.accountId ? getList(account.accountId) : undefined, [account?.accountId])
+  const fetchAPI = useMemo(() => account.accountId ? getList(account.accountId) : undefined, [account?.accountId])
 
   const [isyear, setYear] = useState(true)
   const [isMomth, setMonth] = useState(false)
@@ -36,7 +36,7 @@ export default (props) => {
             <view className='sleft'>
               <view className='lword'>全年收入（税前）</view>
               <view className='yearMoney'>
-                <text>{isyear ? formatPrice(account?.amounts): '******'}</text>元
+                <text>{isyear ? formatPrice(account?.amounts) : '******'}</text>元
                 <image className='micon' src={isyear ? eyes : ceyes} onClick={handleYear} />
               </view>
             </view>
@@ -57,7 +57,9 @@ export default (props) => {
           request={fetchAPI}
           params={queryParams}
           noData={<NoData />}
-          render={({item, index}) => (
+          refresherEnabled={false}
+
+          render={({ item, index }) => (
             <view className='spreadCard' key={index}>
               <view className='card'>
                 <view className='spreadTime'>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间：<text>{formatTime(item.createDate, 'yyyy/MM/dd hh:mm:ss')}</text></view>

src/pages/MineUserAll/Collect/index.jsx

@@ -25,6 +25,8 @@ export default withLayout((props) => {
           style={{ height: '100%' }}
           request={getCollectList}
           params={queryParams}
+          refresherEnabled={false}
+
           onDataChange={setCollectContent}
         >
           {

src/pages/searchResult/searchResult.jsx

@@ -1,4 +1,4 @@
-import { React, useState,useRef } from 'react'
+import { React, useState, useRef } from 'react'
 // .就是当前路径
 import iconsearch from '../../assets/icons/housemantj/search.png'
 import CustomNav from '@/components/CustomNav'
@@ -90,6 +90,8 @@ export default withLayout((props) => {
           request={getResourceList}
           params={queryParams}
           onDataChange={setAllList}
+          refresherEnabled={false}
+
         >
           {
             alllist.length == 0 ?

src/shop/components/ShopKeeper/shopKeeper.jsx

@@ -34,7 +34,23 @@ export default (props) => {
 
   const [isyear, setYear] = useState(true)
   const [isMomth, setMonth] = useState(false)
-  //小眼睛开关
+  const [refres, setRefres] = useState(true)
+
+  /**
+   *s 刷新结束后关闭
+   */
+  const refresOff = () => {
+    setRefres(false)
+    Taro.showToast({
+      title: '刷新成功',
+      icon: 'none'
+    })
+    setTimeout(() => {
+      setRefres(true)
+
+    }, 2000);
+  }
+
   const handleYear = () => {
     isyear ? setYear(false) : setYear(true)
   }
@@ -51,6 +67,7 @@ export default (props) => {
     const val = e.detail.value
     setPhone(val)
   }
+
   useEffect(() => {
     if (tabJump) {
       setActiveTab(tabJump - 0)
@@ -59,6 +76,9 @@ export default (props) => {
 
 
 
+
+
+
   const handleTabChange = (e) => {
     const { index } = e.detail
     setActiveTab(index)
@@ -143,6 +163,8 @@ export default (props) => {
                 request={getVerifiedOrder}
                 params={queryParams}
                 onDataChange={setAllList}
+                refresherEnabled={refres}
+                refres={refresOff}
                 noData={<NoData />}
                 render={({ item, index }) =>
                   <ShopUnused key={(index)} item={item} />}
@@ -159,6 +181,8 @@ export default (props) => {
                 noData={<NoData />}
                 request={getVerifiedOrder}
                 params={queryParams}
+                refresherEnabled={refres}
+
                 onDataChange={setAllList}
                 render={({ item, index }) => <ShopUsed verifiedOrder={verifiedOrder} key={(index)} item={item} />}
               >

src/shop/components/Sparead/spreadMoney.jsx

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