。

src/hotel/components/HouseManage/houseManage.jsx

@@ -1,5 +1,5 @@
 import Taro, { useDidShow } from '@tarojs/taro'
-import { View, Image} from '@tarojs/components';
+import { View, Image } from '@tarojs/components';
 import see from '@/assets/icons/landlord/lookPerson.png'
 import share from '@/assets/icons/landlord/shareLink.png'
 import del from '@/assets/icons/landlord/delete.png'
@@ -9,6 +9,8 @@ import React, { useState, useEffect, useRef, useImperativeHandle, useMemo } from
 import { getRoomList, saveRoom, deleteRoom } from '@/services/landlord'
 import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
 import ToggleRole from '@/components/toggleRole/ToggleRole'
+import SpinBox from "@/components/Spin/SpinBox";
+import NoData from '@/components/NoData'
 import List from '@/components/List';
 import Picker from '@/components/Picker'
 import SearchBar from '@/components/SearchBar'
@@ -21,8 +23,11 @@ export default React.forwardRef((props, ref) => {
   const { hotel, hotelList, onHotelChange } = props
   const [detail, setDetail] = useState([])
 
-  const fetchAPI = useMemo(() => hotel.hotelId ? () => getRoomList({ hotelId: hotel.hotelId }) : undefined, [hotel?.hotelId])
-  const queryParams = useMemo(() => ({}), [])
+  // const fetchAPI = useMemo(() => hotel.hotelId ? () => getRoomList({ hotelId: hotel.hotelId }) : undefined, [hotel?.hotelId])
+  // const queryParams = useMemo(() => ({}), [])
+  const [queryParams, setQueryParams] = useState({ hotelId: hotel.hotelId, pageNum: 1, pageSize: 10})
+
+  const [loading, setLoading] = useState(false)
 
   const shareDataRef = useRef()
 
@@ -128,12 +133,16 @@ export default React.forwardRef((props, ref) => {
     }
   }
   const handelCopy = (e, val) => {
+    setLoading(true)
     //阻止冒泡不允许执行父元素的点击事件
     e.stopPropagation()
-    saveRoom({ ...val, roomId: null, roomName: val.roomName + '复制' }).then(() => {
+    saveRoom({ ...val, roomId: null, roomName: val.roomName + '复制', createDate: null }).then((res) => {
+      // setDetail(...detail,res)
+      // detail.push(res)
       getRoomList({ hotelId: hotel.hotelId }).then((res) => {
         setDetail(res.records || [])
       })
+      setLoading(false)
     })
   }
   const [showCutover3, setShowCutover3] = useState(false)
@@ -144,45 +153,57 @@ export default React.forwardRef((props, ref) => {
     setShowCutover3(false)
   }
   return (
-    <view>
-      <view style={{ padding: '0 30rpx', height: '100%' }}>
+    <View style={{ display: 'flex', flexDirection: 'column', overflow: 'hidden', boxSizing: 'border-box',height:'100%' }}>
       <ToggleRole role='hotel' showCutover={showCutover3} maskClosable={showCutover3} onClose={onClose3} />
-
-        <View>
+      <View style={{ flex: 'none' }}>
         <view className='storeName'>店名：<Picker style={{ display: 'inline-block' }} placeholder="请选择民宿" value={hotel?.hotelId} kv={['hotelName', 'hotelId']} dicts={hotelList} onChange={handleHotelChange} /></view>
         <view onClick={ShowMoldeOn3} className='User-info-cutover'>
-            <image className='User-info-cutover-image' src={cutoverUser} />
-          </view>
-        </View>
+          <image className='User-info-cutover-image' src={cutoverUser} />
+        </view>
+      </View>
+      <View style={{ flex: 'none' }}>
         <SearchBar placeholder='请输入房源名搜索' onBlur={onSearch} />
-        <ShareRoom showCutover={showCutover} onClose={onClose} room={room} onFinish={handleFinish} />
-        <ShareCard showCutover={showCard} onClose={onClose2} />
+      </View>
+      <ShareRoom showCutover={showCutover} onClose={onClose} room={room} onFinish={handleFinish} />
+      <ShareCard showCutover={showCard} onClose={onClose2} />
+      <SpinBox loading={loading} style={{ padding: '0 30rpx', flex: 'auto' }}>
         <List
-          style={{ height: 'calc(100vh - 244px)' }}
-          request={fetchAPI}
+          // style={{ height: 'calc(100vh - 280px)' }}
+          // request={fetchAPI}
+          // params={queryParams}
+          // onDataChange={setDetail}
+          // noData="暂无房源信息"
+
+          style={{ height: '100%' }}
+          // style={{ height: 'calc(100% - 280px)' }}
+          request={getRoomList}
           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 || ''}<Image src={copyRoom} onClick={(e) => handelCopy(e, item)} /></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>
+          {
+            detail.length == 0 ?
+              <NoData /> :
+              <view className='waterfall'>
+                {
+
+                  detail.map((item, index) =>
+                    <view className='houseCard' key={index}>
+                      <View className='houseName' onClick={() => handelDetail(item)}>{item.roomName || ''}<Image src={copyRoom} onClick={(e) => handelCopy(e, item)} /></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}>
+      </SpinBox>
+      <view className='addHouse' style={{ flex: 'none' }} onClick={handelClick}>
         <image className='addImg' src={addImg} />添加房源
       </view>
 
-    </view>
+    </View>
   )
 })

src/hotel/components/HouseManage/houseManage.less

@@ -51,8 +51,7 @@
   }
 }
 .addHouse{
-  width: calc(100% - 60px);
-  margin: 0 30px;
+  margin: 0 30px 50px;
   height: 88px;
   background: #274291;
   border-radius: 12px;
@@ -60,9 +59,7 @@
   color: #FFFFFF;
   text-align: center;
   line-height: 88px;
-  position: absolute;
   letter-spacing: 5px;
-  bottom: 18px;
   image{
     width: 32px;
     height: 32px;

src/hotel/pages/landlord/addRoom/addRoom.jsx

@@ -1,7 +1,7 @@
 import withLayout from '@/layouts'
 import Taro from '@tarojs/taro'
 import CustomNav from '@/components/CustomNav'
-import { View, Input, Button, Label, Textarea, Text,Image } from '@tarojs/components';
+import { View, Input, Button, Label, Textarea, Text, Image } from '@tarojs/components';
 import { useEffect, useState } from "react"
 import { saveRoom, getRoomDetail, updateRoom } from '@/services/landlord'
 import GPS from '@/assets/icons/GuideCheck/GPS.png'
@@ -26,19 +26,19 @@ export default withLayout((props) => {
     wifiName: '',
     wifiPassword: '',
     weight: '',
+    locName: '',
+    pkLocName: ''
   })
   const [paddress, setpAddress] = useState()
   const [wifiName, setwifiName] = useState()
   const onRoomMap = () => {
     Taro.chooseLocation().then((res) => {
-      setRoomModel({ ...roomModel, location: res.longitude + ',' + res.latitude })
-
+      setRoomModel({ ...roomModel, location: res.longitude + ',' + res.latitude,locName: res.name })
     })
   }
   const onParkMap = () => {
     Taro.chooseLocation().then((res) => {
-      setRoomModel({ ...roomModel, parkingLocation: res.longitude + ',' + res.latitude })
-
+      setRoomModel({ ...roomModel, parkingLocation: res.longitude + ',' + res.latitude, pkLocName: res.name  })
     })
   }
   const sumbit = () => {
@@ -190,9 +190,10 @@ export default withLayout((props) => {
             <mp-cells title='房屋位置'>
               <mp-cell>
                 <View className='roomloc'>
-                <Input style={{ color: '#000', fontWeight: 'bold'}} onInput={(e) => setRoomModel({ ...roomModel, address: e.detail.value })} value={roomModel.address} placeholder='请输入房屋位置（必填）' />
-                <Label style={{display:'none' }} onClick={onRoomMap}>{isError(roomModel.location) ? '房间定位（必填）' : roomModel.location}</Label>
-                <Image className='location' src={GPS} onClick={onRoomMap} />
+                  <Label style={{ color: '#666', lineHeight: '30px' }} onClick={onRoomMap} >{roomModel.locName || '请选择定位'}</Label>
+                  <Textarea style={{height:'60px',width:'100%'}} onInput={(e) => setRoomModel({ ...roomModel, address: e.detail.value })} value={roomModel.address} placeholder='请输入房屋位置（必填）' />
+                  <Label style={{ display: 'none' }} >{isError(roomModel.location) ? '房间定位（必填）' : roomModel.location}</Label>
+                  <Image className='location' src={GPS} onClick={onRoomMap} />
                 </View>
               </mp-cell>
             </mp-cells>
@@ -200,10 +201,11 @@ export default withLayout((props) => {
               paddress != '' ?
                 <mp-cells title='停车场位置'>
                   <mp-cell>
-                  <View className='roomloc'>
-                    <Input onInput={(e) => setRoomModel({ ...roomModel, parkingAddress: e.detail.value })} value={roomModel.parkingAddress} placeholder='请输入停车场位置' />
-                    <Label style={{ color: '#666', lineHeight: '30px',display:'none' }} onClick={onParkMap}>{isError(roomModel.parkingLocation) ? '停车场定位' : roomModel.parkingLocation}</Label>
-                    <Image className='location' src={GPS} onClick={onParkMap} />
+                    <View className='roomloc'>
+                      <Label style={{ color: '#666', lineHeight: '30px' }} onClick={onParkMap}>{roomModel.pkLocName || '请选择定位'}</Label>
+                      <Textarea  style={{height:'60px',width:'100%'}} onInput={(e) => setRoomModel({ ...roomModel, parkingAddress: e.detail.value })} value={roomModel.parkingAddress} placeholder='请输入停车场位置' />
+                      <Label style={{display: 'none' }}>{isError(roomModel.parkingLocation) ? '停车场定位' : roomModel.parkingLocation}</Label>
+                      <Image className='location' src={GPS} onClick={onParkMap} />
                     </View>
                   </mp-cell>
                 </mp-cells> : null

src/hotel/pages/landlord/landlord.jsx

@@ -68,8 +68,6 @@ export default withLayout((props) => {
         {currentTab === 1 && <Income hotel={hotel} account={account} />}
         {hotel?.hotelId ? currentTab === 0 && <HouseManage hotelList={hotelList} hotel={hotel} onHotelChange={handleHotelChange} ref={houseRef} disabled={!hotel.hotelId} /> : <NoData />}
       </view>
-      <view className='index-tabbar'>
-      </view>
       <view className='index-tabbar'>
         <mp-tabbar extClass='custom-tabbar' current={currentTab} list={tabList} onChange={handleTabChange}></mp-tabbar>
       </view>

src/pages/MineUserAll/ContactMe/index.jsx

@@ -29,12 +29,12 @@ export default withLayout((props) => {
           duration: 1500
         }).then(
           setTimeout(() => {
-          Taro.navigateBack({
-            delta: 1
-          })
-          setLoading(false)
-        },1500)
-          )
+            Taro.navigateBack({
+              delta: 1
+            })
+            setLoading(false)
+          }, 1500)
+        )
       })
     }
     else {

src/pages/index/tabs/Guide.jsx

@@ -87,31 +87,21 @@ export default (props) => {
         setAllextNum(res.total)
         setNewextNum(res.records.length)
       })
-      // getRecommendList({ location: RoomLocation }).then((res) => {
-      //   setPackage(res || [])
-      // })
       getRecommendList({ location: location }).then((res) => {
         setPackage(res || [])
       })
-
     } else {
       getRecommendList({ location: location }).then((res) => {
         setPackage(res || [])
       })
-
       return
     }
-    // extend?.records === []
-
-
     if (taRoomContent?.wifiPassword === "") {
       setWifiButtonStyle('none')
     }
     if (taRoomContent?.parkingAddress === "") {
       setParkingButtonStyle('none')
     }
-
-
   }, [roomId, RoomLocation, taRoomContent?.wifiPassword, taRoomContent?.parkingAddress, location])
 
 
@@ -158,8 +148,6 @@ export default (props) => {
     <scroll-view scrollY style='height:100%;'  >
 
       <view className='Guide-Home-box'>
-
-
         {
           ifroomId === 'havenot' && (
             <view className='Guide-image-text-box'>