feats

src/compents/InifiniteList/index.jsx

@@ -24,7 +24,7 @@ export default props => {
   )
 
   return (
-    <div className="inifinite-list-wrapper" style={{maxHeight: props.height}} onScroll={handleScroll}>
+    <div className="inifinite-list-wrapper" style={{height: props.height}} onScroll={handleScroll}>
       {
         !props.length ? NoData :
         <ReactList

src/compents/tab/index.jsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react'
+import React, { useEffect, useRef, useState } from 'react'
 import Taro from "@tarojs/taro";
 import { Button, View } from '@tarojs/components'
 
@@ -14,20 +14,16 @@ import './index.scss'
 // }
 
 
-const tab = (props) => {
+const tab = React.forwardRef((props, ref) => {
     // formType="submit"
-
     const { value, pageState, formType, color, ...prop } = props
 
     const [state, setState] = useState(1)
-    // console.log(props)
-    useEffect(() => {
-
-    }, [])
+   
     //  &-on{
     //     color: #fed12f; style={{ backgroundColor:'#274291' ,color}}
     // }${props.className}
-    return <View className='tab'>
+    return <View className='tab' ref={ref}>
         {value.length == 1 && <View className={`tab tab1 ${props.className}`} onClick={() => props.onClick('2')}>{value[0]}
         </View>}
         {value.length == 2 && <View className={`tab tab2 ${props.className}`} style={{ display: 'flex', }}>
@@ -37,6 +33,6 @@ const tab = (props) => {
             :<Button className='tab-btn' formType={formType} plain={true} style={{ width: '50%' }} style={pageState == '3' ? { color: '#274291', width: '50%',border:'none' } : { width: '50%',border:'none' }} onClick={props.onClick[1]}>{value[1]}</Button>}
         </View>}
     </View>
-};
+})
 
 export default tab

src/pages/account/index.jsx

@@ -12,9 +12,11 @@ import InifiniteList from "@/compents/InifiniteList";
 import IsLogin from "../../layout/IsLogin";
 
 const account = props => {
+  const tabRef = useRef()
   const { id } = getQueryValue();
   const [list, setList] = useState([]);
   const [page, setPage] = useState({ total: 0, pageNum: 0 });
+  const [listHeight, setListHeight] = useState('600')
 
   useDidShow(() => {
     console.log("useDidShow");
@@ -28,7 +30,8 @@ const account = props => {
       method: "get"
     }).then(res => {
       const { records, ...page } = res.data.data;
-      setList(list.concat(records || []));
+      const newList = records || []
+      setList(page.current === 1 ? newList : list.concat(newList))
       setPage({
         ...page,
         pageNum: page.current
@@ -61,6 +64,13 @@ const account = props => {
     getShopKepperList({ pageNum: page.pageNum + 1 });
   };
 
+  useEffect(() => {
+    if (tabRef.current) {
+      const h = `calc(100vh - 10px - ${tabRef.current.offsetHeight}px)`
+      setListHeight(h)
+    }
+  }, [tabRef.current])
+
   const renderItem = (index, key) => (
     <View className="account-view" key={key}>
       {/* <Text className='account-view-title'>房源编号：<Text style={{fontSize:"1rem"}}>{item.keeperId}</Text></Text> */}
@@ -99,7 +109,7 @@ const account = props => {
             <InifiniteList
               length={list.length}
               total={page.total}
-              height={600}
+              height={listHeight}
               itemRenderer={renderItem}
               loadMore={loadMore}
             />
@@ -107,6 +117,7 @@ const account = props => {
         </Layout>
         {/* onClick={(e)=>(e) */}
         <Tab
+          ref={tabRef}
           value={["+新增民宿老板账号"]}
           color="#ffffff"
           onClick={() => {