Merge branch 'dev' of http://git.ycjcjy.com/shigongli/miniapp-v2 into dev

src/hotel/components/HouseManage/houseManage.jsx

@@ -150,25 +150,26 @@ export default React.forwardRef((props, ref) => {
     setShowCutover3(false)
   }
   return (
-    <view>
-      <view style={{ padding: '0 30rpx', height: '100%' }}>
-        <ToggleRole role='hotel' showCutover={showCutover3} maskClosable={showCutover3} onClose={onClose3} />
-        <View>
-          <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>
+    <View style={{ padding: '0 30rpx', height: '100%', display: 'flex', flexDirection: 'column' }}>
+      <ToggleRole role='hotel' showCutover={showCutover3} maskClosable={showCutover3} onClose={onClose3} />
+      <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>
+      <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} />
+      <View style={{ flex: 'auto', overflow: 'hidden', position: 'relative' }}>
         <List
-          style={{ height: 'calc(100vh - 290px)' }}
+          style={{ height: '100%' }}
           request={getRoomList}
           params={queryParams}
           onDataChange={setDetail}
           refresherEnabled={false}
-
           noData="暂无房源信息"
         >
           <view className='waterfall'>
@@ -185,11 +186,10 @@ export default React.forwardRef((props, ref) => {
             }
           </view>
         </List>
-      </view>
-      <view className='addHouse' onClick={handelClick}>
-        <image className='addImg' src={addImg} />添加房源
-      </view>
-
-    </view>
+      </View>
+      <View className='addHouse' onClick={handelClick} style={{ flex: 'none' }}>
+        <Image className='addImg' src={addImg} />添加房源
+      </View>
+    </View>
   )
-})
+})

src/hotel/components/HouseManage/houseManage.less

@@ -51,7 +51,7 @@
   }
 }
 .addHouse{
-  margin: 0 30px 50px;
+  margin-bottom:50px;
   height: 88px;
   background: #274291;
   border-radius: 12px;

src/hotel/pages/components/Extend/style.less

@@ -50,19 +50,6 @@
     text-align: justify;
     white-space: pre-wrap;
   }
-  // .weui-slideview__btn__wrp{
-  //   background: #FFFFFF;
-  //   box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
-  //   border-radius: 12px;
-  //   margin: 5px 5px 5px 20px;
-  //   height: 97%;
-  //   width: 67px;
-  // }
-  // .weui-slideview__btn{
-  //   width: 44px;
-  //   height: 44px;
-  //   line-height: 44px;
-  // }
   Textarea{
     height: 300px;
     width: 100%;

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

@@ -32,23 +32,12 @@ export default withLayout((props) => {
   const [paddress, setpAddress] = useState()
   const [wifiName, setwifiName] = useState()
 
-  const tipsMap = () => {
-    Taro.showToast({
-      title: '位置信息添加成功',
-      icon: 'success',
-      duration: 2000
-    })
-  }
-
-
   const onRoomMap = () => {
     Taro.chooseLocation().then((res) => {
       setRoomModel({ ...roomModel, location: res.longitude + ',' + res.latitude, locName: res.name })
     })
   }
-
-
-
+  
   const onParkMap = () => {
     Taro.chooseLocation().then((res) => {
       setRoomModel({ ...roomModel, parkingLocation: res.longitude + ',' + res.latitude, pkLocName: res.name })