民宿端修改房源搞定

src/components/Popup/index.jsx

@@ -2,10 +2,7 @@
 import './style.less'
 
 export default (props) => {
-  const { show, mask = true, onClose, maskClosable } = props
-  const onClose3 = () => {
-    console.log('3333333333333333333333')
-  }
+  const { show, mask = true, onClose, maskClosable } = props  
   return (
     <mp-dialog extClass='x-popup' buttons={[]} show={show} mask={mask} maskClosable={maskClosable} onClose={onClose}>
       {props.children}

src/components/Star/Star.jsx

@@ -2,15 +2,20 @@
 import hongxin from '@/assets/icons/housemantj/已收藏.png'
 import baixin from '@/assets/icons/housemantj/收藏.png'
 import './Star.less'
+
+const Star = (props) => <image className='star' src={props.star >= props.index ? hongxin : baixin}></image>
+
+const starList = (new Array(5)).fill()
+
 export default (props) => {
   const {star}=props
+
+
   return (
     <>
-      <image className='star' src={star >= 1 ? hongxin : baixin}></image>
-      <image className='star' src={star >= 2 ? hongxin : baixin}></image>
-      <image className='star' src={star >= 3 ? hongxin : baixin}></image>
-      <image className='star' src={star >= 4 ? hongxin : baixin}></image>
-      <image className='star' src={star >= 5 ? hongxin : baixin}></image>
+    {
+      starList.map((_, index) => <Star key={index} star={star} index={index + 1} />)
+    }
     </>
   )
 }

src/components/toggleRole/ToggleRole.jsx

@@ -25,9 +25,6 @@ export default (props) => {
   const goToShop = () => {
     getRole('shop')
   }
-  const onClose2 = () => {
-    // console.log('2222222222222222222')
-  }
   return (
     <Popup show={showCutover} maskClosable={maskClosable} onClose={onClose}>
       <view className='User-box-sths' >

src/hotel/components/HouseManage/houseManage.jsx

@@ -40,8 +40,10 @@ export default React.forwardRef((props, ref) => {
           })       
         } 
       }
-    })
-   
+    })   
+  }
+  const handelDetail=(val)=>{
+    Taro.navigateTo({ url: `/hotel/pages/landlord/addRoom/addRoom?hotelId=${hotel.hotelId}&hotelName=${hotel.hotelName}&roomId=${val.roomId}` });
   }
 
   const [showCutover, setShowCutover] = useState(false)
