flx

src/hotel/components/HouseManage/houseManage.jsx

@@ -137,7 +137,7 @@ export default React.forwardRef((props, ref) => {
     }
   }
   //本店指南
-  const [loading,setLoading]=useState(false)
+  const [loading, setLoading] = useState(false)
   const handelCopy = (e, val) => {
     //阻止冒泡不允许执行父元素的点击事件
     e.stopPropagation()
@@ -154,12 +154,12 @@ export default React.forwardRef((props, ref) => {
           //如果原房源有更多指引查出列表遍历每条拿出来放到新的房源的更多指引里
           res2.records.map((item) => {
             saveExtend({ ...item, targetId: res.roomId })
-          }) :null
-          setLoading(false)
-          Taro.showToast({
-            title: '复制房源成功',
-            icon: 'none',
-          })
+          }) : null
+        setLoading(false)
+        Taro.showToast({
+          title: '复制房源成功',
+          icon: 'none',
+        })
         setDetail([...detail.slice(0, copy), res, ...detail.slice(copy)])
       })
     })
@@ -174,8 +174,10 @@ export default React.forwardRef((props, ref) => {
   }
   return (
     <View style={{ padding: '0 30rpx', height: '100%', display: 'flex', flexDirection: 'column' }}>
-      <Spin3 show={loading} />
-      <ToggleRole role='hotel' showCutover={showCutover3} maskClosable={showCutover3} onClose={onClose3} />
+      <View style={{ flex: 'none' }}>
+        <Spin3 show={loading} />
+        <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'>
@@ -185,9 +187,11 @@ export default React.forwardRef((props, ref) => {
       <View style={{ flex: 'none' }}>
         <SearchBar placeholder='请输入房源名搜索' onBlur={onSearch} />
       </View>
-      <ShareRoom showCutover={showCutover} onClose={onClose} room={room} onFinish={handleFinish} />
-      <ShareCard showCutover={showCard} onClose={onClose2} />
-      <View style={{ flex: 'auto', overflow: 'hidden', position: 'relative' }}>
+      <View style={{ flex: 'none' }}>
+        <ShareRoom showCutover={showCutover} onClose={onClose} room={room} onFinish={handleFinish} />
+        <ShareCard showCutover={showCard} onClose={onClose2} />
+      </View>
+      <View style={{ flex: '1', overflow: 'hidden' }}>
         <List
           style={{ height: '100%' }}
           request={getRoomList}

src/hotel/components/Income/income.jsx

@@ -51,14 +51,13 @@ export default (props) => {
         </view>
       </view>
       <view className='title' style={{flex:'none'}}>推广收入记录</view>
-      <View style={{flex:'auto',overflow:'hidden',position:'relative'}}>
+      <View style={{flex:1,overflow:'hidden'}}>
         <List
           style={{ height: '100%' }}
           request={fetchAPI}
           params={queryParams}
           noData={<NoData />}
           refresherEnabled={false}
-
           render={({ item, index }) => (
             <view className='spreadCard' key={index}>
               <view className='card'>

src/hotel/pages/components/Extend/index.jsx

@@ -31,6 +31,7 @@ export default (props) => {
     setShowCutover(true)
   }
   const onClose = () => {
+    setContent2(content)
     setShowCutover(false)
     setReset(true)
   }
@@ -61,20 +62,18 @@ export default (props) => {
     newstr = newstr.substr(0, i + 1);
     return newstr;
   }
+  const [content2,setContent2]=useState(content)
   const handelEdit = () => {
-    // var content = document.getElementById('content').value
-
-    // content = content.replace(/\n/g, '');
-    // if (javaTrim(content) == '') {
-    //   Taro.showToast({
-    //     title: '您还没有添加文字哦',
-    //     icon: 'none'
-    //   })
-    //   return;
-    // }
-    // setContent(content)
+    if (javaTrim(content2) == '') {
+      Taro.showToast({
+        title: '您还没有添加文字哦',
+        icon: 'none'
+      })
+      return;
+    }
+    setContent(content2)
     const date = {
-      content,
+      content:content2,
       contentType: 'text'
     }
     update(item.extId, { ...item, ...date })
@@ -88,7 +87,7 @@ export default (props) => {
             <View className='rzline' /><Label className='srl mg'>修改文字</Label><View className='rzline' />
           </View>
           <View>
-            <Textarea className='storezn' value={content} id='content' onInput={e => setContent(e.detail.value)} />
+            <Textarea className='storezn' value={content2} onInput={e => setContent2(e.detail.value)} />
           </View>
           <View>
             <Button className='cancel' onClick={onClose}>取消</Button>

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

@@ -173,7 +173,7 @@ export default withLayout((props) => {
         <CustomNav title={hotelName} />
       </view>
       <view className='roomDetail' style={{ height: '100%', display: 'flex', flexDirection: 'column', overflow: 'hidden' }} >
-        <scroll-view scrollY style={{ height: '100%', position: 'relative', overflow: "hidden", flex: 'auto' }}>
+        <scroll-view scrollY style={{ height: '100%',  overflow: "hidden", flex:1 }}>
           <View id='det'>
             <Popup show={showCutover} onClose={onClose}>
               <View className='editword'>

src/pages/index/tabs/Recommend.jsx

@@ -1,9 +1,11 @@
-import Taro from '@tarojs/taro'
+import Taro, { useDidShow } from '@tarojs/taro'
 import { React, useState, useEffect, useRef, useMemo } from 'react'
 import iconsearch from '@/assets/icons/housemantj/search.png'
 import locationimg from '@/assets/icons/housemantj/location.png'
 import Tip from '@/components/tip'
 import List from '@/components/List';
+import NoData from '@/components/NoData'
+import Waterfall from '@/components/MasonryLayout/Waterfall';
 import MasonryLayout from '@/components/MasonryLayout';
 import { getIndexType, getResourceList } from '@/services/home'
 import { random } from '@/utils'
@@ -11,7 +13,7 @@ import Card from '../components/Card'
 import './less/Recommend.less'
 import { OfficialAccount } from '@tarojs/components'
 
-const listStyle = { height: 'calc(100% - 145px)' }
+const listStyle = { height: '100%' }
 
 export default (props) => {
   const { router, person, location } = props
@@ -76,7 +78,7 @@ export default (props) => {
   // })
 
   return (
-    <>
+    <view style={{ height: '100%', overflow: 'hidden', display: 'flex', flexDirection: 'column' }}>
       <OfficialAccount>s21</OfficialAccount>
       <view className='search' onClick={onSearch} >
         <input className='searchInput' disabled />
@@ -103,24 +105,24 @@ export default (props) => {
           </mp-tabs>
         </scroll-view>
       </view>
-
-      <List
-        ref={listRef}
-        style={listStyle}
-        request={getResourceList}
-        params={queryParams}
-        refresherEnabled={false}
-        onDataChange={handleDataChange}
-      >
-        <view style={{ padding: '30rpx 15rpx' }}>
-          <MasonryLayout
-            itemKey='resourceNo'
-            listData={listData}
-            render={(item) => <Card item={item} />}
-          />
-        </view>
-      </List>
-
-    </>
+      <view className={listClass} style={{ flex: '1', overflow: 'hidden' }}>
+        <List
+          ref={listRef}
+          style={listStyle}
+          request={getResourceList}
+          params={queryParams}
+          refresherEnabled={false}
+          onDataChange={handleDataChange}
+        >
+          <view style={{ padding: '30rpx 15rpx' }}>
+            <MasonryLayout
+              itemKey='resourceNo'
+              listData={listData}
+              render={(item, callback) => <Card item={item} onImageLoad={callback} />}
+            />
+          </view>
+        </List>
+      </view>
+    </view>
   )
 }