.

src/pages/RoomOrder/components/RoomForm/index.jsx

@@ -1,5 +1,4 @@
 import { useState, useEffect } from 'react'
-import Taro, { useShareTimeline } from '@tarojs/taro'
 import { View, Input } from '@tarojs/components'
 import './style.less'
 
@@ -27,9 +26,7 @@ export default (props) => {
 
 
   return (
-
     <View className='from-room'  >
-
       <mp-form >
         <mp-cells title='入住人信息填写' footer='  '>
           <mp-cell prop='customerName' title='姓名：' extClass=''>
@@ -41,6 +38,5 @@ export default (props) => {
         </mp-cells>
       </mp-form>
     </View>
-
   )
 }

src/pages/RoomOrder/index.jsx

@@ -4,7 +4,7 @@ import CustomNav from '@/components/CustomNav'
 import withLayout from '@/layouts'
 import { getTaRoom, goToRoomForm, personSubmit } from '@/services/taRoom​'
 import { getHotelDetail } from '@/services/landlord'
-
+import { View } from '@tarojs/components';
 import { withSubscribeMessage } from "@/utils/subscribeMessage"
 import { TPL_MESSAGE_HOTEL_CHECK_OUT } from '@/utils/constants'
 import RoomForm from './components/RoomForm'
@@ -67,24 +67,22 @@ export default withLayout((props) => {
 
   const FormCard = new Array(CarNumber).fill(0)
   return (
-    <view className='scroll-www'>
-
-      <CustomNav logo={titleLogo} title={taRoomContent?.roomName} />
-
-      <scroll-view scroll-y style='height: calc(100vh - 176rpx);' >
-
-        {
-          FormCard.map((_, index) => {
-            return (
-
-              <RoomForm key={(index)} onChange={(e) => handleChange(e, index)} />
-            )
-          })
-        }
-        <button className='button-OK' onClick={handleSubmit} >确定</button>
-      </scroll-view>
-
+    <view className='page-index'>
+      <view className='index-navbar'>
+        <CustomNav logo={titleLogo} title={taRoomContent?.roomName} />
+      </view>
+      <View className='index-container'>
+        <scroll-view scroll-y style='height: 100%;' >
+          {
+            FormCard.map((_, index) => {
+              return (
+                <RoomForm key={(index)} onChange={(e) => handleChange(e, index)} />
+              )
+            })
+          }
+          <button className='button-OK' onClick={handleSubmit} >确定</button>
+        </scroll-view>
+      </View>
     </view>
-
   )
 })

src/pages/RoomOrder/style.less

@@ -8,5 +8,5 @@ button {
   font-size: 40px;
   color: #ffffff;
   margin-top: 2em;
-  margin-bottom: 4em;
+  margin-bottom: 2em;
 }

src/pages/index/tabs/Recommend.jsx

@@ -1,12 +1,10 @@
-import Taro, { useDidShow } from '@tarojs/taro'
+import Taro 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 MasonryLayout from '@/components/MasonryLayout';
-import Waterfall from '@/components/MasonryLayout/Waterfall';
 import { getIndexType, getResourceList } from '@/services/home'
 import { random } from '@/utils'
 import Card from '../components/Card'

src/pages/searchResult/searchResult.jsx

@@ -3,6 +3,7 @@ import { React, useState, useRef } from 'react'
 import iconsearch from '../../assets/icons/housemantj/search.png'
 import CustomNav from '@/components/CustomNav'
 import Taro from '@tarojs/taro'
+import { View } from '@tarojs/components';
 import Card from '../index/components/Card'
 import { getResourceList } from '@/services/home'
 import NoData from '@/components/NoData'
@@ -68,12 +69,13 @@ export default withLayout((props) => {
       <view className='index-navbar'>
         <CustomNav title='搜索' />
       </view>
-      <view className='index-container'>
+      <view className='index-container' style={{display:'flex',flexDirection:'column'}}>
         <view className='search'>
           <input className='searchInput' placeholder='搜索景点/店铺' disabled onClick={onSearch} />
           <image className='searchicon' src={iconsearch} />
           <view className='lineSearch'></view>
-        </view><view className='index-tabs'>
+        </view>
+        <view className='index-tabs'>
           <mp-tabs
             tabClass='tabs-Unselected'
             swiperClass='tabs-swiper'
@@ -85,24 +87,25 @@ export default withLayout((props) => {
           >
           </mp-tabs>
         </view>
+        <View style={{flex:'auto',overflow:'hidden',position:'relative'}}>
         <List
-          style={{ height: 'calc(100% - 90px)' }}
+          style={{ height: '100%' }}
           request={getResourceList}
           params={queryParams}
           onDataChange={setAllList}
           refresherEnabled={false}
-
         >
           {
             alllist.length == 0 ?
               <NoData /> :
               <view className='waterfall'>
                 {
-                  alllist.map((item) => <Card key={item.resourceNo} item={item} />)
+                  alllist.map((item) => <Card key={item.resourceNo} item={item} onImageLoad='' />)
                 }
               </view>
           }
         </List>
+        </View>
       </view>
     </view>
   )

src/pages/searchResult/searchResult.less

@@ -1,6 +1,7 @@
 .search{
     padding: 10px 30px 0 30px;
     position: relative;
+    flex: none;
     .searchInput{    
         height: 68px;
         background: #F8F8F8;
@@ -42,6 +43,7 @@
 } 
 .index-tabs {
   position: relative;  
+  flex: none;
   .tabs-Unselected {
     width: 25vw;      
     font-weight: bold;