吃个甘蔗嚼一年 3 년 전
부모
커밋
1bf99f6d39

+ 6
- 7
src/components/CollectList/MyCollect/index.jsx 파일 보기

104
                   </view>
104
                   </view>
105
                 </view>
105
                 </view>
106
               </view>
106
               </view>
107
-              <view class='right-complete-two'>
108
-                <view className='right-content' onClick={() => {
109
-                  if (item.targetType === "tourist") {
107
+              {/* if (item.targetType === "tourist") {
110
                     return Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}` });
108
                     return Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}` });
111
                   } else {
109
                   } else {
112
-                    return Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?shop=${item.shopId}` });
110
+                    console.log(item.targetType);
113
 
111
 
114
-                  }
115
-                }}
116
-                >
112
+                    return Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}` });
117
 
113
 
114
+                  } */}
115
+              <view class='right-complete-two'>
116
+                <view className='right-content' onClick={() => { Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}` }) }}>
118
                   <image className='right-image' src={SeeDetails} />
117
                   <image className='right-image' src={SeeDetails} />
119
                   <view className='right-title'>查看详情</view>
118
                   <view className='right-title'>查看详情</view>
120
                 </view>
119
                 </view>

+ 0
- 18
src/pages/MineUserAll/Collect/index.jsx 파일 보기

13
   const [collectContent, setCollectContent] = useState([])
13
   const [collectContent, setCollectContent] = useState([])
14
   const [queryParams, setQueryParams] = useState({ location: location, pageNum: 1, pageSize: 10 })
14
   const [queryParams, setQueryParams] = useState({ location: location, pageNum: 1, pageSize: 10 })
15
 
15
 
16
-  // useEffect(() => {
17
-  //   getCollectList({
18
-  //     pageNum: 1,
19
-  //     pageSize: 99,
20
-  //     location: location,
21
-  //   }).then(val => {
22
-  //     setCollectContent(val.records)
23
-  //   })
24
-  // }, [location])
25
-
26
   return (
16
   return (
27
     <view className='page-index box-content'>
17
     <view className='page-index box-content'>
28
       <view className='index-navbar'>
18
       <view className='index-navbar'>
46
           }
36
           }
47
         </List>
37
         </List>
48
       </view>
38
       </view>
49
-      {/* <view >
50
-        {
51
-          collectContent.map((item, index) => { return <MyCollect key={(index)} item={item} /> })
52
-        }
53
-      </view>
54
-      <view className='foot'> 
55
-        已经到底了~
56
-      </view>*/}
57
     </view>
39
     </view>
58
   )
40
   )
59
 })
41
 })

+ 38
- 1
src/pages/index/index.jsx 파일 보기

3
 import React, { useState, useEffect } from 'react'
3
 import React, { useState, useEffect } from 'react'
4
 import CustomNav from '@/components/CustomNav'
4
 import CustomNav from '@/components/CustomNav'
5
 import logo from '@/assets/icons/comm/logo_small.png'
5
 import logo from '@/assets/icons/comm/logo_small.png'
6
+import { getNowHotelManage, getHotelDetail } from '@/services/landlord'
7
+import { getTaRoom, goToRoomForm, getWorkerDetail } from '@/services/taRoom​'
8
+
6
 import withLayout from '@/layouts'
9
 import withLayout from '@/layouts'
7
 import tabList from './tabbar'
10
 import tabList from './tabbar'
8
 import Guide from './tabs/Guide'
11
 import Guide from './tabs/Guide'
9
 import Mine from './tabs/Mine'
12
 import Mine from './tabs/Mine'
10
 import Recommend from './tabs/Recommend'
13
 import Recommend from './tabs/Recommend'
14
+
11
 import './index.less'
15
 import './index.less'
12
 
16
 
13
 
17
 
14
 
18
 
15
 export default withLayout((props) => {
19
 export default withLayout((props) => {
16
   const { router, person, location } = props
20
   const { router, person, location } = props
21
+  const { roomId, roomOrderId } = router.params
22
+
17
   const { params, path } = router
23
   const { params, path } = router
18
   const { tab } = params || {}
24
   const { tab } = params || {}
25
+  const [extend, setExtend] = useState([])
26
+  //默认
27
+  const [titleRoom, setTitleRoom] = useState('十公里')
28
+  const [titleLogo, settitleLogo] = useState(logo)
29
+  const { hotelId } = extend
30
+
19
   const [currentTab, setCurrentTab] = useState(0)
31
   const [currentTab, setCurrentTab] = useState(0)
20
   const handleTabChange = (e) => {
32
   const handleTabChange = (e) => {
21
     const { index } = e.detail
33
     const { index } = e.detail
26
       setCurrentTab(tab - 0)
38
       setCurrentTab(tab - 0)
27
     }
39
     }
28
   }, [tab])
40
   }, [tab])
41
+
42
+  useEffect(() => {
43
+
44
+  }, [])
45
+
46
+  useEffect(() => {
47
+    if (roomId) {
48
+      getTaRoom(roomId).then((res) => {
49
+        setExtend(res)
50
+
51
+        getHotelDetail(hotelId).then((e) => {
52
+          setTitleRoom(e?.hotelName || '十公里')
53
+          settitleLogo(e?.logo || logo)
54
+        })
55
+      })
56
+
57
+
58
+    } else {
59
+
60
+    }
61
+
62
+
63
+  }, [roomId, hotelId])
64
+
65
+
29
   return (
66
   return (
30
     <view className='page-index'>
67
     <view className='page-index'>
31
       <view className='index-navbar'>
68
       <view className='index-navbar'>
32
-        <CustomNav logo={logo} title='十公里' />
69
+        <CustomNav logo={titleLogo} title={titleRoom} />
33
       </view>
70
       </view>
34
       <view className='index-container'>
71
       <view className='index-container'>
35
         {currentTab === 0 && <Recommend location={location} />}
72
         {currentTab === 0 && <Recommend location={location} />}

+ 6
- 15
src/pages/index/tabs/Guide.jsx 파일 보기

1
 import { useState, useEffect, useRef } from "react";
1
 import { useState, useEffect, useRef } from "react";
2
 import Taro from '@tarojs/taro'
2
 import Taro from '@tarojs/taro'
3
+import CustomNav from '@/components/CustomNav'
4
+
3
 import MoreGuide from "@/components/MoreGuide";
5
 import MoreGuide from "@/components/MoreGuide";
4
 import BossCard from '@/components/BossCard'
6
 import BossCard from '@/components/BossCard'
5
 import Taxi from '@/assets/icons/GuideCheck/taxi.png'
7
 import Taxi from '@/assets/icons/GuideCheck/taxi.png'
20
 
22
 
21
 
23
 
22
 export default (props) => {
24
 export default (props) => {
23
-  const { router, person, location } = props
25
+  const { router, person, location, } = props
24
   const { roomId, roomOrderId } = router.params
26
   const { roomId, roomOrderId } = router.params
25
   const [extend, setExtend] = useState([])
27
   const [extend, setExtend] = useState([])
26
   const [ifroomId, setIfroomId] = useState('havenot')
28
   const [ifroomId, setIfroomId] = useState('havenot')
60
 
62
 
61
 
63
 
62
 
64
 
65
+
66
+
63
   useEffect(() => {
67
   useEffect(() => {
64
     if (roomOrderId) {
68
     if (roomOrderId) {
65
       goToRoomForm(roomOrderId).then((res) => {
69
       goToRoomForm(roomOrderId).then((res) => {
113
     if (taRoomContent?.parkingAddress === "") {
117
     if (taRoomContent?.parkingAddress === "") {
114
       setParkingButtonStyle('none')
118
       setParkingButtonStyle('none')
115
     }
119
     }
116
-    // if (extend.length === 0) {
117
-    //   setGuideStyle('none')
118
-    // }
119
-    // if (extend) {
120
-    //   extend.map(item => {
121
-    //     if (item.pages) {
122
-    //       setGuideStyle('none')
123
-    //     } else {
124
-    //       setGuideStyle('')
125
-    //     }
126
-    //   })
127
-    // }
120
+
128
 
121
 
129
   }, [roomId, RoomLocation])
122
   }, [roomId, RoomLocation])
130
 
123
 
168
 
161
 
169
 
162
 
170
 
163
 
171
-
172
   return (
164
   return (
173
     <scroll-view scroll-y style='height:100%;'  >
165
     <scroll-view scroll-y style='height:100%;'  >
174
 
166
 
175
-
176
       <view className='Guide-Home-box'>
167
       <view className='Guide-Home-box'>
177
         {
168
         {
178
           ifroomId === 'havenot' && (
169
           ifroomId === 'havenot' && (

+ 4
- 2
src/services/landlord.js 파일 보기

6
  * @param {*} id 
6
  * @param {*} id 
7
  * @returns 
7
  * @returns 
8
  */
8
  */
9
-export const getHotelDetail = (id) => request(`/taHotel/${id}`)
9
+export const getHotelDetail = (id) => request(`/hotel/${id}`)
10
+
11
+
10
 
12
 
11
 /**
13
 /**
12
  * 查询指定名宿的账户
14
  * 查询指定名宿的账户
36
  * @param {*} params 
38
  * @param {*} params 
37
  * @returns 
39
  * @returns 
38
  */
40
  */
39
-export const getAccountLogList = (id,params) => request(`/hotel/account/${id}/log`,{params})
41
+export const getAccountLogList = (id, params) => request(`/hotel/account/${id}/log`, { params })
40
 
42
 
41
 /**
43
 /**
42
  * 房源列表
44
  * 房源列表

+ 3
- 1
src/services/taRoom​.js 파일 보기

30
  * @returns 
30
  * @returns 
31
  */
31
  */
32
 
32
 
33
-export const personSubmit = (id, data) => request(`/room-order/${id}/person`, { method: 'post', data })
33
+export const personSubmit = (id, data) => request(`/room-order/${id}/person`, { method: 'post', data })
34
+
35
+