.

src/components/foodCards/style.less

@@ -3,6 +3,7 @@
   box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
   border-radius: 12px;
   position: relative;
+  margin: 15px 5px;
   margin-bottom: 30px;
   overflow: hidden;
   background: radial-gradient(circle at 82% top,transparent 20px,#fff 0) top,

src/pages/index/tabs/Recommend.jsx

@@ -1,20 +1,16 @@
-import Taro, { useRouter } from '@tarojs/taro'
-import { React, useState, useEffect, useRef } from 'react'
+import Taro from '@tarojs/taro'
+import { React, useState, useEffect } from 'react'
 import iconsearch from '@/assets/icons/housemantj/search.png'
 import locationimg from '@/assets/icons/housemantj/location.png'
 import Tip from '@/components/tip'
 import { getIndexType,  getResourceList } from '@/services/home'
 import Card from '../components/Card'
-import { getLocation } from '@/utils/location'
-
 import './less/Recommend.less'
 
 
 export default (props) => {
   const { router, person, location } = props
   const [activeTab, setActiveTab] = useState(0)
-  const { params } = useRouter()
-  const { tabJump } = params || {}
   const [typeList, setTypeList] = useState([])
   
   
@@ -56,9 +52,6 @@ export default (props) => {
     Taro.navigateTo({ url: '/pages/search/search' });
   }
 
-
-
-  
   return (
     <view style={{ height: '100%', overflow: 'auto' }}>
       <view className='search' onClick={onSearch}>

src/pages/search/search.config.js

@@ -1,4 +1,7 @@
 export default {
     navigationBarTitleText: '搜索',
     navigationStyle: 'custom',
+    usingComponents: {
+      "mp-searchbar": "weui-miniprogram/searchbar/searchbar", 
+    },
   }

src/pages/search/search.jsx

@@ -1,33 +1,43 @@
-import React from 'react'
-import iconsearch from '../../assets/icons/housemantj/search.png'
-import './search.less'
 import CustomNav from '@/components/CustomNav'
-import '../index/index.less'
 import Taro from '@tarojs/taro'
 import withLayout from '@/layouts'
+import { getIndexSearch } from '@/services/home'
+import { useEffect, useState } from 'react'
+import SearchBar from '@/components/SearchBar'
+import './search.less'
+
 
 export default withLayout((props) => {
-    const { router, person } = props
-    const goLook=()=>{
-        Taro.navigateTo({ url:'/pages/searchResult/searchResult'});
+    const { router, person } = props    
+    const [hotList, setHotList] = useState([])
+    const hotSearch = (val) => {
+        Taro.navigateTo({ url: `/pages/searchResult/searchResult?q=${val}` });
     }
-    
-return (
+    const onSearch = (e) => {
+        if (e.detail.value !== '') {
+            Taro.navigateTo({ url: `/pages/searchResult/searchResult?q=${e.detail.value}` });
+        }
+    }
+    useEffect(() => {
+        getIndexSearch().then((res) => {
+            setHotList(res || [])
+        })
+    }, [])
+    return (
         <view className='page-index'>
             <view className='index-navbar'>
-                <CustomNav title='搜索' />                 
-            </view>
-            
-            <view className='search'>
-                <input className='searchInput' placeholder='请输入景区/城市搜索'/>
-                <image className='searchicon' src={iconsearch} />
-                <view className='lineSearch'></view>
+                <CustomNav title='搜索' />
             </view>
+
+            <SearchBar placeholder='请输入景区/城市搜索' onBlur={onSearch} />
+
             <view className='content'>
                 <view className='hotSearch'>热门搜索</view>
                 <view className='hotSearchtip'>
-                    <view onClick={goLook}>小龙虾</view>
-                    <view>小笼包</view>
+                    {
+                        hotList?.map((item) => <view onClick={()=>hotSearch(item.word)}>{item.word}</view>)
+                    }
+                    {/* <view onClick={goLook}>小龙虾</view>
                     <view>小笼包</view>
                     <view>小笼包</view>
                     <view>小笼包</view>
@@ -41,8 +51,9 @@ return (
                     <view>小笼包</view>
                     <view>小笼包</view>
                     <view>小笼包</view>
+                    <view>小笼包</view> */}
                 </view>
-            </view>  
+            </view>
 
         </view>
     )

src/pages/search/search.less

@@ -1,31 +1,3 @@
-.search{
-  padding: 10px 30px 0 30px;
-  position: relative;
-  .searchInput{    
-      height: 68px;
-      background: #F8F8F8;
-      border-radius: 34px;
-      padding-left: 86px;
-      box-sizing: border-box;
-      font-size: 24px;
-  }
-  .searchicon{
-    width: 25px;
-    height: 25px;
-    position: absolute;
-    bottom: 21px;
-    left: 50px;
-  }
-  .lineSearch{      
-    position: absolute;
-    bottom: 19px;
-    left: 95px;
-    width: 1px;
-    height: 28px;
-    background: #000;
-    opacity: 0.2;
-  }    
-}
 .content{
   padding: 60px 30px;
   .hotSearch{

src/pages/searchResult/searchResult.jsx

@@ -1,7 +1,6 @@
 import { React, useState, useEffect, } from 'react'
 // .就是当前路径
 import iconsearch from '../../assets/icons/housemantj/search.png'
-import location from '../../assets/icons/housemantj/location.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'
@@ -10,45 +9,44 @@ 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, { useRouter } from '@tarojs/taro'
+import Taro from '@tarojs/taro'
+import Card from '../index/components/Card'
+
 import './searchResult.less'
 import withLayout from '@/layouts'
 
 
 
 export default withLayout((props) => {
-  const { router, person } = props
+  const { router, person,location } = props
+  const { q} = props.router.params
 
+console.log(location,q)
   // 横向tab
   const [activeTab, setActiveTab] = useState(0)
-  const { params } = useRouter()
-  const { tabJump } = params || {}
-  useEffect(() => {
-    if (tabJump) {
-      setActiveTab(tabJump - 0)
-    }
-  }, [tabJump])
+  const [queryParams, setQueryParams] = useState({q:q, location: location, pageNum: 1, pageSize: 10, typeId: '' })
 
+  // 获取资源表信息
+  const [alllist, setAllList] = useState([])
   const tabs = [
     {
       title: '全部',
     },
     {
       title: '美食',
-
     },
     {
       title: '景点',
-
-    },
-    {
-      title: '攻略',
-
     },
   ]
   const handleTabChange = (e) => {
     const { index } = e.detail
     setActiveTab(index)
+    if (index == 0) {
+      setQueryParams({q:q, location: location, pageNum: 1, pageSize: 10, typeId: '' })
+    }
+    // else if(index==1){}
+    // else{}
   }
 
 
@@ -58,7 +56,11 @@ export default withLayout((props) => {
     Taro.navigateTo({ url: '/pages/search/search' });
   }
 
-
+  useEffect(() => {
+    getResourceList(queryParams).then((res) => {
+      setAllList(res.records || [])
+    })
+  }, [queryParams])
 
 
 
@@ -87,221 +89,9 @@ export default withLayout((props) => {
 
         <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" >
           <view className="waterfall">
-
-            {activeTab === 0 && <>
-              <view className='contentCard'>
-                <view className='cardTop'>
-                  <image mode='widthFix' src={msImage} className='cCardimg' />
-                  <image className='lefttips' src={msTip} />
-                  <image src={onlove} className='loveharde'></image>
-                </view>
-                <view className='bContent'>
-                  <view className='cCword'>
-                    超划算套餐？这么便宜也是第一次见6荤6素1...
-                  </view>
-                  <view className='cCleft'>
-                    <image src={location} className='cCicon'></image>
-                    <view className='distance'><text>9.99</text>公里</view>
-                  </view>
-                  <view className='cCright'>
-                    <view className='money'>￥</view>
-                    <view className='price'><text>999</text>/人</view>
-                  </view>
-                </view>
-              </view>
-              <view className='contentCard'>
-                <view className='cardTop'>
-                  <image mode='widthFix' src={mjImage} className='cCardimg' />
-                  <image className='lefttips' src={mjTip} />
-                  <image src={onlove} className='loveharde'></image>
-                </view>
-                <view className='bContent'>
-                  <view className='cCword'>
-                    超划算套餐？这么便宜也是第一次见6荤6素1...
-                  </view>
-                  <view className='cCleft'>
-                    <image src={location} className='cCicon'></image>
-                    <view className='distance'><text>9.99</text>公里</view>
-                  </view>
-                  <view className='cCright'>
-                    <view className='money'>￥</view>
-                    <view className='price'><text>999</text>/人</view>
-                  </view>
-                </view>
-              </view>
-              <view className='contentCard'>
-                <view className='cardTop'>
-                  <image mode='widthFix' src={glImage} className='cCardimg' />
-                  <image className='lefttips' src={glTip} />
-                  <image src={onlove} className='loveharde'></image>
-                </view>
-                <view className='bContent'>
-                  <view className='cCword'>
-                    超划算套餐？这么便宜也是第一次见6荤6素1...
-                  </view>
-                  <view className='cCleft'>
-                    <image src={location} className='cCicon'></image>
-                    <view className='distance'><text>9.99</text>公里</view>
-                  </view>
-                  <view className='cCright'>
-                    <view className='money'>￥</view>
-                    <view className='price'><text>999</text>/人</view>
-                  </view>
-                </view>
-              </view>
-              <view className='contentCard'>
-                <view className='cardTop'>
-                  <image mode='widthFix' src={mjImage} className='cCardimg' />
-                  <image className='lefttips' src={mjTip} />
-                  <image src={onlove} className='loveharde'></image>
-                </view>
-                <view className='bContent'>
-                  <view className='cCword'>
-                    超划算套餐？这么便宜也是第一次见6荤6素1...
-                  </view>
-                  <view className='cCleft'>
-                    <image src={location} className='cCicon'></image>
-                    <view className='distance'><text>9.99</text>公里</view>
-                  </view>
-                  <view className='cCright'>
-                    <view className='money'>￥</view>
-                    <view className='price'><text>999</text>/人</view>
-                  </view>
-                </view>
-              </view>
-
-            </>}
-            {activeTab === 1 && <>
-              <view className='contentCard'>
-                <view className='cardTop'>
-                  <image mode='widthFix' src={msImage} className='cCardimg' />
-                  <image className='lefttips' src={msTip} />
-                  <image src={onlove} className='loveharde'></image>
-                </view>
-                <view className='bContent'>
-                  <view className='cCword'>
-                    超划算套餐？这么便宜也是第一次见6荤6素1...
-                  </view>
-                  <view className='cCleft'>
-                    <image src={location} className='cCicon'></image>
-                    <view className='distance'><text>9.99</text>公里</view>
-                  </view>
-                  <view className='cCright'>
-                    <view className='money'>￥</view>
-                    <view className='price'><text>999</text>/人</view>
-                  </view>
-                </view>
-              </view>
-
-            </>}
-            {activeTab === 2 && <>
-              <view className='contentCard'>
-                <view className='cardTop'>
-                  <image mode='widthFix' src={mjImage} className='cCardimg' />
-                  <image className='lefttips' src={mjTip} />
-                  <image src={onlove} className='loveharde'></image>
-                </view>
-                <view className='bContent'>
-                  <view className='cCword'>
-                    超划算套餐？这么便宜也是第一次见6荤6素1...
-                  </view>
-                  <view className='cCleft'>
-                    <image src={location} className='cCicon'></image>
-                    <view className='distance'><text>9.99</text>公里</view>
-                  </view>
-                  <view className='cCright'>
-                    <view className='money'>￥</view>
-                    <view className='price'><text>999</text>/人</view>
-                  </view>
-                </view>
-              </view>
-              <view className='contentCard'>
-                <view className='cardTop'>
-                  <image mode='widthFix' src={msImage} className='cCardimg' />
-                  <image className='lefttips' src={msTip} />
-                  <image src={onlove} className='loveharde'></image>
-                </view>
-                <view className='bContent'>
-                  <view className='cCword'>
-                    超划算套餐？这么便宜也是第一次见6荤6素1...
-                  </view>
-                  <view className='cCleft'>
-                    <image src={location} className='cCicon'></image>
-                    <view className='distance'><text>9.99</text>公里</view>
-                  </view>
-                  <view className='cCright'>
-                    <view className='money'>￥</view>
-                    <view className='price'><text>999</text>/人</view>
-                  </view>
-                </view>
-              </view>
-
-            </>}
-            {activeTab === 3 && <>
-              <view className='contentCard'>
-                <view className='cardTop'>
-                  <image mode='widthFix' src={mjImage} className='cCardimg' />
-                  <image className='lefttips' src={mjTip} />
-                  <image src={onlove} className='loveharde'></image>
-                </view>
-                <view className='bContent'>
-                  <view className='cCword'>
-                    超划算套餐？这么便宜也是第一次见6荤6素1...
-                  </view>
-                  <view className='cCleft'>
-                    <image src={location} className='cCicon'></image>
-                    <view className='distance'><text>9.99</text>公里</view>
-                  </view>
-                  <view className='cCright'>
-                    <view className='money'>￥</view>
-                    <view className='price'><text>999</text>/人</view>
-                  </view>
-                </view>
-              </view>
-              <view className='contentCard'>
-                <view className='cardTop'>
-                  <image mode='widthFix' src={msImage} className='cCardimg' />
-                  <image className='lefttips' src={msTip} />
-                  <image src={onlove} className='loveharde'></image>
-                </view>
-                <view className='bContent'>
-                  <view className='cCword'>
-                    超划算套餐？这么便宜也是第一次见6荤6素1...
-                  </view>
-                  <view className='cCleft'>
-                    <image src={location} className='cCicon'></image>
-                    <view className='distance'><text>9.99</text>公里</view>
-                  </view>
-                  <view className='cCright'>
-                    <view className='money'>￥</view>
-                    <view className='price'><text>999</text>/人</view>
-                  </view>
-                </view>
-              </view>
-              <view className='contentCard'>
-                <view className='cardTop'>
-                  <image mode='widthFix' src={mjImage} className='cCardimg' />
-                  <image className='lefttips' src={mjTip} />
-                  <image src={onlove} className='loveharde'></image>
-                </view>
-                <view className='bContent'>
-                  <view className='cCword'>
-                    超划算套餐？这么便宜也是第一次见6荤6素1...
-                  </view>
-                  <view className='cCleft'>
-                    <image src={location} className='cCicon'></image>
-                    <view className='distance'><text>9.99</text>公里</view>
-                  </view>
-                  <view className='cCright'>
-                    <view className='money'>￥</view>
-                    <view className='price'><text>999</text>/人</view>
-                  </view>
-                </view>
-              </view>
-
-            </>}
-
-
+            {
+              alllist?.map((item) => <Card key={item.resourceNo} item={item} />)
+            }
           </view>
           <view className='botton'>已经到底了~</view>
         </scroll-view>

src/services/home.js

@@ -112,7 +112,6 @@ export const saveLike = (targetType, targetId) => request(`/${targetType}/like/$
  */
 export const removeLike = (targetType, targetId) => request(`/${targetType}/like/${targetId}`, { method: 'delete' })
 
-//缺少套餐订单生成
 
 
 
@@ -120,4 +119,4 @@ export const removeLike = (targetType, targetId) => request(`/${targetType}/like
  * 获取搜索列表
  * @returns 
  */
-export const getIndexSearch = (params) => request('/taSearch', { params })
+export const getIndexSearch = (params) => request('/hot-word', { params })

src/utils/location.js

@@ -1,26 +0,0 @@
-
-import Taro from '@tarojs/taro'
-
-export function getLocation() {
-  return new Promise((resolve, reject) => {
-    Taro.authorize({
-      scope: 'scope.userLocation',
-      success: () => {
-        Taro.getLocation({
-          type: 'wgs84',
-          success: (res) => {
-            resolve(res)
-          },
-          fail: (err) => {
-            console.error(err)
-            reject(err)
-          }
-        })
-      },
-      fail: (err) => {
-        console.error(err)
-        reject(err)
-      }
-    })
-  })
-}