详情v1.1

config/dev.js

@@ -3,7 +3,7 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    HOST: '"https://sgl-v2.njyunzhi.com"',
+    HOST: '"http://192.168.89.147:8080"',
   },
   mini: {},
   h5: {}

src/components/foodCards/foodCards.jsx

@@ -6,17 +6,33 @@ import hongxin from '@/assets/icons/housemantj/已收藏.png'
 import baixin from '@/assets/icons/housemantj/收藏.png'
 import './style.less'
 import useSave from "@/utils/hooks/useSave"
+import {getShopDetail,getShopcity} from '@/services/home'
+import { useState, useEffect } from 'react'
+
 
 
 //套餐卡片
 export default (props) => {
-  const { star, item, city } = props
+  const { item } = props
   const [isSaved, toggleSave] = useSave(item.isSaved,'shop_package', item.packageId)
+  const [city,setCity]=useState({})
+  const [detail,setDetail]=useState({})
+
+  useEffect(() => {
+  getShopDetail(item.shopId).then((res)=>{
+    setDetail(res)
+    getShopcity(res.cityId).then((res2)=>{
+      setCity(res2)
+    })
+  })
+}, [])
+const star=parseFloat(((detail.sweetScore+detail.environmentScore+detail.serviceScore)/3).toFixed(1)); 
+
   return (
       <view className='foodCard'>
         <view className='fCleft'>
           <view className='backMoney'>
-            返现￥{item.cashback}
+            返现￥{item.cashback/100}
           </view>
           <view className='appraise'>
             <Star star={star} />
@@ -24,15 +40,15 @@ export default (props) => {
           </view>
           <view>
             <view className='contentImg'>
-              <image src={item.poster} className='img1' ></image>
+              <image src={item.poster} className='img1'></image>
               <image src={msTip} className='mstip'></image>
             </view>
             <view className='neirong'>
-              <view className='textword'>{item.description}</view>
+              <view className='textword'>{(item.description).toString().length>25?(item.description).substring(0, 25)+'...':(item.description)}</view>
               <view className='jiage'>
                 <text className='rmb' >￥&nbsp;&nbsp;</text>
-                <text className='p1'><text className='price' >{item.actualPrice}</text>元&nbsp;&nbsp;</text>
-                <text className='p2'>门市价<text className='oldprice' >{item.standardPrice}</text>元</text>
+                <text className='p1'><text className='price' >{item.actualPrice/100}</text>元&nbsp;&nbsp;</text>
+                <text className='p2'>门市价<text className='oldprice' >{item.standardPrice/100}</text>元</text>
               </view>
               <view className='address'>
                 <image className='dw' src={wz} />

src/components/tip/index.jsx

@@ -21,6 +21,7 @@ export default ()=>{
         interval="3000"        
         autoplay>
           {
+            tips==''?<SwiperItem>Tip:暂无公告  欢迎使用十公里小程序</SwiperItem>:
             tips.map((item)=>
               <SwiperItem>
                 <View>Tip:{item.content}</View>

src/pages/details/foodDetails/foodDetails.jsx

@@ -1,6 +1,6 @@
 import CustomNav from '@/components/CustomNav'
 import withLayout from '@/layouts'
-import {getShopDetail,getShopPackage,getShopcity,getExtendContent} from '@/services/home'
+import {getShopDetail,getShopPackage,getExtendContent} from '@/services/home'
 import { useState,useEffect } from 'react'
 import { Swiper, SwiperItem } from '@tarojs/components';
 import Star from '@/components/Star/Star.jsx'
@@ -11,8 +11,15 @@ import dw from '@/assets/icons/housemantj/地址.png'
 import zhuandao from '@/assets/icons/housemantj/backTop.png'
 import titlezs from '@/assets/icons/housemantj/标题装饰.png'
 import showMore from '@/assets/icons/housemantj/查看更多.png'
+import share from '../../../assets/icons/housemantj/景点分享.png'
+import good from '../../../assets/icons/housemantj/景点爆赞.png'
+import collection from '../../../assets/icons/housemantj/景点收藏.png'
+import hongxin from '../../../assets/icons/housemantj/已收藏.png'
+
 import './foodDetails.less'
 import Extend from '../components/extend'
+import useSave from "@/utils/hooks/useSave"
+import useLike from "@/utils/hooks/useLike"
 
 export default withLayout((props) => {
   const { router, person } = props
@@ -21,13 +28,15 @@ export default withLayout((props) => {
   const [detail,setDetail]=useState({})
   //商铺套餐
   const [spackage,setPackage]=useState([])
-  const [city,setCity]=useState({})
   //banner图集数组
-  const [imlist,setimlist]=useState([])
+  const [imglist,setimglist]=useState([])
   const [index, setIndex] = useState(0)
   const handchange = (e) => {
     setIndex(e.detail.current)
   }
+  
+  const [isSaved, toggleSave] = useSave(detail.isSaved, 'shop', id)
+  const [isLike, toggleLike] = useLike(detail.isLike, 'shop', id)
 
   //当前套餐总数
   const [newpgNum,setNewpgNum]=useState(0)
@@ -61,10 +70,7 @@ export default withLayout((props) => {
   useEffect(()=>{
     getShopDetail(id).then((res)=>{
       setDetail(res)
-      setimlist(res.imageList||[])
-      getShopcity(res.cityId).then((res2)=>{
-        setCity(res2)
-      })
+      setimglist(res.imageList||[])
     })
     getShopPackage(id).then((res)=>{
       setPackage(res.records||[])
@@ -93,11 +99,11 @@ return (
               onChange={handchange}
             >
               {
-                imlist.map((item) =>
+                imglist.map((item) =>
                   <SwiperItem>
                     <image src={item.url} className='storeImage' >
                       <view className='tpPage'>
-                        <text>{index + 1}</text><text>/</text><text>{imlist.length}</text>
+                      <text>{index + 1}/{imglist.length}</text>
                       </view>
                     </image>
                   </SwiperItem>
@@ -109,15 +115,14 @@ return (
                   <view className='storeName'>{detail.shopName}</view>
                   <view className='sprice'>
                     <text className='t1'>￥</text>
-                    {detail.averagePrice}/人                
+                    {detail.averagePrice/100}/人                
                     <view className='bzRight'>
                       <image src={ax} style={{ width: '15px', height: '15px', marginRight: '11rpx', marginBottom: '-2px' }} />
                     爆赞{detail.likeNum}</view>
                   </view>
               </view>
               <view className='appraise'>
-                <Star star={star}/>
-                <text className='storezf'>{star}</text>
+                <Star star={star}/>{star}
                 <view style={{float:'right',marginTop:'5px'}}>
                   <text className='comment'>点评：</text>
                   <text className='t1'>口味：{detail.sweetScore}</text>
@@ -130,31 +135,25 @@ return (
               </view>
               <view className='dpPosition'> 
                 <image src={dw} className='dwTip' />
-                <view>{detail.address}
-                  <image src={zhuandao} className='zhuandao' />
+                <view>
+                  {detail.address}<image src={zhuandao} className='zhuandao'/>
                 </view>
               </view>
             </view>
           </view>
-          <view style={{ position: 'relative',display:spackage?'':'none'}}>
+          <view style={{ position: 'relative',display:spackage==''?'none':''}}>
             <view className='title'>
-              <image src={titlezs}></image>
-              <text>返现套餐</text>
-            </view>
-            
-            {
-             spackage?.map((item)=><Cards star={star} item={item} city={city} />)
-            }
-            
+              <image src={titlezs}/><text>返现套餐</text>
+            </view>            
+            {spackage?.map((item)=><Cards star={star} item={item}/>)}            
             <view className='showMore' style={{display:newpgNum==AllpgNum?'none':''}} onClick={pgMore}>
               <view>查看更多</view>
               <image src={showMore} className='moreTip' />
             </view>
           </view>
-
-          <view style={{ position: 'relative',display:extend?'':'none' }}>
+          <view style={{ position: 'relative',display:extend==''?'none':'' }}>
             <view className='title'>
-              <image src={titlezs}></image>
+              <image src={titlezs}/>
               <text>本店指南</text>
             </view>
             {extend?.map((item)=><Extend item={item} />)}
@@ -163,9 +162,20 @@ return (
               <image src={showMore} className='moreTip' />
             </view>
           </view>
-           <view className='botton'>已经到底了~</view>
+           <view className='botton' style={{display:newextNum==AllextNum?'':'none'}}>已经到底了~</view>
         </scroll-view>
       </view>
+      <view className='bottomTab'>
+        <view className='tab'>
+          <image className='share' src={share} />分享
+        </view>
+        <view className='tab' onClick={toggleLike}>
+          <image className='good' src={isLike > 0 ? ax : good} />{isLike > 0 ? '已爆赞' : '爆赞'}
+        </view>
+        <view className='tab' onClick={toggleSave}>
+          <image className='collection' src={isSaved > 0 ? hongxin : collection} />{isSaved > 0 ? '已收藏' : '加入收藏'}
+        </view>
+      </view>
     </view>
   )
 })

src/pages/details/foodDetails/foodDetails.less

@@ -49,22 +49,13 @@
         float: right;
       }
     }
-
-
-
-
-
-
     .appraise{
       line-height: 0;
       margin-top: 28px;
       margin-bottom: 37px;
-      
-      text{
-        font-size: 24px;         
-        font-weight: bold;
-        color: #020200;
-      }
+      font-size: 24px;         
+      font-weight: bold;
+      color: #020200;
       .t1{
         margin-left: 10px;
       }
@@ -126,12 +117,6 @@
     color: #202020;
     margin-left: 10px;
   }
-  .gltitle{
-    width: 32px;
-    height: 32px;
-    position: relative;
-    top: 5px;
-  }
 }
 .cs{
   height: 500px;
@@ -184,4 +169,23 @@ background-size: auto 50%;
   text-align: center;
   padding:40px 0 68px 0;
   background-color: #F8F8F8;
+}
+.bottomTab{
+  background: #FFF;
+  border-radius: 12px;
+  column-count: 3;
+  text-align: center;  
+  .tab{
+    line-height: 96px;
+    font-size: 28px;     
+    font-weight: bold;
+    color: #202020;
+    image{
+      width: 31px;
+      height: 31px;
+      position: relative;
+      top: 7px;
+      margin-right: 12px;
+    }
+  }
 }

src/pages/details/mjDetails/sceneryDetails.jsx

@@ -1,70 +1,75 @@
 import CustomNav from '@/components/CustomNav'
-import mj from '../../../assets/icons/housemantj/mj2.jpg'
-import mj3 from '../../../assets/icons/housemantj/mj3.jpg'
 import ax from '../../../assets/icons/housemantj/onlove.png'
-import huangxin from '../../../assets/icons/housemantj/已收藏.png'
+import hongxin from '../../../assets/icons/housemantj/已收藏.png'
 import baixin from '../../../assets/icons/housemantj/收藏.png'
 import dw from '../../../assets/icons/housemantj/地址.png'
 import titlejd from '../../../assets/icons/housemantj/推荐景点.png'
 import titlems from '../../../assets/icons/housemantj/推荐美食.png'
-import pay from '../../../assets/icons/housemantj/pay.png'
-import ms2 from '../../../assets/icons/housemantj/ms2.jpg'
-import msTip from '../../../assets/icons/housemantj/foodtip.png'
-import wz from '../../../assets/icons/housemantj/location.png'
 import showMore from '../../../assets/icons/housemantj/查看更多.png'
-import dp from '../../../assets/icons/housemantj/dp.jpg'
 import share from '../../../assets/icons/housemantj/景点分享.png'
 import good from '../../../assets/icons/housemantj/景点爆赞.png'
 import collection from '../../../assets/icons/housemantj/景点收藏.png'
 import './sceneryDetails.less'
 import withLayout from '@/layouts'
 import { useState, useEffect } from 'react'
-import { getTouristDetail, saveCollection, removeCollection } from '@/services/home'
+import { getTouristDetail, getExtendContent, getRecommendList } from '@/services/home'
 import { Swiper, SwiperItem } from '@tarojs/components';
-
+import useSave from "@/utils/hooks/useSave"
+import useLike from "@/utils/hooks/useLike"
+import Extend from '../components/extend'
+import Cards from '@/components/foodCards/foodCards.jsx'
 
 
 
 export default withLayout((props) => {
-  const { router, person, id } = props
-  const { detail, setDetail } = useState()
-  const tips = [
-    { src: mj },
-    { src: mj3 },
-    { src: collection },
-    { src: mj },
-    { src: mj },
-    { src: mj3 },
-    { src: titlems },
-    { src: mj }
-  ]
-  const [ jshidden, setHidden]  = useState('none')
-  const [ jsclose, setClose ] = useState('none')
-  const [ jsmore, setMore ] = useState('block')
-  const [ tchidden, tcHidden ] = useState('none')
-  const [ tcclose, setTcclose ] = useState('none')
-  const [ tcmore, setTcMore ] = useState('block')
-  const onClose=()=>{
-    setHidden('none')
-    setClose('none')
-    setMore('block')
-  }
-  const onShow=()=>{
-    setHidden('block')
-    setClose('block')
-    setMore('none')
-  }
-
+  const { router, person } = props
+  const { id, distance, location } = props.router.params
+  const [detail, setDetail] = useState({})
+  const [isSaved, toggleSave] = useSave(detail.isSaved, 'tourist', id)
+  const [isLike, toggleLike] = useLike(detail.isLike, 'tourist', id)
 
+  //banner图集数组
+  const [imglist, setimglist] = useState([])
   const [index, setIndex] = useState(0)
   const handchange = (e) => {
     setIndex(e.detail.current)
   }
+
+  //本店指南
+  const [extend, setExtend] = useState([])
+  //当前指南总数
+  const [newextNum, setNewextNum] = useState(0)
+  //全部指南个数
+  const [AllextNum, setAllextNum] = useState(0)
+  //指南当前页数
+  const [epage, setepage] = useState(2)
+  const extendMore = () => {
+    setepage(epage + 1)
+    getExtendContent('tourist', id, { pageNum: epage }).then((res) => {
+      setExtend([...extend, ...res.records])
+      setNewextNum(newextNum + res.records.length)
+    })
+  }
+
+  // 推荐套餐列表
+  const [recommend, setRecommend] = useState([])
+
   useEffect(() => {
     getTouristDetail(id).then((res) => {
       setDetail(res)
+      setimglist(res.imageList || [])
+
+    })
+    getExtendContent('tourist', id).then((res) => {
+      setExtend(res.records || [])
+      setAllextNum(res.total)
+      setNewextNum(res.records.length)
+    })
+    getRecommendList({ location: location }).then((res) => {
+      setRecommend(res || [])
     })
   }, [])
+  console.log(extend=='')
   return (
     <view className='page-index'>
       <view className='index-navbar'>
@@ -80,11 +85,11 @@ export default withLayout((props) => {
               onChange={handchange}
             >
               {
-                tips.map((item) =>
+                imglist.map((item) =>
                   <SwiperItem>
-                    <image src={item.src} className='storeImage' >
+                    <image src={item.url} className='storeImage' >
                       <view className='tpPage'>
-                        <text>{index + 1}</text><text>/</text><text>{tips.length}</text>
+                        <text>{index + 1}/{imglist.length}</text>
                       </view>
                     </image>
                   </SwiperItem>
@@ -94,205 +99,54 @@ export default withLayout((props) => {
 
             <view className='storeJs'>
               <view className='introduce'>
-                <text className='storeName'>玄武湖</text>
+                <text className='storeName'>{detail.touristName}</text>
               </view>
               <view className='bz'>
                 <image src={ax} style={{ width: '15px', height: '15px', marginRight: '10px', marginBottom: '-2px' }} />
-                <text className='bzRight'>爆赞<text>9999+</text></text>
+                <text className='bzRight'>爆赞{detail.likeNum}</text>
               </view>
-              <view className='wz'>凤游寺52号悦动新门西15栋111号</view>
+              <view className='wz'>{detail.address}</view>
               <view className='dpPosition'>
                 <image src={dw} className='dwTip' />
-                <view className='distance'><text>9.99</text>公里</view>
+                <view className='distance'>{distance}公里</view>
               </view>
             </view>
           </view>
           <view className='jdjs'>
-            <view>
-              到了10月下旬的深秋时节，“不觉初秋夜渐长，清风习习重凄
-              凉”，秋天的美，毫不输给繁花似锦的春天11月栖霞山枫叶最
-              佳观赏期快要来了，赶紧提前收藏这些吧！
-            </view>
+            <view>{detail.description}</view>
             <view className='line'></view>
-            <view className='sc'>
-              <image className='scTip' src={baixin} /><text>加入收藏</text>
+            <view className='sc' onClick={toggleSave}>
+              <image className='scTip' src={isSaved > 0 ? hongxin : baixin} /><text>{isSaved > 0 ? '已收藏' : '加入收藏'}</text>
             </view>
           </view>
-          <view style={{ position: 'relative' }}>
-
+          <view style={{ position: 'relative',display:extend==''?'none':''}}>
             <view className='title'>
-              <image src={titlejd}></image>
-              <text>景点介绍</text>
-            </view>
-            <view className='storezn'>
-              Lorem ipsum dolor sit amet, consectetur adipiscing elit,
-              sed do eiusmod tempor incididunt ut labore et dolore
-              magna aliqua. Quis ipsum suspendisse ultrices gravida.
-              Risus commodo viverra maecenas accumsan lacus vel
-              facilisis.
+              <image src={titlejd} />景点介绍
             </view>
-            <image src={dp} mode='widthFix' />
-            <view className='storezn'>
-              Lorem ipsum dolor sit amet, consectetur adipiscing elit,
-              sed do eiusmod tempor incididunt ut labore et dolore
-              magna aliqua. Quis ipsum suspendisse ultrices gravida.
-            </view>
-
-
-
-            <view style={{display:jshidden}} >
-              <view className='title'>
-                <image src={titlejd}></image>
-                <text>景点介绍</text>
-              </view>
-              <view className='storezn'>
-                Lorem ipsum dolor sit amet, consectetur adipiscing elit,
-                sed do eiusmod tempor incididunt ut labore et dolore
-                magna aliqua. Quis ipsum suspendisse ultrices gravida.
-                Risus commodo viverra maecenas accumsan lacus vel
-                facilisis.
-              </view>
-              <image src={dp} mode='widthFix' />
-              <view className='storezn'>
-                Lorem ipsum dolor sit amet, consectetur adipiscing elit,
-                sed do eiusmod tempor incididunt ut labore et dolore
-                magna aliqua. Quis ipsum suspendisse ultrices gravida.
-              </view>
-              <view className='title'>
-                <image src={titlejd}></image>
-                <text>景点介绍</text>
-              </view>
-              <view className='storezn'>
-                Lorem ipsum dolor sit amet, consectetur adipiscing elit,
-                sed do eiusmod tempor incididunt ut labore et dolore
-                magna aliqua. Quis ipsum suspendisse ultrices gravida.
-                Risus commodo viverra maecenas accumsan lacus vel
-                facilisis.
-              </view>
-              <image src={dp} mode='widthFix' />
-              <view className='storezn'>
-                Lorem ipsum dolor sit amet, consectetur adipiscing elit,
-                sed do eiusmod tempor incididunt ut labore et dolore
-                magna aliqua. Quis ipsum suspendisse ultrices gravida.
-              </view>
-            </view>
-            <view className='showMore' style={{display:jsclose}} onClick={onClose}>
-              <image src={showMore} className='moreTip2' />
-              <view>收起</view>
-            </view>
-            <view className='showMore'  style={{display:jsmore}} onClick={onShow}>
+            {extend?.map((item) => <Extend item={item} />)}
+            <view className='showMore' style={{ display: newextNum == AllextNum ? 'none' : '' }} onClick={extendMore}>
               <view>点击查看更多</view>
               <image src={showMore} className='moreTip' />
             </view>
-
-
           </view>
-          <view style={{ position: 'relative' }}>
+          <view style={{ position: 'relative', display: recommend=='' ? 'none' : '' }}>
             <view className='title'>
-              <image src={titlems}></image>
-              <text>老板推荐好吃的</text>
-            </view>
-            <view className='foodCard'>
-              <view className='fCleft'>
-                <view className='backMoney'>
-                  返现￥2.04
-                </view>
-                <view className='appraise'>
-                  <image className='star' src={huangxin}></image>
-                  <image className='star' src={huangxin}></image>
-                  <image className='star' src={huangxin}></image>
-                  <image className='star' src={huangxin}></image>
-                  <image className='star' src={baixin}></image>
-                  <text className='storezf'>4.5</text>
-                </view>
-                <view style={{ overflow: 'hidden' }}>
-                  <view className='contentImg'>
-                    <image src={ms2} className='img1' ></image>
-                    <image src={msTip} className='mstip'></image>
-                  </view>
-                  <view className='neirong'>
-                    <view className='textword'>
-                      探店拥有“蓝色波浪”的咖啡店连手提袋都很特别手绘的...
-                    </view>
-                    <view className='jiage'>
-                      <text className='rmb' >￥&nbsp;&nbsp;</text>
-                      <text className='p1'><text className='price' >55</text>元&nbsp;&nbsp;</text>
-                      <text className='p2'>门市价<text className='oldprice' >78</text>元</text>
-                    </view>
-                    <view className='address'>
-                      <image className='dw' src={wz} />
-                      <text className='wz'>南京市/秦淮区</text>
-                      <image className='star' src={huangxin}></image>
-                      <text className='collection'>已收藏</text>
-                    </view>
-                  </view>
-                </view>
-              </view>
-              <view className='fCright'>
-                <image src={pay} />
-                <view>支付</view>
-              </view>
-              <view className='columnLine'></view>
-            </view>
-            <view className='foodCard'>
-              <view className='fCleft'>
-                <view className='backMoney'>
-                  返现￥2.04
-                </view>
-                <view className='appraise'>
-                  <image className='star' src={huangxin}></image>
-                  <image className='star' src={huangxin}></image>
-                  <image className='star' src={huangxin}></image>
-                  <image className='star' src={huangxin}></image>
-                  <image className='star' src={baixin}></image>
-                  <text className='storezf'>4.5</text>
-                </view>
-                <view style={{ overflow: 'hidden' }}>
-                  <view className='contentImg'>
-                    <image src={ms2} className='img1' ></image>
-                    <image src={msTip} className='mstip'></image>
-                  </view>
-                  <view className='neirong'>
-                    <view className='textword'>
-                      探店拥有“蓝色波浪”的咖啡店连手提袋都很特别手绘的...
-                    </view>
-                    <view className='jiage'>
-                      <text className='rmb' >￥&nbsp;&nbsp;</text>
-                      <text className='p1'><text className='price' >55</text>元&nbsp;&nbsp;</text>
-                      <text className='p2'>门市价<text className='oldprice' >78</text>元</text>
-                    </view>
-                    <view className='address'>
-                      <image className='dw' src={wz} />
-                      <text className='wz'>南京市/秦淮区</text>
-                      <image className='star' src={huangxin}></image>
-                      <text className='collection'>已收藏</text>
-                    </view>
-                  </view>
-                </view>
-              </view>
-              <view className='fCright'>
-                <image src={pay} />
-                <view>支付</view>
-              </view>
-              <view className='columnLine'></view>
-            </view>
-            <view className='showMore'>
-              <view>查看更多</view>
-              <image src={showMore} className='moreTip' />
+              <image src={titlems} />老板推荐好吃的
             </view>
+            {recommend?.map((item) => <Cards item={item} />)}
           </view>
           <view className='bottom'>已经到底了~</view>
         </scroll-view>
       </view>
       <view className='bottomTab'>
         <view className='tab'>
-          <image className='share' src={share} /><text>分享</text>
+          <image className='share' src={share} />分享
         </view>
-        <view className='tab'>
-          <image className='good' src={good} /><text>爆赞</text>
+        <view className='tab' onClick={toggleLike}>
+          <image className='good' src={isLike > 0 ? ax : good} />{isLike > 0 ? '已爆赞' : '爆赞'}
         </view>
-        <view className='tab'>
-          <image className='collection' src={collection} /><text>加入收藏</text>
+        <view className='tab' onClick={toggleSave}>
+          <image className='collection' src={isSaved > 0 ? hongxin : collection} />{isSaved > 0 ? '已收藏' : '加入收藏'}
         </view>
       </view>
 

src/pages/details/mjDetails/sceneryDetails.less

@@ -100,22 +100,14 @@
   }
 }
 .title{
-  margin: 60px 0 40px 0;
+  margin: 60px 0 40px 0; 
+  font-size: 34px;      
+  font-weight: bold;
+  color: #202020;
   image{
     width: 30px;
     height: 30px;
-  }
-  text{
-    font-size: 34px;      
-    font-weight: bold;
-    color: #202020;
-    margin-left: 10px;
-  }
-  .gltitle{
-    width: 32px;
-    height: 32px;
-    position: relative;
-    top: 5px;
+    margin-right: 10px;
   }
 }
 .foodCard{
@@ -269,12 +261,6 @@
     height: 19px;
     margin-top: 14px;
   }
-  .moreTip2{
-    width: 38px;
-    height: 19px;
-    margin-top: 14px;
-    transform:rotate(180deg);
-  }
 }
 .storezn{
   font-size: 28px;

src/pages/index/components/Card.js

@@ -15,13 +15,13 @@ export default (props) => {
   const [isSaved, toggleSave] = useSave(item.isSaved, item.targetType, item.targetId)
   const Detail=()=>{
     if (item.targetType=='tourist') {
-      Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}` });
+      let location=item.lng+','+item.lat
+      Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}&distance=${(item.distance/1000).toFixed(2)}&location=${location}` });
     }
     else{
       Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.targetId}` });
     }
   }
-
   return (
     <view className='contentCard'>
       <view className='cardTop'>

src/pages/index/tabs/Recommend.jsx

@@ -1,5 +1,5 @@
 import Taro, { useRouter } from '@tarojs/taro'
-import { React, useState, useEffect } from 'react'
+import { React, useState, useEffect, useRef } from 'react'
 import iconsearch from '@/assets/icons/housemantj/search.png'
 import location from '@/assets/icons/housemantj/location.png'
 import Tip from '@/components/tip'
@@ -16,7 +16,8 @@ export default (props) => {
   const { params } = useRouter()
   const { tabJump } = params || {}
   const [typeList, setTypeList] = useState([])
-  const [location1,setLocation]=useState('')
+  
+  const locRef = useRef()
 
   const [queryParams, setQueryParams] = useState({ location: '', pageNum: 1, pageSize: 10, typeId: '' })
 
@@ -40,14 +41,11 @@ export default (props) => {
 
   useEffect(() => {
     getLocation().then((res) => {
-      setLocation(`${res.longitude},${res.latitude}`)
+      locRef.current = `${res.longitude},${res.latitude}`
       setQueryParams({
         ...queryParams,
-        location: `${res.longitude},${res.latitude}`
+        location: locRef.current
       })
-      getResourceList(queryParams).then((res2) => {
-      setAllList(res2.records || [])
-    })
     })
 
     //查询分类标签表
@@ -68,9 +66,11 @@ export default (props) => {
 
 
   useEffect(() => {
-    getResourceList(queryParams).then((res) => {
-      setAllList(res.records || [])
-    })
+    if (locRef.current) {
+      getResourceList(queryParams).then((res) => {
+        setAllList(res.records || [])
+      })
+    }
   }, [queryParams])
 
   const onSearch = () => {

src/pages/index/tabs/less/Recommend.less

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

src/services/home.js

@@ -79,23 +79,32 @@ export const getIndexType = (params) => request('/tdType', { params })
  * @param {*} id 
  * @returns 
  */
- export const getTouristDetail = (id) => request(`/taTourist/${id}`)
+ export const getTouristDetail = (id) => request(`/tourist/${id}`)
 
 /**
- * 点赞
- * @param {*} id 
+ * 获取推荐套餐列表
  * @returns 
+ * params 搜索条件放这里
  */
- export const saveLike = (data) => request(`/taLike `,{ method: 'post', data })
+ export const getRecommendList = (params) => request('/package/recommend', { params })
 
- /**
- * 取消点赞
- * @param {*} id 
+
+
+ 
+/**
+ * 爆赞
+ * @param {*} data 
  * @returns 
  */
-  export const deldteLike = (id) => request(`/taLike /${id}`,{ method: 'delete' })
+ export const saveLike = (targetType,targetId) => request(`/${targetType}/like/${targetId}`, { method: 'post' })
 
-//缺少收藏接口
+/**
+ * 取消爆赞
+ * @param {*} data 
+ * @returns 
+ */
+ export const removeLike = (targetType,targetId) => request(`/${targetType}/like/${targetId}`, { method: 'delete'})
+ 
 //缺少套餐订单生成
 
 

src/utils/hooks/useLike.js

@@ -0,0 +1,21 @@
+import { useEffect, useState } from "react"
+import { saveLike, removeLike } from "@/services/home"
+
+export default function (initailState, targetType, targetId) {
+  const [isLike, setIsLike] = useState(initailState)
+  useEffect(() => {
+    setIsLike(initailState)
+  }, [initailState])
+  const toggleLike = () => {
+    if (isLike) {
+      removeLike(targetType, targetId).then(() => {
+        setIsLike(false)
+      })
+    } else {
+      saveLike(targetType, targetId).then(() => {
+        setIsLike(true)
+      })
+    }
+  }
+  return [isLike, toggleLike]
+}