|
@@ -1,4 +1,4 @@
|
1
|
|
-import React, { useEffect } from "react";
|
|
1
|
+import React from "react";
|
2
|
2
|
import Taro from "@tarojs/taro";
|
3
|
3
|
import { View } from "@tarojs/components";
|
4
|
4
|
import { PowerScrollView } from "@antmjs/vantui";
|
|
@@ -8,7 +8,7 @@ export default React.forwardRef((props, ref) => {
|
8
|
8
|
const { request, params, renderItem, onLoadingChange, onDataChange } = props;
|
9
|
9
|
|
10
|
10
|
const pageSize = 5;
|
11
|
|
- const pageNumRef = React.useRef(1);
|
|
11
|
+ const pageNumRef = React.useRef(0);
|
12
|
12
|
const listRef = React.useRef([]);
|
13
|
13
|
const [loading, setLoading] = React.useState(false);
|
14
|
14
|
const [list, setList] = React.useState([]);
|
|
@@ -44,8 +44,6 @@ export default React.forwardRef((props, ref) => {
|
44
|
44
|
setList(dataset);
|
45
|
45
|
|
46
|
46
|
setFinished(current >= pages);
|
47
|
|
- console.log("onScrollToLower\n " + current >= pages);
|
48
|
|
-
|
49
|
47
|
changeLoading(false);
|
50
|
48
|
resolve();
|
51
|
49
|
})
|
|
@@ -59,20 +57,18 @@ export default React.forwardRef((props, ref) => {
|
59
|
57
|
);
|
60
|
58
|
|
61
|
59
|
const refresh = React.useCallback(() => {
|
|
60
|
+ console.log(pageNumRef);
|
62
|
61
|
pageNumRef.current = 1;
|
63
|
|
- // setFinished(true)
|
|
62
|
+
|
64
|
63
|
queryData({ pageNum: pageNumRef.current });
|
65
|
64
|
console.log("refresh" + pageNumRef.current);
|
66
|
|
- console.log("refresh\n " + finished);
|
67
|
65
|
}, [queryData]);
|
68
|
66
|
|
69
|
67
|
const onScrollToLower = React.useCallback(
|
70
|
68
|
(event = 0, isRefresh = false) => {
|
71
|
69
|
console.log("onScrollToLower" + pageNumRef.current);
|
72
|
|
- console.log("onScrollToLower\n " + finished);
|
73
|
70
|
pageNumRef.current += 1;
|
74
|
71
|
queryData({ pageNum: pageNumRef.current });
|
75
|
|
- // setFinished(isRefresh)
|
76
|
72
|
},
|
77
|
73
|
[queryData]
|
78
|
74
|
);
|
|
@@ -93,7 +89,13 @@ export default React.forwardRef((props, ref) => {
|
93
|
89
|
refresh,
|
94
|
90
|
updateData: (dt) => setList(dt),
|
95
|
91
|
}));
|
96
|
|
-
|
|
92
|
+ const onScrolls = (e) => {
|
|
93
|
+ console.log(e.target.scrollTop);
|
|
94
|
+ };
|
|
95
|
+ const onClicks = (e) => {
|
|
96
|
+ console.log(132);
|
|
97
|
+ console.log(e);
|
|
98
|
+ };
|
97
|
99
|
return (
|
98
|
100
|
<PowerScrollView
|
99
|
101
|
scrollY
|
|
@@ -104,6 +106,8 @@ export default React.forwardRef((props, ref) => {
|
104
|
106
|
finished={finished}
|
105
|
107
|
onScrollToLower={onScrollToLower}
|
106
|
108
|
style={{ height: "100%", overflowY: "auto" }}
|
|
109
|
+ onScroll={onScrolls}
|
|
110
|
+ renderLoading={loading ? <view>加载中...</view> : <view></view>}
|
107
|
111
|
>
|
108
|
112
|
{list.map(renderItem)}
|
109
|
113
|
</PowerScrollView>
|