.

config/prod.js

@@ -3,7 +3,7 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
-    HOST: '"https://sgl-v2.njyunzhi.com"',
+    HOST: '"https://sgl-v2-test.njyunzhi.com"',
     OSS: '"yz-shigongli.oss-accelerate.aliyuncs.com"',
   },
   mini: {},

project.config.json

@@ -2,7 +2,7 @@
   "miniprogramRoot": "./dist",
   "projectname": "miniapp",
   "description": "十公里",
-  "appid": "wx06a7372d48d56843",
+  "appid": "wx835627a9b9b3932a",
   "setting": {
     "urlCheck": true,
     "es6": false,

src/hotel/pages/landlord/roomOrder/roomOrder.jsx

@@ -1,12 +1,13 @@
 import withLayout from '@/layouts'
-import React, { useState, useEffect, useRef } from 'react'
+import React, { useState, useEffect, useRef, useMemo } from 'react'
 import CustomNav from '@/components/CustomNav'
 import Taro from '@tarojs/taro'
 import { useModel } from '@/store'
 import SpinBox from "@/components/Spin/SpinBox";
 import copy from '@/assets/icons/landlord/copy.png'
 import { Input, Button, View, Picker, Label, Image } from '@tarojs/components'
-import { getRoomOrderList,getHotelDetail } from '@/services/landlord'
+import List from '@/components/List';
+import { getRoomOrderList, getHotelDetail } from '@/services/landlord'
 import './roomOrder.less'
 
 
@@ -14,23 +15,16 @@ export default withLayout((props) => {
   const { hotelId, roomId, roomName } = props.router.params
   const [detail, setDetail] = useState([])
   const { setHotel } = useModel('hotel')
-  const [loading, setLoading] = useState(false)
 
-  useEffect(() => {
-    setLoading(true)
-    if (roomId) {
-      getRoomOrderList({ roomId: roomId }).then((res) => {
-        setDetail(res.records || [])
-        setLoading(false)
-      })
-    }
-  }, [roomId])
-  
+  const queryParams = useMemo(() => ({
+    roomId: roomId
+  }), [roomId])
+
   useEffect(() => {
     if (hotelId) {
-      getHotelDetail(hotelId).then((res)=>{
+      getHotelDetail(hotelId).then((res) => {
         setHotel(res)
-      }) 
+      })
     }
   }, [hotelId])
 
@@ -61,40 +55,44 @@ export default withLayout((props) => {
   }
 
   return (
-    <View style={{ padding: '0 30px' }}>
+    <View className='page-index'>
       <view className='index-navbar'>
         <CustomNav title={roomName ? decodeURIComponent(roomName) : '房间名'} />
       </view>
-      <SpinBox loading={loading}>
-      <scroll-view scrollY style={{ height: 'calc(100vh - 65px)' }}>
-
-        {
-          detail.length == 0 ? <View className='houseCard'>暂无入住人数据</View>
-            : detail.map((item, index) =>
-              <View className='houseCard' key={index}>
-                {
-                  (item.personList || []).map((item2, inx) =>
-                    <View className='operation' key={inx}>
-                      <View style={{ display: 'inline-block' }} onClick={() => CopyName(item2.customerName)}>
-                        <Label>{item2.customerName}</Label>
-                        <Image src={copy} />
-                      </View>
-                      <View style={{ display: 'inline-block', marginLeft: '40rpx' }} onClick={() => CopyPhone(item2.customerPhone)}>
-                        <Label>{item2.customerPhone}</Label>
-                        <Image src={copy} />
+      <View className='index-container'>
+        <List
+          style={{ height: '100%' }}
+          request={getRoomOrderList}
+          params={queryParams}
+          onDataChange={setDetail}
+          refresherEnabled={false}
+          noData={<View style={{ padding: '15px 30px' }}><View className='houseCard'>暂无入住人数据</View></View>}
+        >
+          {
+            detail.map((item, index) =>
+              <View style={{ padding: '15px 30px' }}>
+                <View className='houseCard' key={index}>
+                  {
+                    (item.personList || []).map((item2, inx) =>
+                      <View className='operation' key={inx}>
+                        <View style={{ display: 'inline-block' }} onClick={() => CopyName(item2.customerName)}>
+                          <Label>{item2.customerName}</Label>
+                          <Image src={copy} />
+                        </View>
+                        <View style={{ display: 'inline-block', marginLeft: '40rpx' }} onClick={() => CopyPhone(item2.customerPhone)}>
+                          <Label>{item2.customerPhone}</Label>
+                          <Image src={copy} />
+                        </View>
                       </View>
-                    </View>
-
-                  )
-                }
-                <View className='operation'>入住时间：{item.startDate}  -  {item.endDate}</View>
-
+                    )
+                  }
+                  <View className='operation'>入住时间：{item.startDate}  -  {item.endDate}</View>
+                </View>
               </View>
             )
-        }
-
-      </scroll-view>
-    </SpinBox>
+          }
+        </List>
+      </View>
     </View>
   )
 })

src/hotel/pages/landlord/roomOrder/roomOrder.less

@@ -3,7 +3,6 @@
   border-radius: 60px;
   padding: 40px 30px 41px 30px;
   text-align: center;
-  margin: 30px 0;
   font-size: 28px;
   color: #fff;  
   Image{
@@ -16,4 +15,11 @@
   .operation{
     margin: 10px 0;
   }
+}
+.botton {
+  font-size: 28px;
+  color: #c0c8d3;
+  line-height: 34px;
+  text-align: center;
+  padding: 40px 0;
 }