Merge branch 'dev' of http://git.ycjcjy.com/shigongli/miniapp-v2 into dev

src/components/List/index.jsx

@@ -32,12 +32,12 @@ export default (props) => {
     }
   }
 
-  const fetchList = (queryParams) => {
+  const fetchList = (params) => {
     if (!request) return;
 
     Taro.showLoading()
     loadingRef.current = true
-    request(queryParams).then((res) => {
+    request(params).then((res) => {
       const { records, ...pageInfo } = res || {}
       const lst = pageInfo.current === 1 ? records || [] : list.concat(records || [])
       setList(lst)

src/components/foodCards/foodCards.jsx

@@ -14,11 +14,11 @@ import './style.less'
 
 //套餐卡片
 export default (props) => {
-  const { item } = props
+  const { item,star } = props
   const { shopId } = props.item
   const [isSaved, toggleSave] = useSave(item.isSaved, 'shop_package', item.packageId)
   const [city, setCity] = useState({})
-  const [detail, setDetail] = useState({})
+  // const [detail, setDetail] = useState({})
 
 
 
@@ -39,13 +39,11 @@ export default (props) => {
 
   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'>

src/hotel/components/HouseManage/houseManage.jsx

@@ -88,7 +88,7 @@ export default React.forwardRef((props, ref) => {
       setShowCard(false)
       return {
         title: room.roomName,
-        path: `/pages/index/index?tab=1&roomId=${room.roomId}&roomOrderId=${roomOrderId}`,
+        path: `/pages/index/index?tab=1&roomId=${room.roomId}&roomOrderId=${roomOrderId}&fromType=hotel&recommender=${hotel.hotelId}`,
         imageUrl: shareImage,
       }
     }

src/pages/details/foodDetails/foodDetails.jsx

@@ -38,23 +38,21 @@ export default withLayout((props) => {
   }, [id, subOrderId]);
 
   useEffect(() => {
-
     if (id && scene) {
       getVerifyTargetList({
         shopId: id,
         isMine: true,
         isVerified: 0,
       }).then((res) => {
-        if(res?.records?.length>0){
+        if (res?.records?.length > 0) {
           Taro.navigateTo({
             url: `/pages/TobeShop/index?id=${id}`,
           });
         }
-       
       });
     }
   }, [id, scene]);
-  
+
   //商铺基础信息
   const [detail, setDetail] = useState({});
   //商铺套餐
@@ -112,6 +110,7 @@ export default withLayout((props) => {
 
   useEffect(() => {
     getShopDetail(id).then((res) => {
+      console.log(res)
       setDetail(res);
       log.current = res.locaton.toString().split(",")[0];
       lat.current = res.locaton.toString().split(",")[1];
@@ -130,9 +129,7 @@ export default withLayout((props) => {
   }, []);
   const star = parseFloat(
     (
-      (detail.sweetScore + detail.environmentScore + detail.serviceScore) /
-      3
-    ).toFixed(1)
+      (detail.sweetScore + detail.environmentScore + detail.serviceScore) / 3).toFixed(1)
   );
 
   // 分享
@@ -150,14 +147,11 @@ export default withLayout((props) => {
         <CustomNav title="十公里" />
       </view>
       <view
-        style={{ overflow: "auto", padding: "0 30rpx", background: "#F8F8F8" }}
+        style={{ overflow: "hidden", padding: "0 30rpx", height: '100%', background: "#F8F8F8" }}
       >
         <scroll-view
           scroll-y="true"
-          scroll-view="true"
-          bindscrolltoupper="upper"
-          bindscrolltolower="lower"
-          bindscroll="scroll"
+          style={{ height: '100%' }}
         >
           <view className="storeDetails">
             <Swiper
@@ -232,7 +226,7 @@ export default withLayout((props) => {
               <text>返现套餐</text>
             </view>
             {(spackage || []).map((item) => (
-              <Cards star={star} item={item} />
+              <Cards star={star} item={item} detail={detail} />
             ))}
             <view
               className="showMore"

src/pages/details/mjDetails/sceneryDetails.jsx

@@ -11,11 +11,11 @@ import weibaozan from '@/assets/icons/housemantj/未赞.png'
 import withLayout from '@/layouts'
 import { useState, useEffect, useRef } from 'react'
 import { getTouristDetail, getExtendContent, getRecommendList } from '@/services/home'
-import { Swiper, SwiperItem,Button } from '@tarojs/components';
+import { Swiper, SwiperItem, Button } from '@tarojs/components';
 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 Taro, { useShareAppMessage } from '@tarojs/taro'
 import { getTouristDistance } from '@/services/home'
 import Extend from '../components/Extend/extend'
 import './sceneryDetails.less'
@@ -23,13 +23,12 @@ import './sceneryDetails.less'
 
 
 export default withLayout((props) => {
-  const { router, person ,location } = props
-  const { id} = props.router.params
+  const { router, person, location } = props
+  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('')
+  const [distance, setDistance] = useState()
   //banner图集数组
   const [imglist, setimglist] = useState([])
   const [index, setIndex] = useState(0)
@@ -73,37 +72,35 @@ export default withLayout((props) => {
       lat.current = (res.locaton).toString().split(',')[1]
       setDetail(res)
       setimglist(res.imageList || [])
-
     })
     getExtendContent('tourist', id).then((res) => {
       setExtend(res.records || [])
       setAllextNum(res.total)
       setNewextNum(res.records.length)
     })
-    getTouristDistance('tourist',id,{location:location}).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 || [])
+      getRecommendList({ location: res.lng + ',' + res.lat }).then((res2) => {
+        setRecommend(res2 || [])
+      })
     })
-  }, []) 
+  }, [])
   // 分享
-  useShareAppMessage(()=>{
+  useShareAppMessage(() => {
     return {
       title: detail.touristName,
       path: `/pages/details/mjDetails/sceneryDetails?id=${id}`,
       imageUrl: detail.poster,
     }
-  
-})
+
+  })
   return (
     <view className='page-index'>
       <view className='index-navbar'>
         <CustomNav title='十公里' />
       </view>
-      <view style={{ overflow: 'auto', padding: '0 30rpx', background: '#F8F8F8' }}>
-        <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll">
+      <view style={{ overflow: 'hidden', padding: '0 30rpx', height: '100%', background: '#F8F8F8' }}>
+        <scroll-view scroll-y="true" style={{ height: '100%' }}>
           <view className='storeDetails'>
             <Swiper
               className='.swiper'
@@ -150,7 +147,7 @@ export default withLayout((props) => {
             <view className='title'>
               <image src={titlejd} />景点介绍
             </view>
-            {(extend||[]).map((item) => <Extend item={item} />)}
+            {(extend || []).map((item) => <Extend item={item} />)}
             <view className='showMore' style={{ display: newextNum == AllextNum ? 'none' : '' }} onClick={extendMore}>
               <view>点击查看更多</view>
               <image src={showMore} className='moreTip' />
@@ -160,13 +157,13 @@ export default withLayout((props) => {
             <view className='title'>
               <image src={titlems} />老板推荐好吃的
             </view>
-            {(recommend||[]).map((item) => <Cards item={item} />)}
+            {(recommend || []).map((item) => <Cards item={item} />)}
           </view>
           <view className='bottom'>已经到底了~</view>
         </scroll-view>
       </view>
       <view className='bottomTab'>
-      <Button openType='share' className='sharebtn'>分享</Button>
+        <Button openType='share' className='sharebtn'>分享</Button>
         <view className='tab'>
           <image className='share' src={share} />分享
         </view>
@@ -177,7 +174,6 @@ export default withLayout((props) => {
           <image className='collection' src={isSaved > 0 ? ax : good} />{isSaved > 0 ? '已收藏' : '加入收藏'}
         </view>
       </view>
-
     </view>
   )
 })

src/pages/index/tabs/Recommend.jsx

@@ -75,6 +75,20 @@ export default (props) => {
         </scroll-view>
       </view>
 
+
+
+      {/* <ScrollView
+      scrollY
+      onScrollToLower={handleScrollToLower}
+    >
+      
+      
+    </ScrollView> */}
+
+
+
+
+
       <List
         style={{ height: 'calc(100% - 145px)' }}
         request={getResourceList}