吃个甘蔗嚼一年 3 年前
父节点
当前提交
5bff6647be

+ 42
- 6
src/components/List/index.jsx 查看文件

14
     onDataChange,
14
     onDataChange,
15
     noData,
15
     noData,
16
     className,
16
     className,
17
-    refres,//刷新复位
17
+    refresOff,//刷新复位
18
     refresherEnabled,
18
     refresherEnabled,
19
     ...leftProps
19
     ...leftProps
20
   } = props
20
   } = props
35
       setForceUpdate(forceUpdate + 1)
35
       setForceUpdate(forceUpdate + 1)
36
     }
36
     }
37
   }
37
   }
38
+  //下拉刷新回弹结束
39
+  const listPullDown = () => refresOff()
38
 
40
 
39
-  const loadingOff = () => {
40
-    refres()
41
+  const fetchList = () => {
42
+    if (!request) return;
43
+
44
+    setLoading(true)
45
+    request({
46
+      ...params,
47
+      pageSize,
48
+      pageNum: pageRef.current.current
49
+    }).then((res) => {
50
+      const { records, ...pageInfo } = res || {}
51
+
52
+      const lst = pageInfo.current === 1 ? records || [] : list.concat(records || [])
53
+      setList(lst)
54
+      setHasMore(pageInfo.current < pageInfo.pages)
55
+
56
+      if (onDataChange) {
57
+        onDataChange(lst, { paramsChanged: pageInfo.current === 1 })
58
+      }
59
+
60
+      pageRef.current = pageInfo
61
+      setLoading(false)
62
+
63
+    }).catch((err) => {
64
+
65
+      console.error(err)
66
+      setLoading(false)
67
+
68
+      if (onError) {
69
+        onError(err)
70
+      }
71
+    })
41
   }
72
   }
42
 
73
 
43
-  const fetchList = () => {
74
+  //刷新的请求
75
+  const getList = () => {
44
     if (!request) return;
76
     if (!request) return;
45
 
77
 
46
     setLoading(true)
78
     setLoading(true)
50
       pageNum: pageRef.current.current
82
       pageNum: pageRef.current.current
51
     }).then((res) => {
83
     }).then((res) => {
52
       const { records, ...pageInfo } = res || {}
84
       const { records, ...pageInfo } = res || {}
85
+
53
       const lst = pageInfo.current === 1 ? records || [] : list.concat(records || [])
86
       const lst = pageInfo.current === 1 ? records || [] : list.concat(records || [])
54
       setList(lst)
87
       setList(lst)
55
       setHasMore(pageInfo.current < pageInfo.pages)
88
       setHasMore(pageInfo.current < pageInfo.pages)
59
       }
92
       }
60
 
93
 
61
       pageRef.current = pageInfo
94
       pageRef.current = pageInfo
95
+      listPullDown()
96
+
62
       setLoading(false)
97
       setLoading(false)
63
 
98
 
64
     }).catch((err) => {
99
     }).catch((err) => {
100
+      Taro.stopPullDownRefresh()
101
+
65
       console.error(err)
102
       console.error(err)
66
       setLoading(false)
103
       setLoading(false)
67
 
104
 
107
       scrollY
144
       scrollY
108
       enhanced
145
       enhanced
109
       refresherEnabled={refresherEnabled}
146
       refresherEnabled={refresherEnabled}
110
-
111
-      onRefresherrefresh={fetchRef.current = fetchList}
147
+      onRefresherrefresh={getList}
112
       onScrollToLower={handleScrollToLower}
148
       onScrollToLower={handleScrollToLower}
113
       className={`${className} ${uqCls} list-view`}
149
       className={`${className} ${uqCls} list-view`}
114
     >
150
     >

+ 5
- 2
src/shop/components/ShopKeeper/shopKeeper.jsx 查看文件

45
       title: '刷新成功',
45
       title: '刷新成功',
46
       icon: 'none'
46
       icon: 'none'
47
     })
47
     })