@@ -54,6 +56,9 @@ export default React.forwardRef((props, ref) => {
   const onClose = () => {
     setShowCutover(false)
   }
+  const onClose2 = () => {
+    setShowCard(false)
+  }
   useEffect(() => {
     //首次加载页面时
     if (!mounted.current && hotel.hotelId) {
@@ -112,11 +117,11 @@ export default React.forwardRef((props, ref) => {
       <view style={{ padding: '0 30rpx', height: '100%' }}>
         <SearchBar placeholder='请输入房源名搜索' onBlur={onSearch}/>
         <ShareRoom showCutover={showCutover} onClose={onClose} room={room} onFinish={handleFinish} />
-        <ShareCard showCutover={showCard} onClose={onClose} />
+        <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='houseCard' onClick={()=>{handelDetail(item)}}>
                 <view className='houseName'>{item.roomName||''}</view>
                 <view className='operation'>
                   <view onClick={() => handelOrder(item)}><image src={see} />查看入住人</view>

src/hotel/components/Income/income.jsx

@@ -1,5 +1,4 @@
 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'
@@ -7,6 +6,9 @@ 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 List from '@/components/List';
+import './income.less'
+
 
 
 export default (props) => {
@@ -29,50 +31,50 @@ export default (props) => {
     setShowCutover(true)
   }
   const onClose = () => {
-    console.log('11111111')
     setShowCutover(false)
   }
   return (
     <view>
-      <ToggleRole role='hotel' showCutover={showCutover} onClose={onClose} />
+      <ToggleRole role='hotel' showCutover={showCutover} maskClosable={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'>店名：<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='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 className='storexx'>
+          <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='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 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 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 className='title' >{accountlog.length!=''?'推广收入记录':'暂无推广收入'}</view>
-            {
-              (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>
+
+        <view className='title' >{accountlog.length != '' ? '推广收入记录' : '暂无推广收入'}</view>
+        <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" style={{ height: '50vh' }}>
+
+          {
+            (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>
             )
           }
-          {accountlog.length != '' ? <view className='botton'>已经到底了~</view> : ''}
+        <view className='botton' >已经到底了~</view>
         </scroll-view>
       </view>
     </view>

src/hotel/components/shareRoom/ShareRoom.jsx

@@ -30,8 +30,35 @@ export default (props) => {
   }
   return (
     <Popup show={showCutover} onClose={onClose}>
-      <View className='from-room'>
-      <mp-form  >
+      <View className='from-room srl'>
+        <View style={{marginBottom:'25px'}}>
+          <View className='rzline' /><Label className='srl mg'>请输入入住人信息</Label><View className='rzline' />
+        </View>
+        <View className='srleft'>
+          <Label>入住人数：</Label>
+          <Input onInput={(e) => setRoomNum(e.detail.value)} value={roomNum} type='number' placeholder='请输入入住人数' />
+        </View>
+        <View className='srleft'>
+          <Label >入住开始时间：</Label>
+          <Picker className='picker' mode='date' onChange={handelStartDate}>
+            {startDate == '' ? '请选择入住开始时间' : startDate}
+          </Picker>
+        </View>
+        <View className='srleft'>
+          <Label>入住结束时间：</Label>
+          <Picker className='picker' mode='date' onChange={handelEndDate}>
+            {endDate == '' ? '请选择入住结束时间' : endDate}
+          </Picker>
+        </View>
+        <View>
+          <Button className='cancel' onClick={onClose}>取消</Button>
+          <Button className='btn' onClick={handelShare}>分享</Button>
+        </View>
+
+
+
+
+        {/* <mp-form  >
         <Label style={{color:'black'}}>请输入入住人信息</Label>
         <mp-cells    footer='  ' >
           <mp-cell title='入住人数：' extClass='font'>
@@ -49,10 +76,9 @@ export default (props) => {
           </mp-cell>
           <mp-cell>
             <Button className='cancel' onClick={onClose}>取消</Button><Button className='btn' onClick={handelShare}>分享</Button>
-            {/* <button className='button-OK' onClick={sumbit}>确定</button> */}
           </mp-cell>
         </mp-cells>
-      </mp-form>
+      </mp-form> */}
       </View>
 
 

src/hotel/components/shareRoom/ShareRoom.less

@@ -1,28 +1,59 @@
 .from-room{
-  padding-top: 30px;
-  .font{
-    font-size: 28px;
-    color: #202020;
+  padding-top: 60px;
+}
+.srl{
+  font-size: 30px;
+  font-weight: bold;
+  color: #202020;  
+  .mg{
+    font-size: 38px;
+    margin: 0 20px 50px 20px;
+  }
+  .rzline{
+    border-top: 2px #999 dashed;
+    height: 2px;
+    width: 80px;
+    display: inline-block;
+    margin-bottom: 8px;
   }
+  .srleft{
+    text-align: left;
+    Input{
+      height: 92px;
+      font-size: 28px;
+      color: #999;
+      background: #FEFEFE;
+      box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, 0.08);
+      margin-bottom: 40px;
+    }
+    .picker{
+      font-size: 28px;
+      color: #999;
+      line-height: 92px;
+      height: 92px;
+      background: #FEFEFE;
+      margin-bottom: 40px;
+      box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, 0.08);
+    }
+  }  
   .cancel{
-    width: 150px;
-    height: 70px;
+    color: #274290;
     display: inline-block;
-    line-height: 70px;
+    margin: 20px 20px 0 0;
+    width: 236px;
+    height: 78px;
+    border: 2px solid #274190;
     border-radius: 12px;
-    font-size: 36px;
-    margin-right: 20px;
   }
   .btn {
-    width: 150px;
-    height: 70px;
-    background: #1A3B83;
-    display: inline-block;
-    line-height: 70px;
+    width: 236px;
+    height: 78px;
+    background: #274291;
     border-radius: 12px;
-    font-size: 36px;
+    display: inline-block;
     color: #fff;
   }
 }
+
   
   

src/hotel/pages/landlord/addRoom/addRoom.jsx

@@ -3,11 +3,11 @@ import Taro from '@tarojs/taro'
 import CustomNav from '@/components/CustomNav'
 import { useEffect, useState } from "react"
 import './addRoom.less'
-import { saveRoom, getHotelDetail } from '@/services/landlord'
+import { saveRoom, getRoomDetail, updateRoom } from '@/services/landlord'
 
 
 export default withLayout((props) => {
-  const { hotelId, hotelName } = props.router.params
+  const { hotelId, hotelName, roomId } = props.router.params
   const [roomModel, setRoomModel] = useState({
     hotelId,
     roomName: '',
@@ -32,58 +32,68 @@ export default withLayout((props) => {
     })
   }
   const sumbit = () => {
-    if(
-    roomModel.roomName!=''&&
-    roomModel.address!=''&&
-    roomModel.location!=''&&
-    roomModel.weight!=''
-    )
-     { 
-      saveRoom(roomModel).then(() => {       
-          Taro.showModal({
-            title: '保存成功',
-            showCancel:false
-          }).then(() => {
-            Taro.navigateBack()
-          })
-      })       
-     } else{
-       Taro.showToast({
+    if (
+      roomModel.roomName != '' &&
+      roomModel.address != '' &&
+      roomModel.location != '' &&
+      roomModel.weight != ''
+    ) {
+      const seveices = roomId ? updateRoom : saveRoom
+      seveices(roomModel, roomId).then(() => {
+        Taro.showModal({
+          title: roomId ? '修改成功' : '保存成功',
+          showCancel: false
+        }).then(() => {
+          Taro.navigateBack()
+        })
+      })
+    } else {
+      Taro.showToast({
         title: '有必填项未填哦',
         icon: 'none',
       })
-     }
-      
+    }
   }
+
+  useEffect(() => {
+    if (roomId) {
+      getRoomDetail(roomId).then((res) => {
+        setRoomModel(res)
+      })
+    }
+  }, [])
+
+
+
   return (
     <view className='page-index'>
       <CustomNav title={hotelName} />
       <view className='from-room'  >
         <mp-form models={roomModel} >
           <mp-cells title='请填写新增的房源信息' footer='  ' >
-            <mp-cell prop='roomName' title='房屋名称：' extClass='font'>
-              <input focus dataField='roomName' onInput={(e) => setRoomModel({ ...roomModel, roomName: e.detail.value })} value={roomModel.roomName}  placeholder='请输入房屋名称（必填）' />
+            <mp-cell title='房屋名称：' extClass='font'>
+              <input onInput={(e) => setRoomModel({ ...roomModel, roomName: e.detail.value })} value={roomModel.roomName} placeholder='请输入房屋名称（必填）' />
             </mp-cell>
-            <mp-cell prop='address' title='位置信息：' extClass='font'>
-              <input dataField='address' onInput={(e) => setRoomModel({ ...roomModel, address: e.detail.value })} value={roomModel.address}  placeholder='请输入房屋位置（必填）' />
+            <mp-cell title='位置信息：' extClass='font'>
+              <input onInput={(e) => setRoomModel({ ...roomModel, address: e.detail.value })} value={roomModel.address} placeholder='请输入房屋位置（必填）' />
             </mp-cell>
-            <mp-cell prop='location' title='定位经纬度：' extClass='font'>
+            <mp-cell title='定位经纬度：' extClass='font'>
               <label onClick={onRoomMap}>{roomModel.location == '' ? '房间定位（必填）' : roomModel.location}</label>
             </mp-cell>
-            <mp-cell prop='parkingAddress' title='停车场位置：' extClass='font'>
-              <input dataField='parkingAddress' onInput={(e) => setRoomModel({ ...roomModel, parkingAddress: e.detail.value })} value={roomModel.parkingAddress}  placeholder='请输入停车场位置' />
+            <mp-cell title='停车场位置：' extClass='font'>
+              <input onInput={(e) => setRoomModel({ ...roomModel, parkingAddress: e.detail.value })} value={roomModel.parkingAddress} placeholder='请输入停车场位置' />
             </mp-cell>
-            <mp-cell prop='parkingLocation' title='定位经纬度：' extClass='font'>
+            <mp-cell title='定位经纬度：' extClass='font'>
               <label onClick={onParkMap}>{roomModel.parkingLocation == '' ? '停车场定位' : roomModel.parkingLocation}</label>
             </mp-cell>
-            <mp-cell prop='wifiName' title='Wi-Fi名称：' extClass='font'>
-              <input dataField='wifiName' onInput={(e) => setRoomModel({ ...roomModel, wifiName: e.detail.value })} value={roomModel.wifiName}  placeholder='请输入wifi名称' />
+            <mp-cell title='Wi-Fi名称：' extClass='font'>
+              <input onInput={(e) => setRoomModel({ ...roomModel, wifiName: e.detail.value })} value={roomModel.wifiName} placeholder='请输入wifi名称' />
             </mp-cell>
-            <mp-cell prop='wifiPassword' title='Wi-Fi密码：' extClass='font'>
-              <input dataField='wifiPassword' onInput={(e) => setRoomModel({ ...roomModel, wifiPassword: e.detail.value })} value={roomModel.wifiPassword}  placeholder='请输入wifi密码' />
+            <mp-cell title='Wi-Fi密码：' extClass='font'>
+              <input onInput={(e) => setRoomModel({ ...roomModel, wifiPassword: e.detail.value })} value={roomModel.wifiPassword} placeholder='请输入wifi密码' />
             </mp-cell>
-            <mp-cell prop='weight' title='权重：' extClass='font'>
-              <input type='number' dataField='weight'  onInput={(e) => setRoomModel({ ...roomModel, weight: e.detail.value })} placeholder='请输入权重（必填）' />
+            <mp-cell title='权重：' extClass='font'>
+              <input type='number' value={roomModel.weight} onInput={(e) => setRoomModel({ ...roomModel, weight: e.detail.value })} placeholder='请输入权重（必填）' />
             </mp-cell>
             <mp-cell>
               <button className='button-OK' onClick={sumbit}>确定</button>

src/hotel/pages/landlord/landlord.jsx

@@ -10,7 +10,6 @@ import onhouseImg from '@/assets/icons/landlord/房源管理按下.png'
 import withLayout from '@/layouts'
 import { getHotelManage, getAccountLogList, getNowHotelManage } from '@/services/landlord'
 import CustomNav from '@/components/CustomNav'
-
 import './landlord.less'
 
 export default withLayout((props) => {
@@ -20,7 +19,7 @@ export default withLayout((props) => {
 
   const [hotelList, setHotelList] = useState([])
   const [hotel, setHotel] = useState()
-  const [account, setAccount] = useState()
+  const [account, setAccount] = useState({})
   const [accountlog, setAccountLog] = useState([])
 
   const houseRef = useRef()

src/services/landlord.js

@@ -28,7 +28,7 @@ import request from '@/utils/request'
  * @param {*} params 
  * @returns 
  */
- export const getAccountLogList = (id) => request(`/hotel/account/${id}/log`)
+ export const getAccountLogList = (id,params) => request(`/hotel/account/${id}/log`, { params })
 
 /**
  * 房源列表
@@ -51,6 +51,20 @@ import request from '@/utils/request'
  */
   export const deleteRoom = (id) => request(`/taRoom/${id}`, { method: 'delete'})
 
+  /**
+ * 房源详情
+ * @param {*} id 
+ * @returns 
+ */
+ export const getRoomDetail = (id) => request(`/taRoom/${id}`)
+
+/**
+ * 更新房源
+ * @param {*} data 
+ * @returns 
+ */
+ export const updateRoom = (data, id) => request(`/taRoom/${id}`, { method: 'put', data })
+
 
 /**
  * 分享房源

src/shop/components/ShopKeeper/shopKeeper.jsx

@@ -126,7 +126,7 @@ export default (props) => {
     <view>
       <view>
       </view>
-      <ToggleRole showCutover={showCutover} onClose={onClose} role='shop' />
+      <ToggleRole showCutover={showCutover} maskClosable={showCutover} onClose={onClose} role='shop' />
       <view style={{ padding: '30rpx', height: '100%' }}>
         <scroll-view scroll-y scroll-view='true' bindscrolltoupper='upper' bindscrolltolower='lower' bindscroll='scroll' style={{ height: 'calc(100vh - 120px)' }}>
           <view className='storexx'>

src/shop/components/Sparead/spreadMoney.jsx

@@ -72,7 +72,7 @@ export default (props) => {
     <view>
       <view>
       </view>
-      <ToggleRole showCutover={showCutover} onClose={onClose} role='shop' />
+      <ToggleRole showCutover={showCutover} maskClosable={showCutover} onClose={onClose} role='shop' />
       <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'>