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

src/components/List/index.jsx

@@ -9,8 +9,8 @@ export default (props) => {
     params,
     pageSize = 10,
     onError,
-    shopId,
     onDataChange,
+    noData,
     ...leftProps
   } = props
 
@@ -73,7 +73,7 @@ export default (props) => {
   // 请求数据
   useEffect(() => {
     fetchRef.current(payload)
-  }, [payload, shopId])
+  }, [payload, request])
 
   return (
     <ScrollView
@@ -85,7 +85,10 @@ export default (props) => {
         ? props.children
         : list.map((item, index) => render({ item, index }))
       }
-      <view className='botton' style={{ display: hasMore ? 'none' : '' }}>已经到底了~</view>
+      { !list || !list.length && noData }
+
+      { list && list.length > 0 && !hasMore && <view className='botton'>已经到底了~</view> }
+      
     </ScrollView>
   )
 }

src/hotel/components/HouseManage/houseManage.jsx

@@ -3,8 +3,9 @@ import see from '@/assets/icons/landlord/查看入住人.png'
 import share from '@/assets/icons/landlord/分享链接.png'
 import del from '@/assets/icons/landlord/删除.png'
 import addImg from '@/assets/icons/landlord/添加.png'
-import React, { useState, useEffect, useRef, useImperativeHandle } from 'react'
+import React, { useState, useEffect, useRef, useImperativeHandle,useMemo } from 'react'
 import { getRoomList, deleteRoom } from '@/services/landlord'
+import List from '@/components/List';
 import SearchBar from '@/components/SearchBar'
 import ShareRoom from '../shareRoom/ShareRoom.jsx'
 import ShareCard from '../shareCard/shareCard'
