Browse Source

景点详情改好了

李志伟 3 years ago
parent
commit
73f15a6916

+ 30
- 0
src/hotel/components/Income/income.jsx View File

6
 import ToggleRole from '@/components/toggleRole/ToggleRole'
6
 import ToggleRole from '@/components/toggleRole/ToggleRole'
7
 import Picker from '@/components/Picker'
7
 import Picker from '@/components/Picker'
8
 import formatTime from "@/utils/formatTime";
8
 import formatTime from "@/utils/formatTime";
9
+import {getAccountLogList} from '@/services/landlord'
10
+
9
 import List from '@/components/List';
11
 import List from '@/components/List';
10
 import './income.less'
12
 import './income.less'
11
 
13
 
14
 export default (props) => {
16
 export default (props) => {
15
   const { hotelList, hotel, account, onHotelChange, accountlog } = props
17
   const { hotelList, hotel, account, onHotelChange, accountlog } = props
16
 
18
 
19
+  // const [accountLog,setAccountLog]=useState(accountlog)
20
+
21
+
22
+  // const [queryParams, setQueryParams] = useState({pageNum: 1, pageSize: 10})
23
+  // setQueryParams(hotel.hotelId)
24
+
17
   const handleHotelChange = (hotelId, current) => {
25
   const handleHotelChange = (hotelId, current) => {
18
     onHotelChange(current)
26
     onHotelChange(current)
19
   }
27
   }
61
         </view>
69
         </view>
62
 
70
 
63
         <view className='title' >{accountlog.length != '' ? '推广收入记录' : '暂无推广收入'}</view>
71
         <view className='title' >{accountlog.length != '' ? '推广收入记录' : '暂无推广收入'}</view>
72
+        
73
+        {/* <List
74
+                  style={{ height: '50vh' }}
75
+                  request={getAccountLogList}
76
+                  params={queryParams}
77
+                  onDataChange={setAccountLog}
78
+                >
79
+                  {
80
+                    (accountLog || []).map((item) =>
81
+                    <view className='spreadCard'>
82
+                      <view className='card'>
83
+                        <view className='spreadTime'>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间:<text>{formatTime(item.createDate, 'yyyy/MM/dd hh:mm:ss')}</text></view>
84
+                        <view className='spreadMoney'>收入金额:<text>{parseFloat((item.amount / 100).toFixed(2))}</text>元</view>
85
+                        <image className='spreadImg' src={sImg} />
86
+                      </view>
87
+                    </view>
88
+                    )
89
+                  }
90
+          </List> */}
91
+        
92
+        
93
+        
64
         <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" style={{ height: '50vh' }}>
94
         <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" style={{ height: '50vh' }}>
65
 
95
 
66
           {
96
           {

+ 10
- 13
src/pages/details/mjDetails/sceneryDetails.jsx View File

16
 import useLike from "@/utils/hooks/useLike"
16
 import useLike from "@/utils/hooks/useLike"
17
 import Cards from '@/components/foodCards/foodCards.jsx'
17
 import Cards from '@/components/foodCards/foodCards.jsx'
18
 import Taro,{ useShareAppMessage } from '@tarojs/taro'
18
 import Taro,{ useShareAppMessage } from '@tarojs/taro'
19
-import { getResourceList } from '@/services/home'
19
+import { getTouristDistance } from '@/services/home'
20
 import Extend from '../components/Extend/extend'
20
 import Extend from '../components/Extend/extend'
21
 import './sceneryDetails.less'
21
 import './sceneryDetails.less'
22
 
22
 
24
 
24
 
25
 export default withLayout((props) => {
25
 export default withLayout((props) => {
26
   const { router, person ,location } = props
26
   const { router, person ,location } = props
27
-  const { id, distance, loc } = props.router.params
27
+  const { id} = props.router.params
28
   const [detail, setDetail] = useState({})
28
   const [detail, setDetail] = useState({})
29
   const [isSaved, toggleSave] = useSave(detail.isSaved, 'tourist', id)
29
   const [isSaved, toggleSave] = useSave(detail.isSaved, 'tourist', id)
30
   const [isLike, toggleLike] = useLike(detail.isLike, 'tourist', id)
30
   const [isLike, toggleLike] = useLike(detail.isLike, 'tourist', id)
31
-
31
+  const [distance,setDistance]=useState()
32
+  const [tslocation,setTsLocation]=useState('')
32
   //banner图集数组
33
   //banner图集数组
33
   const [imglist, setimglist] = useState([])
34
   const [imglist, setimglist] = useState([])
34
   const [index, setIndex] = useState(0)
35
   const [index, setIndex] = useState(0)
66
   }
67
   }
67
   const log = useRef('')
68
   const log = useRef('')
68
   const lat = useRef('')
69
   const lat = useRef('')
69
-  const [queryParams, setQueryParams] = useState({ location: location, pageNum: 1, pageSize: 10, typeId: '',targetId:id  })
70
-  const [nloction,setNLoction]=useState()
71
-
72
   useEffect(() => {
70
   useEffect(() => {
73
     getTouristDetail(id).then((res) => {
71
     getTouristDetail(id).then((res) => {
74
       log.current = (res.locaton).toString().split(',')[0]
72
       log.current = (res.locaton).toString().split(',')[0]
82
       setAllextNum(res.total)
80
       setAllextNum(res.total)
83
       setNewextNum(res.records.length)
81
       setNewextNum(res.records.length)
84
     })
82
     })
85
-    getRecommendList({ location: loc }).then((res) => {
83
+    getTouristDistance('tourist',id,{location:location}).then((res)=>{
84
+      setDistance((res.distance / 1000).toFixed(2))
85
+      setTsLocation(res.lng + ',' + res.lat)
86
+    })    
87
+    getRecommendList({ location: tslocation }).then((res) => {
86
       setRecommend(res || [])
88
       setRecommend(res || [])
87
     })
89
     })
88
-    getResourceList(queryParams).then((res)=>{
89
-      console.log(queryParams)
90
-      console.log(res)
91
-    })
92
-  }, [])
93
-  
90
+  }, []) 
94
   // 分享
91
   // 分享
95
   useShareAppMessage(()=>{
92
   useShareAppMessage(()=>{
96
     return {
93
     return {

+ 1
- 1
src/pages/index/components/Card.js View File

16
   const Detail = () => {
16
   const Detail = () => {
17
     if (item.targetType == 'tourist') {
17
     if (item.targetType == 'tourist') {
18
       let loc = item.lng + ',' + item.lat
18
       let loc = item.lng + ',' + item.lat
19
-      Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}&distance=${(item.distance / 1000).toFixed(2)}&loc=${loc}` });
19
+      Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}` });
20
     }
20
     }
21
     else {
21
     else {
22
       Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.targetId}` })
22
       Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.targetId}` })

+ 7
- 0
src/services/home.js View File

103
  */
103
  */
104
 export const getTouristDetail = (id) => request(`/tourist/${id}`)
104
 export const getTouristDetail = (id) => request(`/tourist/${id}`)
105
 
105
 
106
+/**
107
+ * 获取景点距离定位 用于通过景点分享功能进入景点详情页的客户
108
+ * @param {*} id 
109
+ * @returns 
110
+ */
111
+ export const getTouristDistance = (targetType,targetId,params) => request(`/resource/${targetType}/${targetId}`,{params})
112
+
106
 /**
113
 /**
107
  * 获取推荐套餐列表
114
  * 获取推荐套餐列表
108
  * @returns 
115
  * @returns