。

src/hotel/components/HouseManage/houseManage.jsx

@@ -3,8 +3,9 @@ import see from '@/assets/icons/landlord/查看入住人.png'
 import share from '@/assets/icons/landlord/分享链接.png'
 import del from '@/assets/icons/landlord/删除.png'
 import addImg from '@/assets/icons/landlord/添加.png'
-import React, { useState, useEffect, useRef, useImperativeHandle } from 'react'
+import React, { useState, useEffect, useRef, useImperativeHandle,useMemo } from 'react'
 import { getRoomList, deleteRoom } from '@/services/landlord'
+import List from '@/components/List';
 import SearchBar from '@/components/SearchBar'
 import ShareRoom from '../shareRoom/ShareRoom.jsx'
 import ShareCard from '../shareCard/shareCard'
@@ -15,6 +16,9 @@ export default React.forwardRef((props, ref) => {
   const { hotel } = props
   const [detail, setDetail] = useState([])
 
+  const fetchAPI = useMemo(() => hotel.hotelId?()=>getRoomList({hotelId: hotel.hotelId}):undefined, [hotel?.hotelId])
+  const queryParams = useMemo(() => ({}), [])
+
   const shareDataRef = useRef()
 
   // 判断是否首次加载
@@ -118,20 +122,27 @@ export default React.forwardRef((props, ref) => {
         <SearchBar placeholder='请输入房源名搜索' onBlur={onSearch} />
         <ShareRoom showCutover={showCutover} onClose={onClose} room={room} onFinish={handleFinish} />
         <ShareCard showCutover={showCard} onClose={onClose2} />
-        <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" style={{ height: 'calc(100vh - 244px)' }}>
-          {
-            (detail || []).map((item) =>
-              <view className='houseCard'>
-                <view className='houseName' onClick={() => { handelDetail(item) }} >{item.roomName || ''}</view>
-                <view className='operation'>
-                  <view onClick={() => handelOrder(item)}><image src={see} />查看入住人</view>
-                  <view onClick={() => ShowMoldeOn(item)}><image src={share} />分享链接</view>
-                  <view onClick={() => handelDelete(item)}><image src={del} />删除房源</view>
-                </view>
-              </view>
-            )
-          }
-        </scroll-view>
+        <List
+          style={{ height: 'calc(100vh - 244px)' }}
+          request={fetchAPI}
+          params={queryParams}
+          onDataChange={setDetail}
+          noData="暂无房源信息"
+        >
+          <view className='waterfall'>
+            {
+              detail.map((item, index) =>
+                <view className='houseCard' key={index}>
+                  <view className='houseName' onClick={() => { handelDetail(item) }} >{item.roomName || ''}</view>
+                  <view className='operation'>
+                    <view onClick={() => handelOrder(item)}><image src={see} />查看入住人</view>
+                    <view onClick={() => ShowMoldeOn(item)}><image src={share} />分享链接</view>
+                    <view onClick={() => handelDelete(item)}><image src={del} />删除房源</view>
+                  </view>
+                </view>)
+            }
+          </view>
+        </List>
       </view>
       <view className='addHouse' onClick={handelClick}>
         <image className='addImg' src={addImg} />添加房源

src/hotel/components/Income/income.jsx

@@ -71,7 +71,7 @@ export default (props) => {
         <view className='title' >推广收入记录</view>
 
         <List
-          style={{ height: '50vh' }}
+          style={{ height: 'calc(100vh - 390px)' }}
           request={fetchAPI}
           params={queryParams}
           noData={<view className='title' >暂无</view>}