李志伟 3 gadus atpakaļ
vecāks
revīzija
e192d89dea

+ 0
- 4
src/pages/RoomOrder/components/RoomForm/index.jsx Parādīt failu

1
 import { useState, useEffect } from 'react'
1
 import { useState, useEffect } from 'react'
2
-import Taro, { useShareTimeline } from '@tarojs/taro'
3
 import { View, Input } from '@tarojs/components'
2
 import { View, Input } from '@tarojs/components'
4
 import './style.less'
3
 import './style.less'
5
 
4
 
27
 
26
 
28
 
27
 
29
   return (
28
   return (
30
-
31
     <View className='from-room'  >
29
     <View className='from-room'  >
32
-
33
       <mp-form >
30
       <mp-form >
34
         <mp-cells title='入住人信息填写' footer='  '>
31
         <mp-cells title='入住人信息填写' footer='  '>
35
           <mp-cell prop='customerName' title='姓名:' extClass=''>
32
           <mp-cell prop='customerName' title='姓名:' extClass=''>
41
         </mp-cells>
38
         </mp-cells>
42
       </mp-form>
39
       </mp-form>
43
     </View>
40
     </View>
44
-
45
   )
41
   )
46
 }
42
 }

+ 17
- 19
src/pages/RoomOrder/index.jsx Parādīt failu

4
 import withLayout from '@/layouts'
4
 import withLayout from '@/layouts'
5
 import { getTaRoom, goToRoomForm, personSubmit } from '@/services/taRoom​'
5
 import { getTaRoom, goToRoomForm, personSubmit } from '@/services/taRoom​'
6
 import { getHotelDetail } from '@/services/landlord'
6
 import { getHotelDetail } from '@/services/landlord'
7
-
7
+import { View } from '@tarojs/components';
8
 import { withSubscribeMessage } from "@/utils/subscribeMessage"
8
 import { withSubscribeMessage } from "@/utils/subscribeMessage"
9
 import { TPL_MESSAGE_HOTEL_CHECK_OUT } from '@/utils/constants'
9
 import { TPL_MESSAGE_HOTEL_CHECK_OUT } from '@/utils/constants'
10
 import RoomForm from './components/RoomForm'
10
 import RoomForm from './components/RoomForm'
67
 
67
 
68
   const FormCard = new Array(CarNumber).fill(0)
68
   const FormCard = new Array(CarNumber).fill(0)
69
   return (
69
   return (
70
-    <view className='scroll-www'>
71
-
72
-      <CustomNav logo={titleLogo} title={taRoomContent?.roomName} />
73
-
74
-      <scroll-view scroll-y style='height: calc(100vh - 176rpx);' >
75
-
76
-        {
77
-          FormCard.map((_, index) => {
78
-            return (
79
-
80
-              <RoomForm key={(index)} onChange={(e) => handleChange(e, index)} />
81
-            )
82
-          })
83
-        }
84
-        <button className='button-OK' onClick={handleSubmit} >确定</button>
85
-      </scroll-view>
86
-
70
+    <view className='page-index'>
71
+      <view className='index-navbar'>
72
+        <CustomNav logo={titleLogo} title={taRoomContent?.roomName} />
73
+      </view>
74
+      <View className='index-container'>
75
+        <scroll-view scroll-y style='height: 100%;' >
76
+          {
77
+            FormCard.map((_, index) => {
78
+              return (
79
+                <RoomForm key={(index)} onChange={(e) => handleChange(e, index)} />
80
+              )
81
+            })
82
+          }
83
+          <button className='button-OK' onClick={handleSubmit} >确定</button>
84
+        </scroll-view>
85
+      </View>
87
     </view>
86
     </view>
88
-
89
   )
87
   )
90
 })
88
 })

+ 1
- 1
src/pages/RoomOrder/style.less Parādīt failu

8
   font-size: 40px;
8
   font-size: 40px;
9
   color: #ffffff;
9
   color: #ffffff;
10
   margin-top: 2em;
10
   margin-top: 2em;
11
-  margin-bottom: 4em;
11
+  margin-bottom: 2em;
12
 }
12
 }

+ 1
- 3
src/pages/index/tabs/Recommend.jsx Parādīt failu

1
-import Taro, { useDidShow } from '@tarojs/taro'
1
+import Taro from '@tarojs/taro'
2
 import { React, useState, useEffect, useRef, useMemo } from 'react'
2
 import { React, useState, useEffect, useRef, useMemo } from 'react'
3
 import iconsearch from '@/assets/icons/housemantj/search.png'
3
 import iconsearch from '@/assets/icons/housemantj/search.png'
4
 import locationimg from '@/assets/icons/housemantj/location.png'
4
 import locationimg from '@/assets/icons/housemantj/location.png'
