静态页面

src/components/WuYeBaoXiu/index.jsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react'
 import { useModel } from '@/store'
-import Taro from '@tarojs/taro'
+import Taro, { useDidShow } from '@tarojs/taro'
 import { Swiper, SwiperItem } from '@tarojs/components'
 import WuYeBaoXiuItem from '@/components/WuYeBaoXiuItem/index'
 import ScrollPageRefresh from '@/components/ScrollPageRefresh/index'
@@ -10,15 +10,21 @@ import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
 
-export default function WuYeBaoXiu () {
+export default function WuYeBaoXiu (props) {
 
   const { user } = useModel('user')
   const [PageList, setPageList] = useState([])
   const [BannerList, setBannerList] = useState([])
   const [IsEmpty, setIsEmpty] = useState(false)
+  const [Reset, setReset] = useState(false)
+  const { PageReset = false, StopReset = () => {} } = props
 
-  Taro.useDidShow(() => {
-  })
+  useEffect(() => {
+    console.log(PageReset, `11111`)
+    if (PageReset) {
+      setReset(true)
+    }
+  }, [PageReset])
 
   const GetBanner = (done = () => { }) => { // 获取轮播图
     request({ ...apis.getBanner, params: { showPosition: `property`, showType: 'banner', pageSize: 5, pageNum: 1 } }).then((res) => {
@@ -30,6 +36,7 @@ export default function WuYeBaoXiu () {
   }
 
   const Refresh = (e) => { // 下拉刷新
+    StopReset()
     GetBanner()
     if (e.length > 0) {
       setIsEmpty(false)
@@ -46,9 +53,12 @@ export default function WuYeBaoXiu () {
   return (
     <view className='WuYeBaoXiu'>
       <ScrollPageRefresh
+        AutoRequest={false}
+        Reset={Reset}
+        CloseReset={() => { setReset(false) }}
         IsEmpty={IsEmpty}
-        ApiName={`getGongDanList`}
-        ListName={`pagelist`}
+        ApiName='getGongDanList'
+        ListName='pagelist'
         RequestUrlData={{ orgId: user.orgId }}
         RequestParams={{ type: 2 }}
         Refresh={Refresh}

src/pages/WuYe/BaoXiuFeiYong/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react'
-import Taro, { Current, useDidShow } from '@tarojs/taro'
+import Taro, { Current } from '@tarojs/taro'
 import SlidePopup from '@/components/SlidePopup/index'
 import UploadImg from '@/components/UploadImg/index'
 import Page from '@/layouts'
@@ -19,15 +19,9 @@ export default function BaoXiuFeiYong () {
   const [DetailInfo, setDetailInfo] = useState(null)
   const [BillInfo, setBillInfo] = useState(null)
 
-  // useEffect(() => {
-  //   Init()
-  // }, [CurrnetBaoXiuId])
-
-  useDidShow(() => {
-    if (CurrnetBaoXiuId !== null) {
-      Init()
-    }
-  })
+  useEffect(() => {
+    Init()
+  }, [CurrnetBaoXiuId])
 
   const Init = () => {
     request({ ...apis.getGongDanDetail, args: { orgId: user.orgId }, params: { ticketId: CurrnetBaoXiuId } }).then((res) => { // 获取工单详情

src/pages/WuYe/index.jsx

@@ -18,6 +18,7 @@ export default function WuYe () {
   const { user, setUser } = useModel('user')
   const [NavList] = useState([{ name: '公告', id: 1 }, { name: '服务', id: 2 }, { name: '报修', id: 3 }, { name: '缴费', id: 4 }])
   const [CurrentNavId, setCurrentNavId] = useState(null)
+  const [PageReset, setPageReset] = useState(false)
 
   useDidShow(() => {
     if (user.verifyStatus !== 'certified') {
@@ -39,6 +40,10 @@ export default function WuYe () {
           }
         }
       })
+    } else {
+      if (CurrentNavId - 0 === 3) {
+        setPageReset(true)
+      }
     }
   })
 
@@ -50,6 +55,10 @@ export default function WuYe () {
         } else {
           setCurrentNavId(1)
         }
+      } else {
+        if (CurrentNavId - 0 === 3) {
+          setPageReset(true)
+        }
       }
     }
   }, [CurrentNavId])
@@ -99,7 +108,7 @@ export default function WuYe () {
             {
               CurrentNavId - 0 === 3 &&
               <view className='Content BaoXiu'>
-                <WuYeBaoXiu></WuYeBaoXiu>
+                <WuYeBaoXiu PageReset={PageReset} StopReset={() => { setPageReset(false) }}></WuYeBaoXiu>
               </view>
             }