李志伟 3 years ago
parent
commit
f6345b508e

BIN
src/assets/icons/housemantj/dp.jpg View File


BIN
src/assets/icons/housemantj/fd.jpg View File


BIN
src/assets/icons/housemantj/gl.jpg View File


BIN
src/assets/icons/housemantj/mj.jpg View File


BIN
src/assets/icons/housemantj/mj2.jpg View File


BIN
src/assets/icons/housemantj/mj3.jpg View File


+ 1
- 0
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 Extend from '../components/Extend/extend'
20
 import Extend from '../components/Extend/extend'
20
 import './sceneryDetails.less'
21
 import './sceneryDetails.less'
21
 
22
 

+ 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 location = item.lng + ',' + item.lat
18
       let location = item.lng + ',' + item.lat
19
-      Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}&distance=${(item.distance / 1000).toFixed(2)}&location=${location}` });
19
+      Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}&distance=${(item.distance / 1000).toFixed(2)}&location2=${location}` });
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}` })

+ 1
- 3
src/pages/index/tabs/Recommend.jsx View File

79
           </mp-tabs>
79
           </mp-tabs>
80
         </scroll-view>
80
         </scroll-view>
81
       </view>
81
       </view>
82
-      <scroll-view scroll-y='true' scroll-view='true'  	bindscrolltolower='lower' bindscrolltoupper='upper'	 bindscroll='scroll'
83
-      
84
-      >
82
+      <scroll-view scroll-y='true' scroll-view='true'  	bindscrolltolower='lower' bindscrolltoupper='upper'	style={{height:'100vh'}} bindscroll='scroll'>
85
         <view className='waterfall'>
83
         <view className='waterfall'>
86
           {
84
           {
87
             alllist.map((item) => <Card key={item.resourceNo} item={item} />)
85
             alllist.map((item) => <Card key={item.resourceNo} item={item} />)

+ 0
- 15
src/pages/search/search.jsx View File

37
                     {
37
                     {
38
                         hotList?.map((item) => <view onClick={()=>hotSearch(item.word)}>{item.word}</view>)
38
                         hotList?.map((item) => <view onClick={()=>hotSearch(item.word)}>{item.word}</view>)
39
                     }
39
                     }
40
-                    {/* <view onClick={goLook}>小龙虾</view>
41
-                    <view>小笼包</view>
42
-                    <view>小笼包</view>
43
-                    <view>小笼包</view>
44
-                    <view>小笼包</view>
45
-                    <view>小笼包</view>
46
-                    <view>小笼包</view>
47
-                    <view>小笼包</view>
48
-                    <view>小笼包</view>
49
-                    <view>小笼包</view>
50
-                    <view>小笼包</view>
51
-                    <view>小笼包</view>
52
-                    <view>小笼包</view>
53
-                    <view>小笼包</view>
54
-                    <view>小笼包</view> */}
55
                 </view>
40
                 </view>
56
             </view>
41
             </view>
57
 
42
 

+ 9
- 13
src/pages/searchResult/searchResult.jsx View File

1
 import { React, useState, useEffect, } from 'react'
1
 import { React, useState, useEffect, } from 'react'
2
 // .就是当前路径
2
 // .就是当前路径
3
 import iconsearch from '../../assets/icons/housemantj/search.png'
3
 import iconsearch from '../../assets/icons/housemantj/search.png'
4
-import msImage from '../../assets/icons/housemantj/ms.jpg'
5
-import mjImage from '../../assets/icons/housemantj/mj.jpg'
6
-import glImage from '../../assets/icons/housemantj/gl.jpg'
7
-import msTip from '../../assets/icons/housemantj/foodtip.png'
8
-import mjTip from '../../assets/icons/housemantj/mjtip.png'
9
-import glTip from '../../assets/icons/housemantj/gltip.png'
10
-import onlove from '../../assets/icons/housemantj/onlove.png'
11
 import CustomNav from '@/components/CustomNav'
4
 import CustomNav from '@/components/CustomNav'
12
 import Taro from '@tarojs/taro'
5
 import Taro from '@tarojs/taro'
13
 import Card from '../index/components/Card'
6
 import Card from '../index/components/Card'
14
-
7
+import {getResourceList } from '@/services/home'
15
 import './searchResult.less'
8
 import './searchResult.less'
16
 import withLayout from '@/layouts'
9
 import withLayout from '@/layouts'
17
 
10
 
21
   const { router, person,location } = props
14
   const { router, person,location } = props
22
   const { q} = props.router.params
15
   const { q} = props.router.params
23
 
16
 
24
-console.log(location,q)
25
   // 横向tab
17
   // 横向tab
26
   const [activeTab, setActiveTab] = useState(0)
18
   const [activeTab, setActiveTab] = useState(0)
27
   const [queryParams, setQueryParams] = useState({q:q, location: location, pageNum: 1, pageSize: 10, typeId: '' })
19
   const [queryParams, setQueryParams] = useState({q:q, location: location, pageNum: 1, pageSize: 10, typeId: '' })
45
     if (index == 0) {
37
     if (index == 0) {
46
       setQueryParams({q:q, location: location, pageNum: 1, pageSize: 10, typeId: '' })
38
       setQueryParams({q:q, location: location, pageNum: 1, pageSize: 10, typeId: '' })
47
     }
39
     }
48
-    // else if(index==1){}
49
-    // else{}
40
+    else if(index==1){
41
+      setQueryParams({q:q,targetType:'shop', location: location, pageNum: 1, pageSize: 10, typeId: '' })      
42
+    }
43
+    else{
44
+      setQueryParams({q:q,targetType:'tourist', location: location, pageNum: 1, pageSize: 10, typeId: '' })
45
+    }
50
   }
46
   }
51
 
47
 
52
 
48
 
69
       <view className='index-navbar'>
65
       <view className='index-navbar'>
70
         <CustomNav title='搜索' />
66
         <CustomNav title='搜索' />
71
       </view>
67
       </view>
72
-      <view style={{ height: '100%', overflow: 'auto' }}>
68
+      <view style={{ height: 'calc(100vh - 64rpx)', overflow: 'auto' }}>
73
         <view className='search'>
69
         <view className='search'>
74
           <input className='searchInput' placeholder='请输入景区/城市搜索' disabled onClick={onSearch} />
70
           <input className='searchInput' placeholder='请输入景区/城市搜索' disabled onClick={onSearch} />
75
           <image className='searchicon' src={iconsearch} />
71
           <image className='searchicon' src={iconsearch} />
87
           </mp-tabs>
83
           </mp-tabs>
88
         </view>
84
         </view>
89
 
85
 
90
-        <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" >
86
+        <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" style={{height:'100vh'}} >
91
           <view className="waterfall">
87
           <view className="waterfall">
92
             {
88
             {
93
               alllist?.map((item) => <Card key={item.resourceNo} item={item} />)
89
               alllist?.map((item) => <Card key={item.resourceNo} item={item} />)

+ 1
- 0
src/pages/searchResult/searchResult.less View File

53
         height:37px;
53
         height:37px;
54
         position: absolute;
54
         position: absolute;
55
         left: 0;
55
         left: 0;
56
+        top: 0;
56
       }
57
       }
57
       .loveharde{
58
       .loveharde{
58
         width: 22px;
59
         width: 22px;