flx

src/components/CollectList/MyCollect/index.jsx

@@ -104,17 +104,16 @@ export default (props) => {
                   </view>
                 </view>
               </view>
-              <view class='right-complete-two'>
-                <view className='right-content' onClick={() => {
-                  if (item.targetType === "tourist") {
+              {/* if (item.targetType === "tourist") {
                     return Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}` });
                   } else {
-                    return Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?shop=${item.shopId}` });
+                    console.log(item.targetType);
 
-                  }
-                }}
-                >
+                    return Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}` });
 
+                  } */}
+              <view class='right-complete-two'>
+                <view className='right-content' onClick={() => { Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}` }) }}>
                   <image className='right-image' src={SeeDetails} />
                   <view className='right-title'>查看详情</view>
                 </view>

src/pages/MineUserAll/Collect/index.jsx

@@ -13,16 +13,6 @@ export default withLayout((props) => {
   const [collectContent, setCollectContent] = useState([])
   const [queryParams, setQueryParams] = useState({ location: location, pageNum: 1, pageSize: 10 })
 
-  // useEffect(() => {
-  //   getCollectList({
-  //     pageNum: 1,
-  //     pageSize: 99,
-  //     location: location,
-  //   }).then(val => {
-  //     setCollectContent(val.records)
-  //   })
-  // }, [location])
-
   return (
     <view className='page-index box-content'>
       <view className='index-navbar'>
@@ -46,14 +36,6 @@ export default withLayout((props) => {
           }
         </List>
       </view>
-      {/* <view >
-        {
-          collectContent.map((item, index) => { return <MyCollect key={(index)} item={item} /> })
-        }
-      </view>
-      <view className='foot'> 
-        已经到底了~
-      </view>*/}
     </view>
   )
 })

src/pages/index/index.jsx

@@ -3,19 +3,31 @@
 import React, { useState, useEffect } from 'react'
 import CustomNav from '@/components/CustomNav'
 import logo from '@/assets/icons/comm/logo_small.png'
+import { getNowHotelManage, getHotelDetail } from '@/services/landlord'
+import { getTaRoom, goToRoomForm, getWorkerDetail } from '@/services/taRoom​'
+
 import withLayout from '@/layouts'
 import tabList from './tabbar'
 import Guide from './tabs/Guide'
 import Mine from './tabs/Mine'
 import Recommend from './tabs/Recommend'
+
 import './index.less'
 
 
 
 export default withLayout((props) => {
   const { router, person, location } = props
+  const { roomId, roomOrderId } = router.params
+
   const { params, path } = router
   const { tab } = params || {}
+  const [extend, setExtend] = useState([])
+  //默认
+  const [titleRoom, setTitleRoom] = useState('十公里')
+  const [titleLogo, settitleLogo] = useState(logo)
+  const { hotelId } = extend
+
   const [currentTab, setCurrentTab] = useState(0)
   const handleTabChange = (e) => {
     const { index } = e.detail
@@ -26,10 +38,35 @@ export default withLayout((props) => {
       setCurrentTab(tab - 0)
     }
   }, [tab])
+
+  useEffect(() => {
+
+  }, [])
+
+  useEffect(() => {
+    if (roomId) {
+      getTaRoom(roomId).then((res) => {
+        setExtend(res)
+
+        getHotelDetail(hotelId).then((e) => {
+          setTitleRoom(e?.hotelName || '十公里')
+          settitleLogo(e?.logo || logo)
+        })
+      })
+
+
+    } else {
+
+    }
+
+
+  }, [roomId, hotelId])
+
+
   return (
     <view className='page-index'>
       <view className='index-navbar'>
-        <CustomNav logo={logo} title='十公里' />
+        <CustomNav logo={titleLogo} title={titleRoom} />
       </view>
       <view className='index-container'>
         {currentTab === 0 && <Recommend location={location} />}

src/pages/index/tabs/Guide.jsx

@@ -1,5 +1,7 @@
 import { useState, useEffect, useRef } from "react";
 import Taro from '@tarojs/taro'
+import CustomNav from '@/components/CustomNav'
+
 import MoreGuide from "@/components/MoreGuide";
 import BossCard from '@/components/BossCard'
 import Taxi from '@/assets/icons/GuideCheck/taxi.png'
@@ -20,7 +22,7 @@ import './GuideCss/style.less'
 
 
 export default (props) => {
-  const { router, person, location } = props
+  const { router, person, location, } = props
   const { roomId, roomOrderId } = router.params
   const [extend, setExtend] = useState([])
   const [ifroomId, setIfroomId] = useState('havenot')
@@ -60,6 +62,8 @@ export default (props) => {
 
 
 
+
+
   useEffect(() => {
     if (roomOrderId) {
       goToRoomForm(roomOrderId).then((res) => {
@@ -113,18 +117,7 @@ export default (props) => {
     if (taRoomContent?.parkingAddress === "") {
       setParkingButtonStyle('none')
     }
-    // if (extend.length === 0) {
-    //   setGuideStyle('none')
-    // }
-    // if (extend) {
-    //   extend.map(item => {
-    //     if (item.pages) {
-    //       setGuideStyle('none')
-    //     } else {
-    //       setGuideStyle('')
-    //     }
-    //   })
-    // }
+
 
   }, [roomId, RoomLocation])
 
@@ -168,11 +161,9 @@ export default (props) => {
 
 
 
-
   return (
     <scroll-view scroll-y style='height:100%;'  >
 
-
       <view className='Guide-Home-box'>
         {
           ifroomId === 'havenot' && (

src/services/landlord.js

@@ -6,7 +6,9 @@ import request from '@/utils/request'
  * @param {*} id 
  * @returns 
  */
-export const getHotelDetail = (id) => request(`/taHotel/${id}`)
+export const getHotelDetail = (id) => request(`/hotel/${id}`)
+
+
 
 /**
  * 查询指定名宿的账户
@@ -36,7 +38,7 @@ export const getHotelManage = (params) => request('/hotel/manage/index', { param
  * @param {*} params 
  * @returns 
  */
-export const getAccountLogList = (id,params) => request(`/hotel/account/${id}/log`,{params})
+export const getAccountLogList = (id, params) => request(`/hotel/account/${id}/log`, { params })
 
 /**
  * 房源列表

src/services/taRoom​.js

@@ -30,4 +30,6 @@ export const goToRoomForm = (id) => request(`/roomOrder/${id}`)
  * @returns 
  */
 
-export const personSubmit = (id, data) => request(`/room-order/${id}/person`, { method: 'post', data })
+export const personSubmit = (id, data) => request(`/room-order/${id}/person`, { method: 'post', data })
+
+