民宿房东端新增房源v1.1

src/components/Popup/index.jsx

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

src/components/SwitchSelect/index.jsx

@@ -1,41 +0,0 @@
-import Popup from '@/components/Popup'
-import Taro from '@tarojs/taro'
-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'
-
-const goToHotel = () => {
-  Taro.redirectTo({ url: '/hotel/pages/landlord/landlord' })
-}
-const goToShop = () => {
-  Taro.redirectTo({ url: '/shop/pages/spread/spreadIndex' })
-}
-
-export default (props) => {
-  const { show, maskClosable } = props
-
-  return (
-
-    <Popup show={show} maskClosable={maskClosable}>
-      <view className='User-box-sths' >
-        <view className='User-box-selectUser'>请选择身份：</view>
-        <view className='User-box-tourist' >
-          <image className='Ubs-tourist-image' src={touristON} />
-          <text className='Ubs-tourist-text'>游客</text>
-        </view>
-        <view className='User-box-hotelBoss' onClick={goToHotel}>
-          <image className='Ubs-hotelBoss-image' src={hotelBossOFF} />
-          <text className='Ubs-hotelBoss-text'>民宿老板</text>
-        </view>
-        <view className='User-box-shopBoss' onClick={goToShop}>
-          <image className='Ubs-shopBoss-image' src={shopBossOFF} />
-          <text className='Ubs-shopBoss-text'>店铺老板</text>
-        </view>
-      </view>
-    </Popup>
-  )
-}
-

src/components/toggleRoul/ToggleRoul.jsx → src/components/toggleRole/ToggleRole.jsx

@@ -8,25 +8,27 @@ import shopBossON from '@/assets/icons/UserCenter/shopBossON.png'
 import shopBossOFF from '@/assets/icons/UserCenter/shopBossOFF.png'
 
 import Popup from '@/components/Popup'
