Yansen 2 years ago
parent
commit
8ce79a659a
2 changed files with 14 additions and 11 deletions
  1. 1
    1
      config/prod.js
  2. 13
    10
      src/components/PowerList/index.jsx

+ 1
- 1
config/prod.js View File

6
     HOST: '"https://wmcj.huoshannews.com"',
6
     HOST: '"https://wmcj.huoshannews.com"',
7
     AD_IMAGE: '"https://h5.njyunzhi.com/images/citizen_banner.png"',
7
     AD_IMAGE: '"https://h5.njyunzhi.com/images/citizen_banner.png"',
8
     DEFAULT_POS: '"116.3476917447715,31.409912844296578"', // 霍山县人民政府 gcj02
8
     DEFAULT_POS: '"116.3476917447715,31.409912844296578"', // 霍山县人民政府 gcj02
9
-    VERSION: '"1.1.14-20230327"',
9
+    VERSION: '"1.1.15-20230328"',
10
   },
10
   },
11
   mini: {},
11
   mini: {},
12
   h5: {
12
   h5: {

+ 13
- 10
src/components/PowerList/index.jsx View File

9
 
9
 
10
   const pageSize = 5;
10
   const pageSize = 5;
11
   const pageNumRef = React.useRef(1);
11
   const pageNumRef = React.useRef(1);
12
-  const listRef = React.useRef([]);
13
   const [loading, setLoading] = React.useState(false);
12
   const [loading, setLoading] = React.useState(false);
14
   const [list, setList] = React.useState([]);
13
   const [list, setList] = React.useState([]);
15
   const [finished, setFinished] = React.useState(true);
14
   const [finished, setFinished] = React.useState(true);
15
+  const listRef = React.useRef([]);
16
+  const paramsRef = React.useRef();
16
   listRef.current = list;
17
   listRef.current = list;
18
+  paramsRef.current = params || {};
17
 
19
 
18
   const changeLoading = (val) => {
20
   const changeLoading = (val) => {
19
     setLoading(val);
21
     setLoading(val);
28
         changeLoading(true);
30
         changeLoading(true);
29
         request({
31
         request({
30
           pageSize,
32
           pageSize,
31
-          ...(params || {}),
33
+          ...paramsRef.current,
32
           ...options,
34
           ...options,
33
         })
35
         })
34
           .then((res) => {
36
           .then((res) => {
55
           });
57
           });
56
       });
58
       });
57
     },
59
     },
58
-    [request, params]
60
+    []
59
   );
61
   );
60
 
62
 
61
   const refresh = React.useCallback(() => {
63
   const refresh = React.useCallback(() => {
64
     queryData({ pageNum: pageNumRef.current });
66
     queryData({ pageNum: pageNumRef.current });
65
     console.log("refresh" + pageNumRef.current);
67
     console.log("refresh" + pageNumRef.current);
66
     console.log("refresh\n  " + finished);
68
     console.log("refresh\n  " + finished);
67
-  }, [queryData]);
69
+  }, []);
68
 
70
 
69
   const onScrollToLower = React.useCallback(
71
   const onScrollToLower = React.useCallback(
70
     (event = 0, isRefresh = false) => {
72
     (event = 0, isRefresh = false) => {
74
       queryData({ pageNum: pageNumRef.current });
76
       queryData({ pageNum: pageNumRef.current });
75
       // setFinished(isRefresh)
77
       // setFinished(isRefresh)
76
     },
78
     },
77
-    [queryData]
79
+    []
78
   );
80
   );
79
 
81
 
80
   useShow(() => {
82
   useShow(() => {
81
     refresh();
83
     refresh();
82
   });
84
   });
83
-  // 后加的
84
-  React.useEffect(() => {
85
-    onScrollToLower();
86
-  }, [onScrollToLower]);
85
+
86
+  // // 后加的
87
+  // React.useEffect(() => {
88
+  //   onScrollToLower();
89
+  // }, [onScrollToLower]);
87
 
90
 
88
   React.useEffect(() => {
91
   React.useEffect(() => {
89
     refresh();
92
     refresh();
90
-  }, [refresh]);
93
+  }, [refresh, params]);
91
 
94
 
92
   React.useImperativeHandle(ref, () => ({
95
   React.useImperativeHandle(ref, () => ({
93
     refresh,
96
     refresh,