5
 import Tip from '@/components/tip'
5
 import Tip from '@/components/tip'
6
 import List from '@/components/List';
6
 import List from '@/components/List';
7
-import NoData from '@/components/NoData'
8
 import MasonryLayout from '@/components/MasonryLayout';
7
 import MasonryLayout from '@/components/MasonryLayout';
9
-import Waterfall from '@/components/MasonryLayout/Waterfall';
10
 import { getIndexType, getResourceList } from '@/services/home'
8
 import { getIndexType, getResourceList } from '@/services/home'
11
 import { random } from '@/utils'
9
 import { random } from '@/utils'
12
 import Card from '../components/Card'
10
 import Card from '../components/Card'

+ 8
- 5
src/pages/searchResult/searchResult.jsx Parādīt failu

3
 import iconsearch from '../../assets/icons/housemantj/search.png'
3
 import iconsearch from '../../assets/icons/housemantj/search.png'
4
 import CustomNav from '@/components/CustomNav'
4
 import CustomNav from '@/components/CustomNav'
5
 import Taro from '@tarojs/taro'
5
 import Taro from '@tarojs/taro'
6
+import { View } from '@tarojs/components';
6
 import Card from '../index/components/Card'
7
 import Card from '../index/components/Card'
7
 import { getResourceList } from '@/services/home'
8
 import { getResourceList } from '@/services/home'
8
 import NoData from '@/components/NoData'
9
 import NoData from '@/components/NoData'
68
       <view className='index-navbar'>
69
       <view className='index-navbar'>
69
         <CustomNav title='搜索' />
70
         <CustomNav title='搜索' />
70
       </view>
71
       </view>
71
-      <view className='index-container'>
72
+      <view className='index-container' style={{display:'flex',flexDirection:'column'}}>
72
         <view className='search'>
73
         <view className='search'>
73
           <input className='searchInput' placeholder='搜索景点/店铺' disabled onClick={onSearch} />
74
           <input className='searchInput' placeholder='搜索景点/店铺' disabled onClick={onSearch} />
74
           <image className='searchicon' src={iconsearch} />
75
           <image className='searchicon' src={iconsearch} />
75
           <view className='lineSearch'></view>
76
           <view className='lineSearch'></view>
76
-        </view><view className='index-tabs'>
77
+        </view>
78
+        <view className='index-tabs'>
77
           <mp-tabs
79
           <mp-tabs
78
             tabClass='tabs-Unselected'
80
             tabClass='tabs-Unselected'
79
             swiperClass='tabs-swiper'
81
             swiperClass='tabs-swiper'
85
           >
87
           >
86
           </mp-tabs>
88
           </mp-tabs>
87
         </view>
89
         </view>
90
+        <View style={{flex:'auto',overflow:'hidden',position:'relative'}}>
88
         <List
91
         <List
89
-          style={{ height: 'calc(100% - 90px)' }}
92
+          style={{ height: '100%' }}
90
           request={getResourceList}
93
           request={getResourceList}
91
           params={queryParams}
94
           params={queryParams}
92
           onDataChange={setAllList}
95
           onDataChange={setAllList}
93
           refresherEnabled={false}
96
           refresherEnabled={false}
94
-
95
         >
97
         >
96
           {
98
           {
97
             alllist.length == 0 ?
99
             alllist.length == 0 ?
98
               <NoData /> :
100
               <NoData /> :
99
               <view className='waterfall'>
101
               <view className='waterfall'>
100
                 {
102
                 {
101
-                  alllist.map((item) => <Card key={item.resourceNo} item={item} />)
103
+                  alllist.map((item) => <Card key={item.resourceNo} item={item} onImageLoad='' />)
102
                 }
104
                 }
103
               </view>
105
               </view>
104
           }
106
           }
105
         </List>
107
         </List>
108
+        </View>
106
       </view>
109
       </view>
107
     </view>
110
     </view>
108
   )
111
   )

+ 2
- 0
src/pages/searchResult/searchResult.less Parādīt failu

1
 .search{
1
 .search{
2
     padding: 10px 30px 0 30px;
2
     padding: 10px 30px 0 30px;
3
     position: relative;
3
     position: relative;
4
+    flex: none;
4
     .searchInput{    
5
     .searchInput{    
5
         height: 68px;
6
         height: 68px;
6
         background: #F8F8F8;
7
         background: #F8F8F8;
42
 } 
43
 } 
43
 .index-tabs {
44
 .index-tabs {
44
   position: relative;  
45
   position: relative;  
46
+  flex: none;
45
   .tabs-Unselected {
47
   .tabs-Unselected {
46
     width: 25vw;      
48
     width: 25vw;      
47
     font-weight: bold;
49
     font-weight: bold;