feats

src/pages/details/mjDetails/sceneryDetails.jsx

@@ -16,6 +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 Extend from '../components/Extend/extend'
 import './sceneryDetails.less'
 

src/pages/index/components/Card.js

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

src/pages/index/tabs/Recommend.jsx

@@ -79,9 +79,7 @@ export default (props) => {
           </mp-tabs>
         </scroll-view>
       </view>
-      <scroll-view scroll-y='true' scroll-view='true'  	bindscrolltolower='lower' bindscrolltoupper='upper'	 bindscroll='scroll'
-      
-      >
+      <scroll-view scroll-y='true' scroll-view='true'  	bindscrolltolower='lower' bindscrolltoupper='upper'	style={{height:'100vh'}} bindscroll='scroll'>
         <view className='waterfall'>
           {
             alllist.map((item) => <Card key={item.resourceNo} item={item} />)

src/pages/search/search.jsx

@@ -37,21 +37,6 @@ export default withLayout((props) => {
                     {
                         hotList?.map((item) => <view onClick={()=>hotSearch(item.word)}>{item.word}</view>)
                     }
-                    {/* <view onClick={goLook}>小龙虾</view>
-                    <view>小笼包</view>
-                    <view>小笼包</view>
-                    <view>小笼包</view>
-                    <view>小笼包</view>
-                    <view>小笼包</view>
-                    <view>小笼包</view>
-                    <view>小笼包</view>
-                    <view>小笼包</view>
-                    <view>小笼包</view>
-                    <view>小笼包</view>
-                    <view>小笼包</view>
-                    <view>小笼包</view>
-                    <view>小笼包</view>
-                    <view>小笼包</view> */}
                 </view>
             </view>
 

src/pages/searchResult/searchResult.jsx

@@ -1,17 +1,10 @@
 import { React, useState, useEffect, } from 'react'
 // .就是当前路径
 import iconsearch from '../../assets/icons/housemantj/search.png'
-import msImage from '../../assets/icons/housemantj/ms.jpg'
-import mjImage from '../../assets/icons/housemantj/mj.jpg'
-import glImage from '../../assets/icons/housemantj/gl.jpg'
-import msTip from '../../assets/icons/housemantj/foodtip.png'
-import mjTip from '../../assets/icons/housemantj/mjtip.png'
-import glTip from '../../assets/icons/housemantj/gltip.png'
-import onlove from '../../assets/icons/housemantj/onlove.png'
 import CustomNav from '@/components/CustomNav'
 import Taro from '@tarojs/taro'
 import Card from '../index/components/Card'
-
+import {getResourceList } from '@/services/home'
 import './searchResult.less'
 import withLayout from '@/layouts'
 
@@ -21,7 +14,6 @@ export default withLayout((props) => {
   const { router, person,location } = props
   const { q} = props.router.params
 
-console.log(location,q)
   // 横向tab
   const [activeTab, setActiveTab] = useState(0)
   const [queryParams, setQueryParams] = useState({q:q, location: location, pageNum: 1, pageSize: 10, typeId: '' })
@@ -45,8 +37,12 @@ console.log(location,q)
     if (index == 0) {
       setQueryParams({q:q, location: location, pageNum: 1, pageSize: 10, typeId: '' })
     }
-    // else if(index==1){}
-    // else{}
+    else if(index==1){
+      setQueryParams({q:q,targetType:'shop', location: location, pageNum: 1, pageSize: 10, typeId: '' })      
+    }
+    else{
+      setQueryParams({q:q,targetType:'tourist', location: location, pageNum: 1, pageSize: 10, typeId: '' })
+    }
   }
 
 
@@ -69,7 +65,7 @@ console.log(location,q)
       <view className='index-navbar'>
         <CustomNav title='搜索' />
       </view>
-      <view style={{ height: '100%', overflow: 'auto' }}>
+      <view style={{ height: 'calc(100vh - 64rpx)', overflow: 'auto' }}>
         <view className='search'>
           <input className='searchInput' placeholder='请输入景区/城市搜索' disabled onClick={onSearch} />
           <image className='searchicon' src={iconsearch} />
@@ -87,7 +83,7 @@ console.log(location,q)
           </mp-tabs>
         </view>
 
-        <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" >
+        <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" style={{height:'100vh'}} >
           <view className="waterfall">
             {
               alllist?.map((item) => <Card key={item.resourceNo} item={item} />)

src/pages/searchResult/searchResult.less

@@ -53,6 +53,7 @@
         height:37px;
         position: absolute;
         left: 0;
+        top: 0;
       }
       .loveharde{
         width: 22px;