-import './ToggleRoul.less'
+import './ToggleRole.less'
 import { useModel } from '@/store'
 
 
 export default ( props)=>{
   const {showCutover, onClose }=props
-  const {getRoul}=useModel('person')
+  const {getRole}=useModel('person')
   const goToPerson=()=>{
-    getRoul('normal')
+    getRole('normal')
   }
   const goToHotel=()=>{
-    getRoul('hotel')
+    getRole('hotel')
   }
   const goToShop=()=>{
-    getRoul('shop')
+    getRole('shop')
+  }
+  const onClose2=()=>{
+    console.log('2222222222222222222')
   }
-
     return (      
-      <Popup show={showCutover} onClose={onClose}>
+      <Popup show={showCutover} onClose={onClose2}>
           <view className='User-box-sths' >
             <view className='User-box-selectUser'>请选择身份：</view>
             <view className='User-box-tourist' onClick={goToPerson}>

src/components/Landlord/HouseManage/houseManage.jsx → src/hotel/components/HouseManage/houseManage.jsx

@@ -5,27 +5,49 @@ 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 {useState, useEffect,useRef } from 'react'
+import {useDidShow } from '@tarojs/taro'
 import {getRoomList} from '@/services/landlord'
 
 
 export default (props) => {
   const {hotel}=props
   const [detail, setDetail] = useState([])
+  // 判断是否首次加载
+  const mounted = useRef(false)
+
+  const handelClick=()=>{
+    Taro.navigateTo({ url: `/hotel/pages/landlord/addRoom/addRoom?hotelId=${hotel.hotelId}&hotelName=${hotel.hotelName}` });
+  }
   useEffect(()=>{
-    getRoomList({hotelId:hotel.hotelId}).then((res)=>{
-      setDetail(res.records||[])
-    })
-  },[hotel])
+    //首次加载页面时
+    if (!mounted.current && hotel.hotelId) {
+      getRoomList({hotelId:hotel.hotelId}).then((res)=>{
+        setDetail(res.records||[])
+        mounted.current = true
+      })
+    }
+  },[hotel?.hotelId])
+
+  //当前页面切换到前台时
+  useDidShow(() => {
+    if (mounted.current) {
+      getRoomList({hotelId:hotel.hotelId}).then((res)=>{
+        setDetail(res.records||[])
+      })
+    }
+  })
+
   return (
     <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='search'>
             <input className='searchInput' disabled />
             <image className='searchicon' src={iconsearch} />
             <view className="searchword">请输入关键字搜索</view>
           </view>
+        <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" style={{ height: 'calc(100vh - 255px)' }}>
+
           <view>
             {
               detail?.map((item)=>
@@ -44,7 +66,7 @@ export default (props) => {
           </view>
         </scroll-view>        
       </view>
-      <view className='addHouse'>
+      <view className='addHouse' onClick={handelClick}>
         <image className='addImg' src={addImg} />添加房源
       </view>
     

src/components/Landlord/HouseManage/houseManage.less → src/hotel/components/HouseManage/houseManage.less

@@ -1,6 +1,6 @@
 
 .search{
-  padding: 40px 0  30px 0;
+  padding: 40px 0 15px 0;
   position: relative;
   .searchInput{    
     height: 68px;
@@ -21,7 +21,7 @@
     color: #C0C8D3;
     position: absolute;
     left: calc(50% - 100px);
-    bottom: 60px;
+    bottom: 45px;
   }
 }
 .houseCard{
@@ -30,6 +30,7 @@
   border-radius: 12px;
   padding: 40px 30px 41px 30px;
   text-align: center;
+  margin: 30px 0;
   .houseName{
     height: 122px;
     font-size: 32px;
@@ -64,7 +65,7 @@
   text-align: center;
   line-height: 88px;
   position: absolute;
-  bottom: 178px;
+  bottom: 30px;
   image{
     width: 32px;
     height: 32px;

src/components/Landlord/Income/income.jsx → src/hotel/components/Income/income.jsx

@@ -1,10 +1,10 @@
 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 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 ToggleRoul from '@/components/toggleRoul/ToggleRoul'
+import ToggleRole from '@/components/toggleRole/ToggleRole'
 import Picker from '@/components/Picker'
 
 export default (props) => {
@@ -27,11 +27,12 @@ export default (props) => {
     setShowCutover(true)
   }
   const onClose = () => {
+    console.log('11111111')
     setShowCutover(false)
   }
   return (
     <view>
-      <ToggleRoul showCutover={showCutover} onClose={onClose} />
+      <ToggleRole 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'>

src/hotel/pages/landlord/addRoom/addRoom.config.js

@@ -0,0 +1,9 @@
+export default {
+  navigationBarTitleText: '',
+  navigationStyle: 'custom',
+  usingComponents: {
+    "mp-cells": "weui-miniprogram/cells/cells",
+    "mp-cell": "weui-miniprogram/cell/cell",
+    "mp-form": "weui-miniprogram/form/form"
+  }
+}

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

@@ -0,0 +1,89 @@
+import withLayout from '@/layouts'
+import Taro from '@tarojs/taro'
+import CustomNav from '@/components/CustomNav'
+import { useEffect, useState } from "react"
+import './addRoom.less'
+import { saveRoom, getHotelDetail } from '@/services/landlord'
+
+
+export default withLayout((props) => {
+  const { hotelId, hotelName } = props.router.params
+  const [roomModel, setRoomModel] = useState({
+    hotelId,
+    roomName: '',
+    address: '',
+    location: '',
+    parkingAddress: '',
+    parkingLocation: '',
+    wifiName: '',
+    wifiPassword: '',
+    weight: '',
+  })
+  const onRoomMap = () => {
+    Taro.chooseLocation().then((res) => {
+      setRoomModel({ ...roomModel, location: res.longitude + ',' + res.latitude })
+
+    })
+  }
+  const onParkMap = () => {
+    Taro.chooseLocation().then((res) => {
+      setRoomModel({ ...roomModel, parkingLocation: res.longitude + ',' + res.latitude })
+
+    })
+  }
+  const sumbit = () => {
+    //判断每一项是否为空Object.values(roomModel).filter返回一个数组如果有空属性就是数组长度就不为0
+    Object.values(roomModel).filter(item => item == '').length != 0 ?
+      Taro.showToast({
+        title: '每一项都是必填项哦',
+        icon: 'none',
+      }) :
+      saveRoom(roomModel).then(() => {
+       
+          Taro.showToast({
+            title: '保存成功',
+            icon: 'success',
+          }).then(() => {
+            Taro.navigateBack()
+          })
+      })
+  }
+  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>
+            <mp-cell prop='address' title='位置信息：' extClass='font'>
+              <input dataField='address' onInput={(e) => setRoomModel({ ...roomModel, address: e.detail.value })} value={roomModel.address}  placeholder='请输入房屋位置' />
+            </mp-cell>
+            <mp-cell prop='location' 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>
+            <mp-cell prop='parkingLocation' 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>
+            <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>
+            <mp-cell prop='weight' title='权重：' extClass='font'>
+              <input type='number' dataField='weight'  onInput={(e) => setRoomModel({ ...roomModel, weight: e.detail.value })} placeholder='请输入权重' />
+            </mp-cell>
+            <mp-cell>
+              <button className='button-OK' onClick={sumbit}>确定</button>
+            </mp-cell>
+          </mp-cells>
+        </mp-form>
+      </view>
+    </view>
+  )
+})

src/hotel/pages/landlord/addRoom/addRoom.less

@@ -0,0 +1,23 @@
+.from-room{
+  width: 100%;
+  box-shadow: 0px 8px 32px 0px rgba(0, 0, 0, 0.08);
+  border-radius: 24px;
+  
+}
+.weui-agree .weui-agree__text {
+  display: inline;
+}
+button {
+  width: 690px;
+  height: 92px;
+  background: #1A3B83;
+  margin: 0 auto;
+  line-height: 92px;
+  border-radius: 12px;
+  font-size: 40px;
+  color: #ffffff;
+}
+.font{
+  font-size: 28px;
+    color: #202020;
+}

src/hotel/pages/landlord/landlord.config.js

@@ -5,6 +5,5 @@ export default {
   usingComponents: {
     "mp-tabbar": "weui-miniprogram/tabbar/tabbar",
     "mp-dialog": "weui-miniprogram/dialog/dialog"
-
   }
 }

src/hotel/pages/landlord/landlord.jsx

@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from 'react'
 import { useRouter } from '@tarojs/taro'
-import HouseManage from '@/components/Landlord/HouseManage/houseManage'
-import Income from '@/components/Landlord/Income/income'
+import HouseManage from '../../components/HouseManage/houseManage'
+import Income from '../../components/Income/income'
 import TabBar from '@/components/CustTabBar'
 import incomeImg from '@/assets/icons/landlord/我的收入.png'
 import onincomeImg from '@/assets/icons/landlord/我的收入按下.png'

src/pages/index/tabs/Mine.jsx

@@ -15,12 +15,11 @@ import collect from '@/assets/icons/UserCenter/collect.png'
 import Rules from '@/assets/icons/UserCenter/Rules.png'
 import DefaultImage from '@/assets/icons/UserCenter/DefaultImage.png'
 import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
-import SwitchSelect from '@/components/SwitchSelect'
 import { PaysOrder, getMineOrder } from '@/services/payOrder' //创建订单
 
 import { useModel } from '@/store'
 import './MineCss/style.less'
-import  ToggleRoul  from  '@/components/toggleRoul/ToggleRoul'
+import  ToggleRole  from  '@/components/toggleRole/ToggleRole'
 
 
 
@@ -118,7 +117,7 @@ export default (props) => {
 
       <view className='User-box'>
         {/* 身份切换 */}
-        <ToggleRoul showCutover={showCutover} onClose={onClose} />
+        <ToggleRole showCutover={showCutover} onClose={onClose} />
         <view className='User-info'>
           <view className='User-photos-box'>
             <image src={person.avatar || { DefaultImage }} className='User-photos' />

src/routes.js

@@ -63,7 +63,7 @@ const mainPages = [
 // 商户管理页面shop/pages/spread/spreadIndex
 const shopPages = [
   {
-    title: '商铺管理',
+    title: '商铺管理',  
     page: 'pages/spread/spreadIndex',
     isIndex: true,
   },
@@ -76,6 +76,10 @@ const hotelPages = [
     page: 'pages/landlord/landlord',
     isIndex: true,
   },
+  {
+    title: '新增房源',
+    page: 'pages/landlord/addRoom/addRoom',
+  },
 ];
 
 // 所有的页面

src/services/landlord.js

@@ -7,8 +7,6 @@ import request from '@/utils/request'
  * @returns 
  */
  export const getHotelDetail = (id) => request(`/taHotel/${id}`)
-
-
  
 /**
  * 查询指定名宿的账户
@@ -39,6 +37,13 @@ import request from '@/utils/request'
  */
  export const getRoomList = (params) => request('/taRoom',{params})
 
+/**
+ * 保存房源
+ * @param {*} data 
+ * @returns 
+ */
+ export const saveRoom = (data) => request('/taRoom', { method: 'post', data })
+
  /**
  * 删除房源
  * @param {*} data 
@@ -53,9 +58,4 @@ import request from '@/utils/request'
  * @returns 
  */
 export const getRoomDetail = (id) => request(`/taRoom/${id}`)
-/**
- * 保存房源
- * @param {*} data 
- * @returns 
- */
- export const saveRoom = (data) => request('/taRoom', { method: 'post', data })
+

src/services/person.js

@@ -26,4 +26,4 @@ export const authAvatar = (data) => request('/auth-user', { data, method: 'put'
  * @param {*} data 
  * @returns 
  */
-  export const toggleRoul = (targetType) => request(`/person-role/${targetType}`,{ method: 'post'})
+  export const toggleRole = (targetType) => request(`/person-role/${targetType}`,{ method: 'post'})

src/components/spreads/ShopKeeper/shopKeeper.jsx → src/shop/components/ShopKeeper/shopKeeper.jsx

@@ -14,7 +14,7 @@ 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 './shopKeeper.less'
-import  ToggleRoul  from  '@/components/toggleRoul/ToggleRoul'
+import  ToggleRole  from  '@/components/toggleRole/ToggleRole'
 
 
 export default (props) => {
@@ -53,7 +53,7 @@ export default (props) => {
       <view>
         <CustomNav title='十公里' />
       </view>
-      <ToggleRoul showCutover={showCutover} onClose={onClose} />
+      <ToggleRole 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)' }}>

src/components/spreads/Sparead/spreadMoney.jsx → src/shop/components/Sparead/spreadMoney.jsx

@@ -9,7 +9,7 @@ import touristOFF from '@/assets/icons/UserCenter/touristOFF.png'
 import hotelBossOFF from '@/assets/icons/UserCenter/hotelBossOFF.png'
 import shopBossON from '@/assets/icons/UserCenter/shopBossON.png'
 import './spreadMoney.less'
-import  ToggleRoul  from  '@/components/toggleRoul/ToggleRoul'
+import  ToggleRole  from  '@/components/toggleRole/ToggleRole'
 
 export default (props) => {
 
@@ -26,7 +26,7 @@ export default (props) => {
       <view>
         <CustomNav title='十公里' />
       </view>
-      <ToggleRoul showCutover={showCutover} onClose={onClose} />
+      <ToggleRole 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'>

src/shop/pages/spread/spreadIndex.jsx

@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from 'react'
 import { useRouter } from '@tarojs/taro'
-import ShopKeeper from '@/components/spreads/ShopKeeper/shopKeeper'
-import Sparead from '@/components/spreads/Sparead/spreadMoney'
+import ShopKeeper from '../../components/ShopKeeper/shopKeeper'
+import Sparead from '../../components/Sparead/spreadMoney'
 import TabBar from '@/components/CustTabBar'
 import shopImg from '@/assets/icons/shopKeeper/订单收入.png'
 import onShopImg from '@/assets/icons/shopKeeper/订单收入按下.png'

src/store/models/person.js

@@ -1,6 +1,6 @@
 import { useState } from "react"
 import Taro from '@tarojs/taro'
-import { signIn, authPhone, authAvatar,toggleRoul } from '@/services/person'
+import { signIn, authPhone, authAvatar,toggleRole } from '@/services/person'
 
 export default () => {
   const [person, setPerson] = useState()
@@ -36,8 +36,8 @@ export default () => {
     })
   }
 
-  const getRoul = (data) => {
-    return toggleRoul(data).then((res) => {
+  const getRole = (data) => {
+    return toggleRole(data).then((res) => {
       setPerson(res);
     })
   }
@@ -49,6 +49,6 @@ export default () => {
     login,
     getPhone,
     getAvatar,
-    getRoul
+    getRole
   }
 }