1002884655 vor 4 Jahren
Ursprung
Commit
4522736cd0

+ 20
- 10
src/components/ScrollPageRefresh/index.jsx Datei anzeigen

@@ -7,18 +7,32 @@ import './index.less'
7 7
 
8 8
 export default function ScrollPageRefresh (props) {
9 9
 
10
-  const { Reset = false, CloseReset = () => {}, KeepChildren = null, SearchKey = null, IsEmpty = false, ApiName = '', ListRefresh = true, ListName = 'records', RequestParams = {}, RequestData = null, RequestUrlData = null, PageSize = 10, Refresh = () => { }, Push = () => { }, RefreshBg = 'none' } = props
10
+  const { AutoRequest = true, Reset = false, CloseReset = () => { }, KeepChildren = null, SearchKey = null, IsEmpty = false, ApiName = '', ListRefresh = true, ListName = 'records', RequestParams = {}, RequestData = null, RequestUrlData = null, PageSize = 10, Refresh = () => { }, Push = () => { }, RefreshBg = 'none' } = props
11
+  const [FirstRequest, setFirstRequest] = useState(true)
11 12
   const [IsPullUp, setIsPullUp] = useState(false)
12 13
   const [IsPullDown, setIsPullDown] = useState(false)
13 14
   const [HasNextPage, setHasNextPage] = useState(true)
14 15
   const [PageNum, setPageNum] = useState(1)
15 16
 
16 17
   useEffect(() => {
17
-    if (ListRefresh) {
18
-      GetPageList(() => {
19
-        setIsPullDown(false)
20
-        setIsPullUp(false)
21
-      })
18
+    if (AutoRequest) {
19
+      if (ListRefresh) {
20
+        setFirstRequest(false)
21
+        GetPageList(() => {
22
+          setIsPullDown(false)
23
+          setIsPullUp(false)
24
+        })
25
+      }
26
+    } else {
27
+      if (!FirstRequest) {
28
+        if (ListRefresh) {
29
+          setFirstRequest(false)
30
+          GetPageList(() => {
31
+            setIsPullDown(false)
32
+            setIsPullUp(false)
33
+          })
34
+        }
35
+      }
22 36
     }
23 37
   }, [PageNum])
24 38
 
@@ -29,10 +43,6 @@ export default function ScrollPageRefresh (props) {
29 43
     }
30 44
   }, [Reset])
31 45
 
32
-  useEffect(() => {
33
-    console.log(props.children)
34
-  }, [])
35
-
36 46
   useEffect(() => {
37 47
     if (SearchKey !== null) {
38 48
       OnRefresh()

+ 2
- 1
src/layouts/index.jsx Datei anzeigen

@@ -1,5 +1,5 @@
1 1
 import React, { useEffect, useState } from 'react'
2
-import Taro, { useDidShow } from '@tarojs/taro'
2
+import Taro, { useDidShow, Current } from '@tarojs/taro'
3 3
 import AdvLayer from '@/components/AdvLayer'
4 4
 import GetUserIcon from '@/components/GetUserIcon/index'
5 5
 import GetUserPhone from '@/components/GetUserPhone/index'
@@ -41,6 +41,7 @@ export default function (props) {
41 41
 
42 42
   useDidShow(() => {
43 43
     setPage(getPage())
44
+    console.log(Current, `Current`)
44 45
   })
45 46
 
46 47
   useEffect(() => {

+ 7
- 1
src/pages/WoDe/WoDeRenZheng/index.jsx Datei anzeigen

@@ -1,6 +1,7 @@
1 1
 import React, { useState } from 'react'
2 2
 import ScrollPageRefresh from '@/components/ScrollPageRefresh'
3 3
 import AddYeZhuRenZheng from '@/components/AddYeZhuRenZheng'
4
+import { useDidShow } from '@tarojs/taro'
4 5
 import toolclass from '@/utils/toolclass.js'
5 6
 import Taro from '@tarojs/taro'
6 7
 import Page from '@/layouts'
@@ -13,6 +14,11 @@ export default function WoDeRenZheng () {
13 14
   const [PageList, setPageList] = useState([])
14 15
   const [ShowAddLayer, setShowAddLayer] = useState(false)
15 16
   const [IsEmpty, setIsEmpty] = useState(false)
17
+  const [Reset, setReset] = useState(false)
18
+
19
+  useDidShow(() => {
20
+    setReset(true)
21
+  })
16 22
 
17 23
   const Refresh = (e) => { // 下拉刷新
18 24
     if (e.length > 0) {
@@ -31,7 +37,7 @@ export default function WoDeRenZheng () {
31 37
   return (
32 38
     <Page>
33 39
       <view className='WoDeRenZheng'>
34
-        <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getOwnerVerifyList`} ListName={null} Refresh={Refresh} Push={Push}>
40
+        <ScrollPageRefresh IsEmpty={IsEmpty} AutoRequest={false} Reset={Reset} CloseReset={() => { setReset(false) }} ApiName={`getOwnerVerifyList`} ListName={null} Refresh={Refresh} Push={Push}>
35 41
           <view className='Content Activity'>
36 42
             {
37 43
               PageList.map((item, index) => (