48
+
48
     setTimeout(() => {
49
     setTimeout(() => {
49
       setRefres(true)
50
       setRefres(true)
50
 
51
 
158
           {/* 未核销 */}
159
           {/* 未核销 */}
159
           {activeTab === 0 &&
160
           {activeTab === 0 &&
160
             <view style={{ height: '45vh' }}>
161
             <view style={{ height: '45vh' }}>
162
+
161
               <List
163
               <List
162
                 style={{ height: '100%' }}
164
                 style={{ height: '100%' }}
163
                 request={getVerifiedOrder}
165
                 request={getVerifiedOrder}
164
                 params={queryParams}
166
                 params={queryParams}
165
                 onDataChange={setAllList}
167
                 onDataChange={setAllList}
166
                 refresherEnabled={refres}
168
                 refresherEnabled={refres}
167
-                refres={refresOff}
169
+                refresOff={refresOff}
168
                 noData={<NoData />}
170
                 noData={<NoData />}
169
                 render={({ item, index }) =>
171
                 render={({ item, index }) =>
170
                   <ShopUnused key={(index)} item={item} />}
172
                   <ShopUnused key={(index)} item={item} />}
182
                 request={getVerifiedOrder}
184
                 request={getVerifiedOrder}
183
                 params={queryParams}
185
                 params={queryParams}
184
                 refresherEnabled={refres}
186
                 refresherEnabled={refres}
185
-
186
                 onDataChange={setAllList}
187
                 onDataChange={setAllList}
188
+                refresOff={refresOff}
189
+
187
                 render={({ item, index }) => <ShopUsed verifiedOrder={verifiedOrder} key={(index)} item={item} />}
190
                 render={({ item, index }) => <ShopUsed verifiedOrder={verifiedOrder} key={(index)} item={item} />}
188
               >
191
               >
189
               </List>
192
               </List>

+ 0
- 1
src/shop/components/Sparead/spreadMoney.jsx 查看文件

89
             params={queryParams}
89
             params={queryParams}
90
             noData={<NoData />}
90
             noData={<NoData />}
91
             refresherEnabled
91
             refresherEnabled
92
-
93
             render={({ item, index }) => <ShopCommission key={(index)} item={item} />}
92
             render={({ item, index }) => <ShopCommission key={(index)} item={item} />}
94
           >
93
           >
95
           </List>
94
           </List>

+ 1
- 1
src/shop/pages/spread/spreadIndex.config.js 查看文件

2
   navigationBarTitleText: '十公里',
2
   navigationBarTitleText: '十公里',
3
   navigationStyle: 'custom',
3
   navigationStyle: 'custom',
4
   disableScroll: true,
4
   disableScroll: true,
5
-
5
+  enablePullDownRefresh: true,
6
   usingComponents: {
6
   usingComponents: {
7
     "mp-tabbar": "weui-miniprogram/tabbar/tabbar",
7
     "mp-tabbar": "weui-miniprogram/tabbar/tabbar",
8
     "mp-tabs": "../../../components/tabs/index",
8
     "mp-tabs": "../../../components/tabs/index",

+ 5
- 5
src/shop/pages/spread/spreadIndex.jsx 查看文件

1
 import React, { useState, useEffect, useRef } from 'react'
1
 import React, { useState, useEffect, useRef } from 'react'
2
 import CustomNav from '@/components/CustomNav'
2
 import CustomNav from '@/components/CustomNav'
3
-import { useRouter } from '@tarojs/taro'
3
+import Taro, { useRouter } from '@tarojs/taro'
4
 import { getShopList, getShopMoney, getVerifiedOrder } from '@/services/shopBoss'
4
 import { getShopList, getShopMoney, getVerifiedOrder } from '@/services/shopBoss'
5
 import { withSubscribeMessage } from '@/utils/subscribeMessage'
5
 import { withSubscribeMessage } from '@/utils/subscribeMessage'
6
 import withLayout from '@/layouts'
6
 import withLayout from '@/layouts'
20
 export default withLayout((props) => {
20
 export default withLayout((props) => {
21
   const { router, person } = props
21
   const { router, person } = props
22
   const { params } = useRouter()
22
   const { params } = useRouter()
23
-  const { tab,shopOrderId } = params || {}
23
+  const { tab, shopOrderId } = params || {}
24
   const [currentTab, setCurrentTab] = useState(0)
24
   const [currentTab, setCurrentTab] = useState(0)
25
   //顶部的商铺列表
25
   //顶部的商铺列表
26
   const [shopList, setShopList] = useState([])
26
   const [shopList, setShopList] = useState([])
29
   // const shopOrderId='1a8deba868489b0be19cba941e6f577e'
29
   // const shopOrderId='1a8deba868489b0be19cba941e6f577e'
30
   const shopId = shop?.shopId
30
   const shopId = shop?.shopId
31
 
31
 
32
-  
32
+
33
   const [amountType, setAmountType] = useState('order')
33
   const [amountType, setAmountType] = useState('order')
34
   const [isVerified, setisVerified] = useState(0)
34
   const [isVerified, setisVerified] = useState(0)
35
   const [shopMoney, setShopMoney] = useState([])
35
   const [shopMoney, setShopMoney] = useState([])
52
       const { shopList: list, shop: current } = res
52
       const { shopList: list, shop: current } = res
53
       setShopList(list)
53
       setShopList(list)
54
       if (shopOrderId) {
54
       if (shopOrderId) {
55
-        setShop(list.filter(x=>x.shopId==shopOrderId)[0])
55
+        setShop(list.filter(x => x.shopId == shopOrderId)[0])
56
       }
56
       }
57
-      else{
57
+      else {
58
         setShop(current)
58
         setShop(current)
59
       }
59
       }
60
     })
60
     })