景点详情改好了

src/hotel/components/Income/income.jsx

@@ -6,6 +6,8 @@ import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
 import ToggleRole from '@/components/toggleRole/ToggleRole'
 import Picker from '@/components/Picker'
 import formatTime from "@/utils/formatTime";
+import {getAccountLogList} from '@/services/landlord'
+
 import List from '@/components/List';
 import './income.less'
 
@@ -14,6 +16,12 @@ import './income.less'
 export default (props) => {
   const { hotelList, hotel, account, onHotelChange, accountlog } = props
 
+  // const [accountLog,setAccountLog]=useState(accountlog)
+
+
+  // const [queryParams, setQueryParams] = useState({pageNum: 1, pageSize: 10})
+  // setQueryParams(hotel.hotelId)
+
   const handleHotelChange = (hotelId, current) => {
     onHotelChange(current)
   }
@@ -61,6 +69,28 @@ export default (props) => {
         </view>
 
         <view className='title' >{accountlog.length != '' ? '推广收入记录' : '暂无推广收入'}</view>
+        
+        {/* <List
+                  style={{ height: '50vh' }}
+                  request={getAccountLogList}
+                  params={queryParams}
+                  onDataChange={setAccountLog}
+                >
+                  {
+                    (accountLog || []).map((item) =>
+                    <view className='spreadCard'>
+                      <view className='card'>
+                        <view className='spreadTime'>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间：<text>{formatTime(item.createDate, 'yyyy/MM/dd hh:mm:ss')}</text></view>
+                        <view className='spreadMoney'>收入金额：<text>{parseFloat((item.amount / 100).toFixed(2))}</text>元</view>
+                        <image className='spreadImg' src={sImg} />
+                      </view>
+                    </view>
+                    )
+                  }
+          </List> */}
+        
+        
+        
         <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" style={{ height: '50vh' }}>
 
           {

src/pages/details/mjDetails/sceneryDetails.jsx

@@ -16,7 +16,7 @@ import useSave from "@/utils/hooks/useSave"
 import useLike from "@/utils/hooks/useLike"
 import Cards from '@/components/foodCards/foodCards.jsx'
 import Taro,{ useShareAppMessage } from '@tarojs/taro'
-import { getResourceList } from '@/services/home'
+import { getTouristDistance } from '@/services/home'
 import Extend from '../components/Extend/extend'
 import './sceneryDetails.less'
 
@@ -24,11 +24,12 @@ import './sceneryDetails.less'
 
 export default withLayout((props) => {
   const { router, person ,location } = props
-  const { id, distance, loc } = props.router.params
+  const { id} = props.router.params
   const [detail, setDetail] = useState({})
   const [isSaved, toggleSave] = useSave(detail.isSaved, 'tourist', id)
   const [isLike, toggleLike] = useLike(detail.isLike, 'tourist', id)
-
+  const [distance,setDistance]=useState()
+  const [tslocation,setTsLocation]=useState('')
   //banner图集数组
   const [imglist, setimglist] = useState([])
   const [index, setIndex] = useState(0)
@@ -66,9 +67,6 @@ export default withLayout((props) => {
   }
   const log = useRef('')
   const lat = useRef('')
-  const [queryParams, setQueryParams] = useState({ location: location, pageNum: 1, pageSize: 10, typeId: '',targetId:id  })
-  const [nloction,setNLoction]=useState()
-
   useEffect(() => {
     getTouristDetail(id).then((res) => {
       log.current = (res.locaton).toString().split(',')[0]
@@ -82,15 +80,14 @@ export default withLayout((props) => {
       setAllextNum(res.total)
       setNewextNum(res.records.length)
     })
-    getRecommendList({ location: loc }).then((res) => {
+    getTouristDistance('tourist',id,{location:location}).then((res)=>{
+      setDistance((res.distance / 1000).toFixed(2))
+      setTsLocation(res.lng + ',' + res.lat)
+    })    
+    getRecommendList({ location: tslocation }).then((res) => {
       setRecommend(res || [])
     })
-    getResourceList(queryParams).then((res)=>{
-      console.log(queryParams)
-      console.log(res)
-    })
-  }, [])
-  
+  }, []) 
   // 分享
   useShareAppMessage(()=>{
     return {

src/pages/index/components/Card.js

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

src/services/home.js

@@ -103,6 +103,13 @@ export const getExtendContent = (type, id, params) => request(`/${type}/${id}/co
  */
 export const getTouristDetail = (id) => request(`/tourist/${id}`)
 
+/**
+ * 获取景点距离定位 用于通过景点分享功能进入景点详情页的客户
+ * @param {*} id 
+ * @returns 
+ */
+ export const getTouristDistance = (targetType,targetId,params) => request(`/resource/${targetType}/${targetId}`,{params})
+
 /**
  * 获取推荐套餐列表
  * @returns