.

src/components/BossCard/style.less

@@ -281,7 +281,7 @@
         margin-top: 3em;
         background-color: #274190;
         border-radius: 12px;
-        width: 690px;
+        width: calc(100% - 60px);
         height: 92px;
         color: @whiteColor;
         // position: absolute;

src/components/CompoentsOrder/AlreadyUsed/style.less

@@ -314,7 +314,7 @@
 
     .button-box {
       margin: 60px 0;
-      width: 690px;
+      width: calc(100% - 60px);
       height: 88px;
       line-height: 88px;
       background: #274291;

src/components/CompoentsOrder/TobePaid/style.less

@@ -257,7 +257,7 @@
 
     .button-box {
       margin: 60px 0;
-      width: 690px;
+      width: calc(100% - 60px);
       height: 88px;
       line-height: 88px;
       background: #274291;

src/components/CompoentsOrder/TobeWritten/style.less

@@ -258,7 +258,7 @@
 
     .button-box {
       margin: 60px 0;
-      width: 690px;
+      width: calc(100% - 60px);
       height: 88px;
       line-height: 88px;
       background: #274291;

src/components/PayOrderCard/style.less

@@ -281,7 +281,7 @@
         margin-top: 3em;
         background-color: #274190;
         border-radius: 12px;
-        width: 690px;
+        width: calc(100% - 60px);
         height: 92px;
         color: @whiteColor;
         // position: absolute;

src/hotel/components/HouseManage/houseManage.jsx

@@ -1,17 +1,17 @@
-import Taro, {useDidShow } from '@tarojs/taro'
+import Taro, { useDidShow } from '@tarojs/taro'
 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 React,{useState, useEffect,useRef, useImperativeHandle } from 'react'
-import {getRoomList,deleteRoom} from '@/services/landlord'
+import React, { useState, useEffect, useRef, useImperativeHandle } from 'react'
+import { getRoomList, deleteRoom } from '@/services/landlord'
 import ShareRoom from '../shareRoom/ShareRoom.jsx'
 import ShareCard from '../shareCard/shareCard'
 import './houseManage.less'
 
 export default React.forwardRef((props, ref) => {
-  const {hotel}=props
+  const { hotel } = props
   const [detail, setDetail] = useState([])
 
   const shareDataRef = useRef()
@@ -19,17 +19,17 @@ export default React.forwardRef((props, ref) => {
   // 判断是否首次加载
   const mounted = useRef(false)
 
-  const handelClick=()=>{
+  const handelClick = () => {
     Taro.navigateTo({ url: `/hotel/pages/landlord/addRoom/addRoom?hotelId=${hotel.hotelId}&hotelName=${hotel.hotelName}` });
   }
-  const handelDelete=(roomId)=>{
-    deleteRoom(roomId).then(()=>{
+  const handelDelete = (roomId) => {
+    deleteRoom(roomId).then(() => {
       Taro.showToast({
         title: '删除房源成功',
         icon: 'none',
       })
-      getRoomList({hotelId:hotel.hotelId}).then((res)=>{
-        setDetail(res.records||[])
+      getRoomList({ hotelId: hotel.hotelId }).then((res) => {
+        setDetail(res.records || [])
       })
     })
   }
@@ -44,21 +44,21 @@ export default React.forwardRef((props, ref) => {
   const onClose = () => {
     setShowCutover(false)
   }
-  useEffect(()=>{
+  useEffect(() => {
     //首次加载页面时
     if (!mounted.current && hotel.hotelId) {
-      getRoomList({hotelId:hotel.hotelId}).then((res)=>{
-        setDetail(res.records||[])
+      getRoomList({ hotelId: hotel.hotelId }).then((res) => {
+        setDetail(res.records || [])
         mounted.current = true
       })
     }
-  },[hotel?.hotelId])
+  }, [hotel?.hotelId])
 
   //当前页面切换到前台时
   useDidShow(() => {
     if (mounted.current) {
-      getRoomList({hotelId:hotel.hotelId}).then((res)=>{
-        setDetail(res.records||[])
+      getRoomList({ hotelId: hotel.hotelId }).then((res) => {
+        setDetail(res.records || [])
       })
     }
   })
@@ -81,41 +81,38 @@ export default React.forwardRef((props, ref) => {
     // 打开分享弹窗
     setShowCard(true)
   }
-
+  const handelOrder = (val) => {
+    Taro.navigateTo({ url: `/hotel/pages/landlord/roomOrder/roomOrder?roomId=${val.roomId}&roomName=${val.roomName}` });
+  }
   return (
     <view>
       <view style={{ padding: '0 30rpx', height: '100%' }}>
-          <view className='search'>
-            <input className='searchInput' disabled />
-            <image className='searchicon' src={iconsearch} />
-            <view className="searchword">请输入关键字搜索</view>
-          </view>
-          <ShareRoom showCutover={showCutover} onClose={onClose}  room={room} onFinish={handleFinish} />
-          <ShareCard showCutover={showCard} onClose={onClose}/>
+        <view className='search'>
+          <input className='searchInput' disabled />
+          <image className='searchicon' src={iconsearch} />
+          <view className="searchword">请输入关键字搜索</view>
+        </view>
+        <ShareRoom showCutover={showCutover} onClose={onClose} room={room} onFinish={handleFinish} />
+        <ShareCard showCutover={showCard} onClose={onClose} />
         <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" style={{ height: 'calc(100vh - 255px)' }}>
-
-          <view>
-            {
-              detail?.map((item)=>
+          {
+            detail?.map((item) =>
               <view className='houseCard'>
-              <view className='houseName'>{item.roomName}</view>
-              <view className='operation'>
-                <view><image src={see} />查看入住人</view>
-                <view onClick={()=>ShowMoldeOn(item)}><image src={share}/>分享链接</view>
-                <view onClick={()=>{handelDelete(item.roomId)}}><image src={del} />删除房源</view>
+                <view className='houseName'>{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.roomId)}><image src={del} />删除房源</view>
+                </view>
               </view>
-            </view>
-              )
-            }
-            
-           
-          </view>
-        </scroll-view>        
+            )
+          }
+        </scroll-view>
       </view>
       <view className='addHouse' onClick={handelClick}>
         <image className='addImg' src={addImg} />添加房源
       </view>
-    
-      </view>
+
+    </view>
   )
 })

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

@@ -8,7 +8,7 @@
   display: inline;
 }
 button {
-  width: 690px;
+  width: calc(100% - 60px);
   height: 92px;
   background: #1A3B83;
   margin: 0 auto;

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

@@ -0,0 +1,6 @@
+export default {
+  navigationBarTitleText: '',
+  navigationStyle: 'custom',
+  usingComponents: {
+  }
+}

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

@@ -0,0 +1,78 @@
+import withLayout from '@/layouts'
+import React, { useState, useEffect, useRef } from 'react'
+import CustomNav from '@/components/CustomNav'
+import Taro from '@tarojs/taro'
+import copy from '@/assets/icons/landlord/复制.png'
+import { Input, Button, View, Picker, Label, Image } from '@tarojs/components'
+import { getRoomOrderList } from '@/services/landlord'
+import './roomOrder.less'
+
+
+
+
+export default withLayout((props) => {
+  const { roomId, roomName } = props.router.params
+  const [detail, setDetail] = useState([])
+  useEffect(() => {
+    getRoomOrderList({ roomId: roomId }).then((res) => {
+      setDetail(res.records || [])
+    })
+  }, [])
+  const CopyName = (val) => {
+    Taro.setClipboardData({
+      data: val,
+      success: e => {
+        Taro.showToast({
+          title: '入住人姓名已复制',
+          icon: 'success',
+          duration: 2000,
+        })
+      }
+    })
+  }
+  const CopyPhone = (val) => {
+    Taro.setClipboardData({
+      data: val,
+      success: e => {
+        Taro.showToast({
+          title: '入住人电话已复制',
+          icon: 'success',
+          duration: 2000,
+        })
+      }
+    })
+  }
+  return (
+    <View style={{ padding: '0 30px' }}>
+      <CustomNav title={roomName ? roomName : '房间名'} />
+      <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" style={{ height: 'calc(100vh - 65px)' }}>
+
+        {
+          detail.length==0?<View className='houseCard'>暂无入住人数据</View>
+           :detail?.map((item) =>
+            <View className='houseCard'>
+              {
+                item.personList?.map((item2) =>
+                  <View className='operation'>
+                    <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 className='operation'>入住时间：{item.startDate}  -  {item.endDate}</View>
+
+            </View>
+          )
+        }
+        
+      </scroll-view>
+    </View>
+  )
+})

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

@@ -0,0 +1,19 @@
+.houseCard{
+  background: #1A3B83;
+  border-radius: 60px;
+  padding: 40px 30px 41px 30px;
+  text-align: center;
+  margin: 30px 0;
+  font-size: 28px;
+  color: #fff;  
+  Image{
+    width: 35px;
+    height: 35px;
+    margin-left:40px;
+    position: relative;
+    top: 5px;
+  }
+  .operation{
+    margin: 10px 0;
+  }
+}

src/pages/MineUserAll/RefundMoney/CheckRefund/style.less

@@ -402,7 +402,7 @@
 
     .button-box {
       margin: 60px 0;
-      width: 690px;
+      width: calc(100% - 60px);
       height: 88px;
       line-height: 88px;
       background: #274291;

src/pages/PayOrder/style.less

@@ -281,7 +281,7 @@
         margin-top: 3em;
         background-color: #274190;
         border-radius: 12px;
-        width: 690px;
+        width: calc(100% - 60px);
         height: 92px;
         color: @whiteColor;
         // position: absolute;

src/pages/RoomOrder/style.less

@@ -1,5 +1,5 @@
 button {
-  width: 690px;
+  width: calc(100% - 60px);
   height: 92px;
   background: #1A3B83;
   margin: 0 auto;

src/pages/TobeShop/style.less

@@ -303,7 +303,7 @@
 
     .button-box {
       margin: 60px 0;
-      width: 690px;
+      width: calc(100% - 60px);
       height: 88px;
       line-height: 88px;
       background: #274291;

src/pages/index/index.jsx

@@ -14,13 +14,11 @@ import { getIndexType,  getResourceList } from '@/services/home'
 
 
 export default withLayout((props) => {
-  const { router, person } = props
+  const { router, person,location } = props
   const { params, path } = router
   const { tab } = params || {}
-
   const [currentTab, setCurrentTab] = useState(0)
 
-  const locRef = useRef()
 
 
   const handleTabChange = (e) => {
@@ -28,18 +26,7 @@ export default withLayout((props) => {
     setCurrentTab(index)
   }
 
-  const [queryParams, setQueryParams] = useState({ location: '', pageNum: 1, pageSize: 10, typeId: '' })
-
 
-  useEffect(() => {
-    getLocation().then((res) => {
-      locRef.current = `${res.longitude},${res.latitude}`
-      setQueryParams({
-        ...queryParams,
-        location: locRef.current
-      })
-    })  
-  }, [])
 
   useEffect(() => {
     if (tab) {
@@ -52,7 +39,7 @@ export default withLayout((props) => {
         <CustomNav logo={logo} title='十公里' />
       </view>
       <view className='index-container'>
-        {currentTab === 0 && <Recommend loc={locRef} qp={queryParams}/>}
+        {currentTab === 0 && <Recommend location={location} />}
         {currentTab === 1 && <Guide person={person} router={router} />}
         {/* {currentTab === 2 && <Strategy />} */}
         {currentTab === 2 && <Mine person={person} />}

src/pages/index/tabs/GuideCss/style.less

@@ -5,7 +5,7 @@
   width: 94%;
   margin: auto;
   .MessageCard {
-    width: 690px;
+    width: calc(100% - 60px);
     height: 175px;
     background: @whiteColor;
     border-radius: 12px;
@@ -135,7 +135,7 @@
 
   .articleCard {
     margin-top: 60px;
-    width: 690px;
+    width: calc(100% - 60px);
     // height: 1066px;
     background: #ffffff;
     border-radius: 12px;

src/pages/index/tabs/MineCss/style.less

@@ -169,7 +169,7 @@
   .Badge-box {
     margin-top: 30px;
     .Badge-list {
-      width: 690px;
+      width: calc(100% - 60px);
       height: 102px;
       background: #ffffff;
       box-shadow: 0px 4px 24px 0px rgba(0, 0, 0, 0.08);

src/pages/index/tabs/Recommend.jsx

@@ -11,20 +11,14 @@ import './less/Recommend.less'
 
 
 export default (props) => {
-  const { router, person, loc,qp } = props
+  const { router, person, location } = props
   const [activeTab, setActiveTab] = useState(0)
   const { params } = useRouter()
   const { tabJump } = params || {}
   const [typeList, setTypeList] = useState([])
   
-  const locRef = useRef(loc)
-  // if(locRef.current==null){
-  //     Taro.showLoading()
-  //   }
-  //   if (locRef.current!=null) {
-  //     Taro.hideLoading()
-  //   }
-  const [queryParams, setQueryParams] = useState(qp)
+  
+  const [queryParams, setQueryParams] = useState({ location: location, pageNum: 1, pageSize: 10, typeId: '' })
 
   // 获取资源表信息
   const [alllist, setAllList] = useState([])
@@ -40,35 +34,22 @@ export default (props) => {
       typeId: tab
     })
     if (index == 0) {
-      setQueryParams({ location:  locRef.current, pageNum: 1, pageSize: 10, typeId: '' })
+      setQueryParams({ location: location, pageNum: 1, pageSize: 10, typeId: '' })
     }
   }
 
-  useEffect(() => {
-    
+  useEffect(() => {    
     //查询分类标签表
     getIndexType({ pageSize: 20 }).then((res) => {
       setTypeList(res.records || [])
-    })
-    
+    })    
   }, [])
 
   useEffect(() => {
-    if (tabJump) {
-      // 更新 typeId
-      // 更新 分页
-    }
-    setActiveTab(tabJump - 0)
-  }, [tabJump])
-
-
-  useEffect(() => {
-    if (locRef.current) {
       getResourceList(queryParams).then((res) => {
         setAllList(res.records || [])
       })
-    }
-  }, [queryParams])
+    }, [queryParams])
 
   const onSearch = () => {
     // 用绝对路径

src/pages/index/tabs/less/Recommend.less

@@ -2,7 +2,7 @@
     padding: 10px 30px 0 30px;
     position: relative;
     .searchInput{    
-        width: 690px;
+        width: calc(100% - 60px);
         height: 68px;
         background: #F8F8F8;
         border-radius: 34px;

src/routes.js

@@ -80,6 +80,10 @@ const hotelPages = [
     title: '新增房源',
     page: 'pages/landlord/addRoom/addRoom',
   },
+  {
+    title: '查看入住人',
+    page: 'pages/landlord/roomOrder/roomOrder',
+  },
 ];
 
 // 所有的页面

src/services/landlord.js

@@ -57,4 +57,10 @@ import request from '@/utils/request'
  * @param {*} data 
  * @returns 
  */
- export const shareRoom = (data) => request('/roomOrder', { method: 'post', data })
+ export const shareRoom = (data) => request('/roomOrder', { method: 'post', data })
+ /**
+ * 查看历史入住人列表
+ * @param {*} id 
+ * @returns 
+ */
+  export const getRoomOrderList = (params) => request('/roomOrder',{params})