@@ -15,6 +16,9 @@ export default React.forwardRef((props, ref) => {
   const { hotel } = props
   const [detail, setDetail] = useState([])
 
+  const fetchAPI = useMemo(() => hotel.hotelId?()=>getRoomList({hotelId: hotel.hotelId}):undefined, [hotel?.hotelId])
+  const queryParams = useMemo(() => ({}), [])
+
   const shareDataRef = useRef()
 
   // 判断是否首次加载
@@ -118,20 +122,27 @@ export default React.forwardRef((props, ref) => {
         <SearchBar placeholder='请输入房源名搜索' onBlur={onSearch} />
         <ShareRoom showCutover={showCutover} onClose={onClose} room={room} onFinish={handleFinish} />
         <ShareCard showCutover={showCard} onClose={onClose2} />
-        <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" style={{ height: 'calc(100vh - 244px)' }}>
-          {
-            (detail || []).map((item) =>
-              <view className='houseCard'>
-                <view className='houseName' onClick={() => { handelDetail(item) }} >{item.roomName || ''}</view>
-                <view className='operation'>
-                  <view onClick={() => handelOrder(item)}><image src={see} />查看入住人</view>
-                  <view onClick={() => ShowMoldeOn(item)}><image src={share} />分享链接</view>
-                  <view onClick={() => handelDelete(item)}><image src={del} />删除房源</view>
-                </view>
-              </view>
-            )
-          }
-        </scroll-view>
+        <List
+          style={{ height: 'calc(100vh - 244px)' }}
+          request={fetchAPI}
+          params={queryParams}
+          onDataChange={setDetail}
+          noData="暂无房源信息"
+        >
+          <view className='waterfall'>
+            {
+              detail.map((item, index) =>
+                <view className='houseCard' key={index}>
+                  <view className='houseName' onClick={() => { handelDetail(item) }} >{item.roomName || ''}</view>
+                  <view className='operation'>
+                    <view onClick={() => handelOrder(item)}><image src={see} />查看入住人</view>
+                    <view onClick={() => ShowMoldeOn(item)}><image src={share} />分享链接</view>
+                    <view onClick={() => handelDelete(item)}><image src={del} />删除房源</view>
+                  </view>
+                </view>)
+            }
+          </view>
+        </List>
       </view>
       <view className='addHouse' onClick={handelClick}>
         <image className='addImg' src={addImg} />添加房源

src/hotel/components/Income/income.jsx

@@ -1,4 +1,4 @@
-import { useState } from 'react'
+import { useState, useMemo } from 'react'
 import eyes from '@/assets/icons/shopKeeper/小眼睛.png'
 import ceyes from '@/assets/icons/shopKeeper/小眼睛-闭上.png'
 import sImg from '@/assets/icons/landlord/我的收入2.png'
@@ -6,25 +6,25 @@ import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
 import ToggleRole from '@/components/toggleRole/ToggleRole'
 import Picker from '@/components/Picker'
 import formatTime from "@/utils/formatTime";
-import {getAccountLogList} from '@/services/landlord'
+import { getAccountLogList } from '@/services/landlord'
 
 import List from '@/components/List';
 import './income.less'
 
 
+const getList = id => params => getAccountLogList(id, params)
 
 export default (props) => {
-  const { hotelList, hotel, account, onHotelChange, accountlog } = props
+  const { hotelList, hotel, account, onHotelChange } = props
 
-  // const [accountLog,setAccountLog]=useState(accountlog)
+  const queryParams = useMemo(() => ({}), [])
 
-
-  // const [queryParams, setQueryParams] = useState({pageNum: 1, pageSize: 10})
-  // setQueryParams(hotel.hotelId)
+  const fetchAPI = useMemo(()=>account.accountId ? getList(account.accountId) : undefined, [account?.accountId])
 
   const handleHotelChange = (hotelId, current) => {
     onHotelChange(current)
   }
+  const [accountlog, setAccountlog] = useState([])
 
   const [isyear, setYear] = useState(true)
   const [isMomth, setMonth] = useState(false)
@@ -68,44 +68,44 @@ export default (props) => {
           </view>
         </view>
 
-        <view className='title' >{accountlog.length != '' ? '推广收入记录' : '暂无推广收入'}</view>
-        
-        {/* <List
-                  style={{ height: '50vh' }}
-                  request={getAccountLogList}
-                  params={queryParams}
-                  onDataChange={setAccountLog}
-                >
-                  {
-                    (accountLog || []).map((item) =>
-                    <view className='spreadCard'>
-                      <view className='card'>
-                        <view className='spreadTime'>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间：<text>{formatTime(item.createDate, 'yyyy/MM/dd hh:mm:ss')}</text></view>
-                        <view className='spreadMoney'>收入金额：<text>{parseFloat((item.amount / 100).toFixed(2))}</text>元</view>
-                        <image className='spreadImg' src={sImg} />
-                      </view>
-                    </view>
-                    )
-                  }
-          </List> */}
-        
-        
-        
-        <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" style={{ height: '50vh' }}>
+        <view className='title' >推广收入记录</view>
 
-          {
-            (accountlog || []).map((item) =>
-              <view className='spreadCard'>
+        <List
+          style={{ height: 'calc(100vh - 390px)' }}
+          request={fetchAPI}
+          params={queryParams}
+          noData={<view className='title' >暂无</view>}
+          render={({item, index}) => (
+            <view className='spreadCard' key={index}>
+              <view className='card'>
+                <view className='spreadTime'>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间：<text>{formatTime(item.createDate, 'yyyy/MM/dd hh:mm:ss')}</text></view>
+                <view className='spreadMoney'>收入金额：<text>{parseFloat((item.amount / 100).toFixed(2))}</text>元</view>
+                <image className='spreadImg' src={sImg} />
+              </view>
+            </view>
+          )}
+        >
+        </List>
+        {/*<view className='title' >{accountlog.length==0?'推广收入记录':'暂无推广收入'}</view>
+         <List
+          style={{ height: '50vh' }}
+          request={fetchAPI}
+          params={queryParams}
+          onDataChange={setAccountlog}
+          noData="暂无推广收入"
+        >
+          <view className='waterfall'>
+            {
+              accountlog.map((item,index) => <view className='spreadCard' key={index}>
                 <view className='card'>
                   <view className='spreadTime'>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间：<text>{formatTime(item.createDate, 'yyyy/MM/dd hh:mm:ss')}</text></view>
                   <view className='spreadMoney'>收入金额：<text>{parseFloat((item.amount / 100).toFixed(2))}</text>元</view>
                   <image className='spreadImg' src={sImg} />
                 </view>
-              </view>
-            )
-          }
-        <view className='botton' >已经到底了~</view>
-        </scroll-view>
+              </view>)
+            }
+          </view>
+        </List> */}
       </view>
     </view>
   )

src/hotel/pages/landlord/landlord.jsx

@@ -8,7 +8,7 @@ import onincomeImg from '@/assets/icons/landlord/我的收入按下.png'
 import houseImg from '@/assets/icons/landlord/房源管理.png'
 import onhouseImg from '@/assets/icons/landlord/房源管理按下.png'
 import withLayout from '@/layouts'
-import { getHotelManage, getAccountLogList, getNowHotelManage } from '@/services/landlord'
+import { getHotelManage,  getNowHotelManage } from '@/services/landlord'
 import CustomNav from '@/components/CustomNav'
 import './landlord.less'
 
@@ -20,19 +20,16 @@ export default withLayout((props) => {
   const [hotelList, setHotelList] = useState([])
   const [hotel, setHotel] = useState()
   const [account, setAccount] = useState({})
-  const [accountlog, setAccountLog] = useState([])
 
   const houseRef = useRef()
 
+
   useEffect(() => {
     getHotelManage().then((res) => {
       const { hotelList: list, account: acc, hotel: current } = res
       setHotelList(list)
       setHotel(current)
       setAccount(acc)
-      getAccountLogList(acc.accountId).then((res2) => {
-        setAccountLog(res2.records || [])
-      })
     })
   }, [])
 
@@ -41,9 +38,6 @@ export default withLayout((props) => {
       const { account: acc } = res
       setAccount(acc)
       setHotel(current)
-      getAccountLogList(acc.accountId).then((res2) => {
-        setAccountLog(res2.records || [])
-      })
     })
   }
 
@@ -73,7 +67,7 @@ export default withLayout((props) => {
     <view className='page-index'>
       <CustomNav title={hotel?.hotelName} logo={hotel?.logo} />
       <view className='index-container'>
-        {currentTab === 0 && <Income hotelList={hotelList} hotel={hotel} account={account} onHotelChange={handleHotelChange} accountlog={accountlog} />}
+        {currentTab === 0 && <Income hotelList={hotelList} hotel={hotel}  account={account} onHotelChange={handleHotelChange} />}
         {currentTab === 1 && <HouseManage hotel={hotel} ref={houseRef} />}
       </view>
       <view className='index-tabbar'>

src/pages/index/components/Card.js

@@ -15,7 +15,6 @@ export default (props) => {
   const [isSaved, toggleSave] = useSave(item.isSaved, item.targetType, item.targetId)
   const Detail = () => {
     if (item.targetType == 'tourist') {
-      let loc = item.lng + ',' + item.lat
       Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}` });
     }
     else {

src/services/landlord.js

@@ -36,7 +36,7 @@ export const getHotelManage = (params) => request('/hotel/manage/index', { param
  * @param {*} params 
  * @returns 
  */
-export const getAccountLogList = (id) => request(`/hotel/account/${id}/log`)
+export const getAccountLogList = (id,params) => request(`/hotel/account/${id}/log`,{params})
 
 /**
  * 房源列表

src/shop/components/ShopKeeper/shopKeeper.jsx

@@ -1,4 +1,4 @@
-import { React, useState, useEffect, useRef } from 'react'
+import { React, useState, useEffect, useMemo } from 'react'
 import Taro, { useRouter } from '@tarojs/taro'
 import CustomNav from '@/components/CustomNav'
 import Picker from '@/components/Picker'
@@ -17,7 +17,6 @@ import ToggleRole from '@/components/toggleRole/ToggleRole'
 
 import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
 import './shopKeeper.less'
-import { useMemo } from 'react'
 
 
 export default (props) => {