fix

src/layout/index.jsx

@@ -2,17 +2,17 @@ import React from 'react';
 import Taro from '@tarojs/taro'
 import { View, ScrollView } from '@tarojs/components'
 
-const Layout = ({ children,type }) => {
+const Layout = ({ children,type,otherHeight }) => {
 
   const navStyle =  Taro.getMenuButtonBoundingClientRect()
 
-    return <ScrollView className='scrol' scrollY  style={type=='custom'?{height:`calc(100vh - 65px - ${navStyle.bottom}px - 10px)`}:undefined} >
+    return <ScrollView className='scrol' scrollY  style={type=='custom'?{height:`calc(100vh - 65px - ${navStyle.bottom}px - 10px - ${otherHeight||0}px)`}:undefined} >
         <View className='page-container' >
             {children}
         </View>
         {/* <View style={{height:'10rpx'}}></View> */}
     </ScrollView>
 }
-
+// - 8px
 
 export default Layout;

src/pages/house/list/index.jsx

@@ -3,27 +3,30 @@ import React, {
   useMemo,
   useState,
   forwardRef,
-  useImperativeHandle,
-  useCallback
+  useImperativeHandle
 } from "react";
 import Taro, { useDidShow } from "@tarojs/taro";
-import { useSelector } from 'react-redux'
+import { useSelector } from "react-redux";
 // import debounce from 'lodash.debounce'
 import "./index.scss";
-import { View, Text, Input, Image } from "@tarojs/components";
+import { View, Image } from "@tarojs/components";
 import ContainerLayout from "../../../compents/container/index";
 import radio from "../../../assets/radio.png";
 import request from "@/util/request";
 import RecycleList from "@/compents/RecycleList";
 
-let house = (props, ref) => {
-  const user = useSelector(state => state.user)
-  const defaultShop = user.defaultShop
+const house = (props, ref) => {
+  const user = useSelector(state => state.user);
+  const defaultShop = user.defaultShop;
   const [list, setList] = useState([]);
   const [radioHouse, setRadioHouse] = useState();
   const [width, setWidth] = useState();
   const [height, setHeight] = useState();
-  const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 10, shopId: defaultShop });
+  const [queryParams, setQueryParams] = useState({
+    pageNum: 1,
+    pageSize: 10,
+    shopId: defaultShop
+  });
   const [total, setTotal] = useState(0);
 
   useImperativeHandle(ref, () => ({
@@ -36,12 +39,15 @@ let house = (props, ref) => {
   const radioHouseState = useMemo(() => props.radioHouseState, [
     props.radioHouseState
   ]);
-  
 
   const getHouseList = () => {
-    if (!queryParams.shopId) return
-    
+    if (!queryParams.shopId) return;
+
     // console.log('---------->>>>', queryParams.shopId, queryParams.pageNum)
+    Taro.showLoading({
+      title: "加载中 ...",
+      mask: true
+    });
 
     request({
       url: "/taHouse",
@@ -60,36 +66,39 @@ let house = (props, ref) => {
         setList(records);
       }
       setTotal(page.total);
+      Taro.hideLoading();
     });
   };
 
-  const handleScrollBottom = e => {
+  const handleScrollBottom = () => {
     setQueryParams({
       ...queryParams,
       pageNum: queryParams.pageNum + 1
     });
-  }
+  };
 
   const onShare = x => {
-    Taro.navigateTo({ url: `/pages/share/index?houseId=${x.houseId}&&title=${x.title}` });
+    Taro.navigateTo({
+      url: `/pages/share/index?houseId=${x.houseId}&&title=${x.title}`
+    });
   };
 
   const handleDelete = x => {
     Taro.showModal({
-      title: '删除',
-      content: '确认删除当前房源?',
+      title: "删除",
+      content: "确认删除当前房源?",
       success: res => {
         if (res.confirm) {
           request({
             url: `/taHouse/${x.houseId}`,
-            method: 'DELETE'
-          }).then(res => {
-            setList(list.filter(t => t.houseId != x.houseId))
+            method: "DELETE"
+          }).then(() => {
+            setList(list.filter(t => t.houseId != x.houseId));
           });
         }
       }
-    })
-  }
+    });
+  };
 
   useEffect(() => {
     wx.setNavigationBarTitle({
@@ -116,11 +125,12 @@ let house = (props, ref) => {
               if (item.height) {
                 found = true;
 
-                let h = Taro.getSystemInfoSync().safeArea.height - item.height - 50
+                let h =
+                  Taro.getSystemInfoSync().safeArea.height - item.height - 50;
 
                 // 如果显示了下拉框，要去掉下拉框的高度
                 if (user.shopList && user.shopList.length > 1) {
-                  h -= 64
+                  h -= 64;
                 }
 
                 setHeight(h);
@@ -153,13 +163,13 @@ let house = (props, ref) => {
   }, [queryParams]);
 
   useEffect(() => {
-      setQueryParams({ ...queryParams, shopId: defaultShop, pageNum: 1 })
-  }, [defaultShop])
+    setQueryParams({ ...queryParams, shopId: defaultShop, pageNum: 1 });
+  }, [defaultShop]);
 
   // useDidShow(() => {
   //   setQueryParams({ ...queryParams })
   // })
- 
+
   return (
     <View className="houselist">
       {(!list || !list.length) && <View className="nodata"> 暂无数据</View>}
@@ -220,12 +230,11 @@ let house = (props, ref) => {
                 </View>
               </View>
             </ContainerLayout>
-          </View>        
+          </View>
         )}
       />
     </View>
   );
 };
 
-house = forwardRef(house);
-export default house;
+export default forwardRef(house);

src/pages/landlord/index.jsx

@@ -121,7 +121,7 @@ const index = (props) => {
         )
       }
 
-      <Layout type='custom'>
+      <Layout type='custom' otherHeight={shopList.length > 1 ? 8+58.42 : 0}>
         {pageState == '1' && <HouseLIst ref={childRef} radioHouseState={radioHouseState} onChange={(e) => setRadioHouseData(e)}></HouseLIst>}
       </Layout>
       {!isOpened && <Tab className='addhousetab' value={['+添加房源']} onClick={(e) => setIsOpened(true)}></Tab>}