feats

config/dev.js

@@ -3,8 +3,8 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    // HOST: '"https://xlk.njyz.tech"',
-    HOST: '"https://xlj.newlandsh.com"',
+    HOST: '"https://xlk.njyz.tech"',
+    // HOST: '"https://xlj.newlandsh.com"',
     // HOST: '"http://127.0.0.1:8567"',
     WSS_HOST: '"wss://xlk.njyz.tech"',
     OSS_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',

project.config.json

@@ -2,7 +2,7 @@
 	"miniprogramRoot": "dist/",
 	"projectname": "miniapp",
 	"description": "",
-	"appid": "wxc96058d57e77f373",
+	"appid": "wxe44244d1a5ea3364",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,

src/subpackages/pages/marketing/residentManager/index.jsx

@@ -1,4 +1,4 @@
-import { useState, useEffect } from 'react'
+import { useState, useEffect, useCallback, useRef } from 'react'
 import withLayout from '@/layout'
 import { ScrollView, Input } from '@tarojs/components'
 import '@/assets/css/iconfont.css'
@@ -8,71 +8,18 @@ import { API_MANAGE_CUSTOMER_LIST, API_MY_BUILDINGIDS } from '@/constants/api'
 import './index.scss'
 import ResidentListItem from '../components/ResidentListItem/index'
 
-export default withLayout(() => {
-  // const [FilterMenu] = useState([
-  //   { name: '报备', id: 1 },
-  //   { name: '到访', id: 2 },
-  //   { name: '认筹', id: 3 },
-  //   { name: '认购', id: 4 },
-  //   { name: '签约', id: 5 },
-  //   { name: '报备无效', id: 6 },
-  //   { name: '报备过期', id: 7 }
-  // ])
-  // const [CurrentFilterMenuId, setCurrentFilterMenuId] = useState(null)
-
-  // const CutFilter = (item) => {
-  //   return () => {
-  //     setCurrentFilterMenuId(item.id === CurrentFilterMenuId ? null : item.id)
-  //   }
-  // }
-
-  const user = useSelector(state => state.user)
+export default withLayout((props) => {
+  const { person } = props
+  
   const [BuildingIds, setBuildingIds] = useState([])
   const [PageList, setPageList] = useState([])
   const [IsPull, setPull] = useState(false)
-  const [PersonId, setPersonId] = useState(null)
-  const [pageNumber, setPageNumber] = useState(1)
   const [HasNextPage, setHasNextPage] = useState(true)
   const [CurrentBuildingId, setCurrentBuildingId] = useState(null)
   const [CurrentBuildingName, setCurrentBuildingName] = useState(null)
-  const [FilterData, setFilterData] = useState({})
-
-  useEffect(() => {
-    if (user?.userInfo?.person?.personId) {
-      setPersonId(user.userInfo.person.personId)
-    }
-  }, [user])
-
-  useEffect(() => {
-    if (PersonId) {
-      GetMyBuildingIds()
-    }
-  }, [PersonId])
-
-  useEffect(() => {
-    if (pageNumber === 1) {
-      GetPageList()
-    } else {
-      setPageNumber(1)
-    }
-  }, [FilterData])
-
-  useEffect(() => {
-    if (BuildingIds.length) {
-      setCurrentBuildingId(BuildingIds[0].buildingId)
-      setCurrentBuildingName(BuildingIds[0].name)
-    }
-  }, [BuildingIds])
-
-  useEffect(() => {
-    if (CurrentBuildingId) {
-      if (pageNumber === 1) {
-        GetPageList()
-      } else {
-        setPageNumber(1)
-      }
-    }
-  }, [CurrentBuildingId])
+  const [page, setPage] = useState({ pageNumber: 1 })
+  const queryParamsRef = useRef({})
+  const getListRef = useRef()
 
   const GetMyBuildingIds = () => {
     fetch({ url: API_MY_BUILDINGIDS, method: 'get' }).then((res) => {
@@ -80,52 +27,40 @@ export default withLayout(() => {
     })
   }
 
-  // useEffect(() => {
-  //   if(CurrentFilterMenuId) {
-  //     if(pageNumber === 1) {
-  //       GetPageList()
-  //     } else {
-  //       setPageNumber(1)
-  //     }
-  //   }
-  // }, [CurrentFilterMenuId])
-
   const PageRefresh = () => { // 页面下拉刷新回调
     setPull(true)
   }
 
-  const GetPageList = () => {
+  getListRef.current = (params) => {
+    if (!CurrentBuildingId) return;
+
     setHasNextPage(false)
-    fetch({ url: API_MANAGE_CUSTOMER_LIST, method: 'get', payload: { pageNumber, pageSize: 10, ...FilterData, buildingId: CurrentBuildingId } }).then((res) => {
-      setPageList(pageNumber === 1 ? res.records || [] : PageList.concat(res.records || []))
+    fetch({
+      url: API_MANAGE_CUSTOMER_LIST,
+      payload: {
+        pageSize: 10,
+        ...params,
+        ...queryParamsRef.current,
+        buildingId: CurrentBuildingId
+      },
+    }).then((res) => {
+      setPageList(res.current === 1 ? res.records || [] : PageList.concat(res.records || []))
       setHasNextPage(res.current < res.pages)
       setPull(false)
     })
   }
 
-  const PageLoadMore = () => { // 页面上拉加载更多
-    if (HasNextPage) {
-      setPageNumber(pageNumber + 1)
-    }
-  }
-
-  useEffect(() => { // 下拉刷新触发
-    if (IsPull) {
-      if (pageNumber === 1) {
-        GetPageList()
-      } else {
-        setPageNumber(1)
-      }
-    }
-  }, [IsPull])
-
   const PickerChange = (e) => {
     setCurrentBuildingId(BuildingIds[e.detail.value - 0].buildingId)
     setCurrentBuildingName(BuildingIds[e.detail.value - 0].name)
   }
 
   const SearchConfirm = (e) => {
-    setFilterData({ ...FilterData, keywords: e.detail.value })
+    queryParamsRef.current = {
+      ...queryParamsRef.current,
+      keywords: e.detail.value,
+    }
+    setPage({ pageNumber: 1 })
   }
 
   const ListChange = (index) => {
@@ -136,6 +71,42 @@ export default withLayout(() => {
     }
   }
 
+  // 页面上拉加载更多
+  const PageLoadMore = () => {
+    if (HasNextPage) {
+      setPage({ pageNumber: page.pageNumber + 1 })
+    }
+  }
+  
+  useEffect(() => {
+    GetMyBuildingIds()
+  }, [])
+
+  useEffect(() => {
+    if (BuildingIds.length) {
+      setCurrentBuildingId(BuildingIds[0].buildingId)
+      setCurrentBuildingName(BuildingIds[0].name)
+    }
+  }, [BuildingIds])
+
+  // 选择楼盘
+  useEffect(() => {
+    if (CurrentBuildingId) {
+      setPage({ pageNumber: 1 })
+    }
+  }, [CurrentBuildingId])
+
+  // 下拉刷新
+  useEffect(() => {
+    if (IsPull) {
+      setPage({ pageNumber: 1 })
+    }
+  }, [IsPull])
+
+  useEffect(() => {
+    getListRef.current(page)
+  }, [page])
+
   return (
     <view className='Page residentManager flex-v'>