.

src/hotel/components/HouseManage/houseManage.jsx

@@ -6,7 +6,7 @@ import del from '@/assets/icons/landlord/delete.png'
 import addImg from '@/assets/icons/landlord/add.png'
 import copyRoom from '@/assets/icons/landlord/copyroom.png'
 import React, { useState, useEffect, useRef, useImperativeHandle, useMemo } from 'react'
-import { getRoomList, saveRoom, deleteRoom, saveExtend } from '@/services/landlord'
+import { getRoomList,getRoomDetail, saveRoom, deleteRoom, saveExtend } from '@/services/landlord'
 import { getExtendContent } from "@/services/home";
 import Spin3 from '@/components/Spin/Spin3';
 import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
@@ -139,6 +139,10 @@ export default React.forwardRef((props, ref) => {
   //本店指南
   const [loading, setLoading] = useState(false)
   const handelCopy = (e, val) => {
+    let del
+    getRoomDetail(val.roomId).then((res) => {
+      del=res
+    })
     //阻止冒泡不允许执行父元素的点击事件
     e.stopPropagation()
     setLoading(true)
@@ -149,7 +153,7 @@ export default React.forwardRef((props, ref) => {
       }
     })
     getExtendContent('room', val.roomId, { pageSize: 500 }).then((res2) => {
-      saveRoom({ ...val, roomId: null, roomName: val.roomName + '复制' }).then((res) => {
+      saveRoom({ ...del, roomId: null, roomName: val.roomName + '复制' }).then((res) => {
         res2.records.lenght != 0 ?
           //如果原房源有更多指引查出列表遍历每条拿出来放到新的房源的更多指引里
           res2.records.map((item) => {

src/pages/index/components/Card/index.jsx

@@ -27,14 +27,6 @@ export default (props) => {
       Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.targetId}` })
     }
   }
-
-  // const handleLoad = () => {
-  //   Taro.createSelectorQuery().select(`.${uqClass}`).boundingClientRect(rect => {
-  //     onImageLoad(rect)
-  //   }).exec()
-  // }
-
-
   return (
     <view className={uqClass} style={{ overflow: 'hidden' }}>
       <view className='contentCard' style={style}>

src/pages/index/tabs/Recommend.jsx

@@ -109,7 +109,7 @@ export default (props) => {
             <MasonryLayout
               itemKey='resourceNo'
               listData={listData}
-              render={(item) => <Card item={item} />}
+              render={(item) => <Card key={item.resourceNo} item={item} />}
             />
           </view>
         </List>

src/pages/searchResult/searchResult.jsx

@@ -6,23 +6,26 @@ import Taro from '@tarojs/taro'
 import { View } from '@tarojs/components';
 import Card from '../index/components/Card'
 import { getResourceList } from '@/services/home'
+import MasonryLayout from '@/components/MasonryLayout';
 import NoData from '@/components/NoData'
 import List from '@/components/List';
 import withLayout from '@/layouts'
 import './searchResult.less'
 
 
+const listStyle = { height: '100%' }
 
 export default withLayout((props) => {
   const { router, person, location } = props
   const { q } = props.router.params
 
+  const [listData, setListData] = useState({ list: [], rfTimes: 0 })
+
   // 横向tab
   const [activeTab, setActiveTab] = useState(0)
-  const [queryParams, setQueryParams] = useState({ q: q, location: location, pageNum: 1, pageSize: 10, typeId: '' })
+  const [queryParams, setQueryParams] = useState({ q: q, location, pageNum: 1, pageSize: 10, typeId: '' })
+  const rfTimes = useRef(0)
 
-  // 获取资源表信息
-  const [alllist, setAllList] = useState([])
   const tabs = [
     {
       title: '全部',
@@ -54,6 +57,17 @@ export default withLayout((props) => {
     }
   }
 
+  const handleDataChange = (value, e) => {
+    if (e.paramsChanged) {
+      rfTimes.current += 1
+      //如果context有的话代表他滚动了   那么切换tab页就置顶
+      if (listRef.current?.context) {
+        listRef.current.context.scrollTo({ top: 0 })
+      }
+    }
+    setListData({ list: value, rfTimes: rfTimes.current })
+  }
+
   const onSearch = () => {
     // 用绝对路径
     Taro.navigateTo({ url: '/pages/search/search' });
@@ -82,23 +96,23 @@ export default withLayout((props) => {
           >
           </mp-tabs>
         </view>
-        <View style={{ flex: 'auto', overflow: 'hidden', position: 'relative' }}>
+        <View style={{ flex:1, overflow: 'hidden'}}>
           <List
-            style={{ height: '100%' }}
+            ref={listRef}
+            style={listStyle}
             request={getResourceList}
             params={queryParams}
-            onDataChange={setAllList}
             refresherEnabled={false}
+            onDataChange={handleDataChange}
+            noData={<NoData />}
           >
-            {
-              alllist.length == 0 ?
-                <NoData /> :
-                <view className='waterfall'>
-                  {
-                    alllist.map((item) => <Card key={item.resourceNo} item={item} />)
-                  }
-                </view>
-            }
+            <view style={{ padding: '30rpx 15rpx' }}>
+              <MasonryLayout
+                itemKey='resourceNo'
+                listData={listData}
+                render={(item) => <Card key={item.resourceNo} item={item} />}
+              />
+            </view>
           </List>
         </View>
       </view>