民宿房东端首页

src/components/Landlord/HouseManage/houseManage.jsx

@@ -1,26 +1,26 @@
 import Taro from '@tarojs/taro'
-import CustomNav from '@/components/CustomNav'
-import pImg from '../../../assets/icons/landlord/定位 位置.png'
-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 iconsearch from '../../../assets/icons/housemantj/search.png'
+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 iconsearch from '@/assets/icons/housemantj/search.png'
 import './houseManage.less'
+import { useState, useEffect,useRef } from 'react'
+import {getRoomList} from '@/services/landlord'
 
 
 export default (props) => {
+  const [detail, setDetail] = useState({})
+  // useEffect(()=>{
+  //   getRoomList(id).then((res)=>{
+  //     setDetail(res.records||[])
+  //     console.log(res.records)
+  //   })
+  // })
   return (
     <view>
-      <view>
-        <CustomNav logo={null} title='十公里周边指南' />
-      </view>
       <view style={{ padding: '0 30rpx', height: '100%' }}>
         <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" style={{ height: 'calc(100vh - 204px)' }}>
-          <view className='position'>
-            <image className='pImg' src={pImg} />
-            当前店铺：<text>南京紫荆国际公寓酒店</text>
-          </view>
           <view className='search'>
             <input className='searchInput' disabled />
             <image className='searchicon' src={iconsearch} />

src/components/Landlord/HouseManage/houseManage.less

@@ -1,16 +1,4 @@
-.position{
-  height: 27px;
-  font-size: 28px;
-  color: #202020;
-  padding-left: 25px;
-  .pImg{
-    width: 35px;
-    height: 42px;
-    position: relative;
-    top: 10px;
-    right: 21px;
-  }
-}
+
 .search{
   padding: 40px 0  30px 0;
   position: relative;

src/components/Landlord/Income/income.jsx

@@ -1,22 +1,27 @@
-import { useState} from 'react'
-import Taro from '@tarojs/taro'
-import Popup from '@/components/Popup'
-import CustomNav from '@/components/CustomNav'
+import { useState } from 'react'
 import './income.less'
 import eyes from '../../../assets/icons/shopKeeper/小眼睛.png'
 import ceyes from '../../../assets/icons/shopKeeper/小眼睛-闭上.png'
 import sImg from '../../../assets/icons/landlord/我的收入2.png'
 import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
-import touristON from '@/assets/icons/UserCenter/touristON.png'
-import touristOFF from '@/assets/icons/UserCenter/touristOFF.png'
-import hotelBossON from '@/assets/icons/UserCenter/hotelBossON.png'
-import hotelBossOFF from '@/assets/icons/UserCenter/hotelBossOFF.png'
-import shopBossON from '@/assets/icons/UserCenter/shopBossON.png'
-import shopBossOFF from '@/assets/icons/UserCenter/shopBossOFF.png'
-import  ToggleRoul  from  '@/components/toggleRoul/ToggleRoul'
-
+import ToggleRoul from '@/components/toggleRoul/ToggleRoul'
+import Picker from '@/components/Picker'
 
 export default (props) => {
+  const { hotelList, hotel, account, onHotelChange, accountlog } = props
+
+  const handleHotelChange = (hotelId, current) => {
+    onHotelChange(current)
+  }
+
+  const [isyear, setYear] = useState(true)
+  const [isMomth, setMonth] = useState(false)
+  const handleYear = () => {
+    isyear ? setYear(false) : setYear(true)
+  }
+  const handleMonth = () => {
+    isMomth ? setMonth(false) : setMonth(true)
+  }
   const [showCutover, setShowCutover] = useState(false)
   const ShowMoldeOn = () => {
     setShowCutover(true)
@@ -26,89 +31,47 @@ export default (props) => {
   }
   return (
     <view>
-      <view>
-        <CustomNav title='十公里' />
-      </view>
       <ToggleRoul showCutover={showCutover} onClose={onClose} />
       <view style={{ padding: '30rpx', height: '100%' }}>
         <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" style={{ height: 'calc(100vh - 120px)' }}>
           <view className='storexx'>
-              <view className='storeName'>店名：<text>Yun咖 云里 咖啡店</text></view>
-              <view onClick={ShowMoldeOn}  className='User-info-cutover'>
-                <image className='User-info-cutover-image' src={cutoverUser} />
-              </view>
-              <view className='money'>
-                <view className='sleft'>
-                  <view className='lword'>全年收入（税前）</view>
-                  <view className='yearMoney'>
-                    <text>2800000</text>元
-                    <image className='micon' src={eyes}></image>
-                  </view>
-                </view>
-                <view className='line' />
-                <view className='sright'>
-                  <view className='rword'>当月收入（税前）</view>
-                  <view className='monthMoney'>
-                    <text>******</text>元
-                    <image className='micon2' src={ceyes}></image>
-                  </view></view>
-              </view>
-            </view>
-          <view className='title'>推广收入记录</view>
-          <view>
-            <view className='spreadCard'>
-              <view className='spreadDate'>日期：<text>2021-06-24</text></view>
-              <view className='card'>
-                <view className='spreadTime'>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间：<text>2021-06-24  20:45</text></view>
-                <view className='spreadMoney'>收入金额：<text>5.00</text>元</view> 
-                <image className='spreadImg' src={sImg} />
-              </view>
+            <view className='storeName'>店名：<Picker style={{ display: 'inline-block' }} placeholder="请选择民宿" value={hotel?.hotelId} kv={['hotelName', 'hotelId']} dicts={hotelList} onChange={handleHotelChange} /></view>
+            <view onClick={ShowMoldeOn} className='User-info-cutover'>
+              <image className='User-info-cutover-image' src={cutoverUser} />
             </view>
-            <view className='spreadCard'>
-              <view className='spreadDate'>日期：<text>2021-06-24</text></view>
-              <view className='card'>
-                <view className='spreadTime'>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间：<text>2021-06-24  20:45</text></view>
-                <view className='spreadMoney'>收入金额：<text>5.00</text>元</view> 
-                <image className='spreadImg' src={sImg} />
-              </view>
-            </view>
-            <view className='spreadCard'>
-              <view className='spreadDate'>日期：<text>2021-06-24</text></view>
-              <view className='card'>
-                <view className='spreadTime'>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间：<text>2021-06-24  20:45</text></view>
-                <view className='spreadMoney'>收入金额：<text>5.00</text>元</view> 
-                <image className='spreadImg' src={sImg} />
-              </view>
-            </view>
-            <view className='spreadCard'>
-              <view className='spreadDate'>日期：<text>2021-06-24</text></view>
-              <view className='card'>
-                <view className='spreadTime'>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间：<text>2021-06-24  20:45</text></view>
-                <view className='spreadMoney'>收入金额：<text>5.00</text>元</view> 
-                <image className='spreadImg' src={sImg} />
-              </view>
-            </view>
-            <view className='spreadCard'>
-              <view className='spreadDate'>日期：<text>2021-06-24</text></view>
-              <view className='card'>
-                <view className='spreadTime'>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间：<text>2021-06-24  20:45</text></view>
-                <view className='spreadMoney'>收入金额：<text>5.00</text>元</view> 
-                <image className='spreadImg' src={sImg} />
-              </view>
-            </view>
-            <view className='spreadCard'>
-              <view className='spreadDate'>日期：<text>2021-06-24</text></view>
-              <view className='card'>
-                <view className='spreadTime'>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间：<text>2021-06-24  20:45</text></view>
-                <view className='spreadMoney'>收入金额：<text>5.00</text>元</view> 
-                <image className='spreadImg' src={sImg} />
+            <view className='money'>
+              <view className='sleft'>
+                <view className='lword'>全年收入（税前）</view>
+                <view className='yearMoney'>
+                  <text>{isyear ? account?.amounts : '******'}</text>元
+                  <image className='micon' src={isyear ? eyes : ceyes} onClick={handleYear} />
+                </view>
               </view>
+              <view className='line' />
+              <view className='sright'>
+                <view className='rword'>当月收入（税前）</view>
+                <view className='monthMoney'>
+                  <text>{isMomth ? account?.currentCharges : '******'}</text>元
+                  <image className='micon2' src={isMomth ? eyes : ceyes} onClick={handleMonth}></image>
+                </view></view>
             </view>
           </view>
-          <view className='botton'>已经到底了~</view>
-        </scroll-view>        
-      </view>
-      
+          
+          <view className='title' >{accountlog.length!=''?'推广收入记录':'暂无推广收入'}</view>
+            {
+              accountlog?.map((item) => 
+                <view className='spreadCard'>
+                  <view className='card'>
+                    <view className='spreadTime'>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间：<text>{item.createDate}</text></view>
+                    <view className='spreadMoney'>收入金额：<text>{parseFloat((item.amount/100).toFixed(2))}</text>元</view>
+                    <image className='spreadImg' src={sImg} />
+                  </view>
+                </view>
+              )
+            }
+            {accountlog.length!=''?<view className='botton'>已经到底了~</view>:''}          
+        </scroll-view>
       </view>
+    </view>
   )
 }

src/components/Landlord/Income/income.less

@@ -56,7 +56,7 @@
 }
 .storexx{
   text-align: center;
-  height: 302px;
+  display: flow-root;
   background: #FFFFFF;
   box-shadow: 0px 8px 32px 0px rgba(0, 0, 0, 0.08);
   border-radius: 24px;
@@ -80,26 +80,26 @@
   }
   .sleft{
     float: left;
+    text-align: left;
     .lword{
-      height: 25px;
       font-size: 26px;
       color: #666666;
-      margin-bottom: 40px;      
-      margin-left: 1px;
+      margin-bottom: 40px;
     }
     .yearMoney{
-      height: 30px;
       font-size: 28px;
       font-weight: bold;
       color: #202020;
+      line-height: 0;
+      display: inline-block;
       text{
         font-size: 40px;
         color: #FF3434
       }
       .micon{
         width: 38px;
-        height: 22px;
-        margin-left: 19px;
+        height: 26px;
+        margin-left: 20px;
       }
     }
   }
@@ -114,28 +114,26 @@
   }
   .sright{
     float: right;
-    text-align: left;
+    text-align: right;
     .rword{
       font-size: 26px;
       color: #666666;
-      margin: 0 25px 47px 0;
-      text-align: center;
+      margin-bottom: 40px;
     }
     .monthMoney{
-      height: 24px;
       font-size: 28px;
       font-weight: bold;
       color: #202020;
-      line-height: 24px;
+      line-height: 0;
+      display: inline-block;
       text{
         font-size: 40px;
         color: #FF3434;
       }
       .micon2{
-        width: 34px;
-        height: 16px;
-        margin-left: 23px;
-        margin-bottom: 7px;
+        height: 26px;
+        width: 38px;
+        margin-left: 20px;
       }
     }
   }
@@ -147,12 +145,7 @@
   margin: 62px 0 10px 1px;
 }
 .spreadCard{
-  margin-bottom: 1px;
-  .spreadDate{
-    font-size: 20px;
-    color: #202020;
-    line-height: 60px;
-  }
+  margin-bottom: 60px;  
   .card{
     height: 166px;
     background: #FFF;

src/hotel/pages/landlord/landlord.jsx

@@ -7,15 +7,45 @@ import incomeImg from '@/assets/icons/landlord/我的收入.png'
 import onincomeImg from '@/assets/icons/landlord/我的收入按下.png'
 import houseImg from '@/assets/icons/landlord/房源管理.png'
 import onhouseImg from '@/assets/icons/landlord/房源管理按下.png'
-import './landlord.less'
 import withLayout from '@/layouts'
+import { getHotelManage, getAccountLogList, getNowHotelManage } from '@/services/landlord'
+import CustomNav from '@/components/CustomNav'
 
+import './landlord.less'
 
 export default withLayout((props) => {
   const { router, person } = props
   const { params } = useRouter()
   const { tab } = params || {}
 
+  const [hotelList, setHotelList] = useState([])
+  const [hotel, setHotel] = useState()
+  const [account, setAccount] = useState()
+  const [accountlog, setAccountLog] = useState([])
+
+  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 || [])
+      })
+    })
+  }, [])
+
+  const handleHotelChange = (current) => {
+    setHotel(current)
+    getNowHotelManage(current.hotelId).then((res) => {
+      const {account: acc } = res
+      setAccount(acc)
+      getAccountLogList(acc.accountId).then((res2) => {
+        setAccountLog(res2.records || [])
+      })
+    })
+  }
+
   const [currentTab, setCurrentTab] = useState(0)
 
   const handleTabChange = (e) => {
@@ -31,9 +61,10 @@ export default withLayout((props) => {
 
   return (
     <view className='page-index'>
+      <CustomNav title={hotel?.hotelName} logo={hotel?.logo} />
       <view className='index-container'>
-        {currentTab === 0 && <Income />}
-        {currentTab === 1 && <HouseManage />}
+        {currentTab === 0 && <Income hotelList={hotelList} hotel={hotel} account={account} onHotelChange={handleHotelChange} accountlog={accountlog} />}
+        {currentTab === 1 && <HouseManage hotel={hotel} />}
       </view>
       <view className='index-tabbar'>
         <TabBar extClass='custom-tabbar bottomTab' current={currentTab} onChange={handleTabChange}>

src/pages/details/foodDetails/foodDetails.jsx

@@ -1,7 +1,7 @@
 import CustomNav from '@/components/CustomNav'
 import withLayout from '@/layouts'
 import { getShopDetail, getShopPackage, getExtendContent } from '@/services/home'
-import { useState, useEffect } from 'react'
+import { useState, useEffect,useRef } from 'react'
 import { Swiper, SwiperItem } from '@tarojs/components';
 import Star from '@/components/Star/Star.jsx'
 import Cards from '@/components/foodCards/foodCards.jsx'
@@ -20,7 +20,6 @@ import Taro from '@tarojs/taro'
 import Extend from '../components/extend'
 import useSave from "@/utils/hooks/useSave"
 import useLike from "@/utils/hooks/useLike"
-import { useRef } from 'react';
 
 export default withLayout((props) => {
   const { router, person } = props

src/services/landlord.js

@@ -11,11 +11,28 @@ import request from '@/utils/request'
 
  
 /**
- * 查询房源列表 
+ * 查询指定名宿的账户
  * @param {*} params 
  * @returns 
  */
- export const getRoomList = (params) => request('/taRoom', { params })
+ export const getNowHotelManage = (id,params) => request(`/hotel/manage/${id}`, { params })
+
+
+/**
+ * 查询民宿老板的所有名宿列表
+ * @param {*} params 
+ * @returns 
+ */
+ export const getHotelManage = (params) => request('/hotel/manage/index', { params })
+
+/**
+ * 查询指定名宿的账户流水
+ * @param {*} params 
+ * @returns 
+ */
+ export const getAccountLogList = (id) => request(`/hotel/account/${id}/log`)
+
+
 
  /**
  * 删除房源