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

src/app.less

@@ -0,0 +1,37 @@
+.page-index {
+  display: flex;
+  flex-direction: column;
+  width: 100vw;
+  height: 100vh;
+  overflow: hidden;
+  box-sizing: border-box;
+
+  .index-navbar {
+    flex: none;
+  }
+
+  .index-tabber {
+    flex: none;
+  }
+
+  .index-container {
+    flex: auto;
+    overflow: hidden;
+    position: relative;
+  }
+}
+
+.custom-tabbar {
+  background: #ffffff;
+  box-shadow: 0px -4px 6px 0px rgba(0, 0, 0, 0.08);
+
+  .weui-tabbar__label {
+    color: #c0c8d3;
+  }
+
+  .weui-bar__item_on {
+    .weui-tabbar__label {
+      color: #202020;
+    }
+  }
+}

src/components/List/index.jsx

@@ -0,0 +1,81 @@
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { ScrollView } from '@tarojs/components';
+import Taro from '@tarojs/taro';
+
+export default (props) => {
+  const {
+    render,
+    request,
+    params,
+    pageSize = 10,
+    onError,
+    onDataChange,
+    ...leftProps
+  } = props
+
+  const loadingRef = useRef(false)
+  const [payload, setPayload] = useState({})
+  const [list, setList] = useState([])
+  const pageRef = useRef({ current: 1, pages: 0 })
+
+  // 滚动
+  const handleScrollToLower = (e) => {
+    const loading = loadingRef.current
+    const hasMore = pageRef.current.current < pageRef.current.pages
+
+    if (!loading && hasMore) {
+      setPayload({
+        ...payload,
+        pageNum: pageRef.current.current + 1
+      })
+    }
+  }
+
+  // 联动状态, 设置查询参数
+  useEffect(() => {
+    setPayload({
+      ...params,
+      pageNum: 1,
+      pageSize,
+    })
+  }, [pageSize, params])
+
+  // 请求数据
+  useEffect(() => {
+    Taro.showLoading()
+    loadingRef.current = true
+    request(payload).then((res) => {
+      const { records, ...pageInfo } = res || {}
+
+      const lst = pageInfo.current === 1 ? records || [] : list.concat(records || [])
+      setList(lst)
+      if (onDataChange) {
+        onDataChange(lst)
+      }
+
+      pageRef.current = pageInfo
+      loadingRef.current = false
+      Taro.hideLoading()
+    }).catch((err) => {
+      loadingRef.current = false
+      console.error(err)
+      Taro.hideLoading()
+      if (onError) {
+        onError(err)
+      }
+    })
+  }, [payload])
+
+  return (
+    <ScrollView
+      scrollY
+      onScrollToLower={handleScrollToLower}
+      {...leftProps}
+    >
+      { !render
+          ? props.children
+          : list.map((item, index) => render({ item, index }))
+      }
+    </ScrollView>
+  )
+}

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

@@ -10,20 +10,20 @@ import love from '@/assets/icons/housemantj/爱心.png'
 
 export default (props) => {
 
-  const { item } = props
+  const { item, style } = props
 
   const [isSaved, toggleSave] = useSave(item.isSaved, item.targetType, item.targetId)
   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}` });
+      let loc = item.lng + ',' + item.lat
+      Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}&distance=${(item.distance / 1000).toFixed(2)}&location=${loc}` });
     }
     else {
       Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.targetId}` })
     }
   }
   return (
-    <view className='contentCard'>
+    <view className='contentCard' style={style}>
       <view className='cardTop'>
         <image mode='widthFix' onClick={Detail} src={item.poster} className='cCardimg' />
         <image className='lefttips' src={item.targetType === 'tourist' ? mjTip : msTip} />

src/pages/index/index.less

@@ -1,37 +0,0 @@
-.page-index {
-  display: flex;
-  flex-direction: column;
-  width: 100vw;
-  height: 100vh;
-  overflow: hidden;
-  box-sizing: border-box;
-
-  .index-navbar {
-    flex: none;
-  }
-
-  .index-tabber {
-    flex: none;
-  }
-
-  .index-container {
-    flex: auto;
-    overflow: hidden;
-    position: relative;
-  }
-}
-
-.custom-tabbar {
-  background: #ffffff;
-  box-shadow: 0px -4px 6px 0px rgba(0, 0, 0, 0.08);
-
-  .weui-tabbar__label {
-    color: #c0c8d3;
-  }
-
-  .weui-bar__item_on {
-    .weui-tabbar__label {
-      color: #202020;
-    }
-  }
-}

src/pages/index/tabs/Recommend.jsx

@@ -3,6 +3,7 @@ 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 List from '@/components/List';
 import { getIndexType,  getResourceList } from '@/services/home'
 import Card from '../components/Card'
 import './less/Recommend.less'
@@ -34,26 +35,19 @@ export default (props) => {
     }
   }
 
-  useEffect(() => {    
+  useEffect(() => {
     //查询分类标签表
     getIndexType({ pageSize: 20 }).then((res) => {
       setTypeList(res.records || [])
     })    
   }, [])
-
-  useEffect(() => {
-      getResourceList(queryParams).then((res) => {
-        setAllList(res.records || [])
-      })
-    }, [queryParams])
-
   const onSearch = () => {
     // 用绝对路径
     Taro.navigateTo({ url: '/pages/search/search' });
   }
 
   return (
-    <view style={{ height: '100%', overflow: 'auto' }}>
+    <view style={{ height: '100%', overflow: 'hidden' }}>
       <view className='search' onClick={onSearch}>
         <input className='searchInput' disabled />
         <image className='searchicon' src={iconsearch} />
@@ -79,16 +73,19 @@ export default (props) => {
           </mp-tabs>
         </scroll-view>
       </view>
-      <scroll-view scroll-y='true' scroll-view='true'  	bindscrolltolower='lower' bindscrolltoupper='upper'	 bindscroll='scroll'
-      
+
+      <List
+        style={{ height: 'calc(100% - 160px)' }}
+        request={getResourceList}
+        params={queryParams}
+        onDataChange={setAllList}
       >
         <view className='waterfall'>
           {
             alllist.map((item) => <Card key={item.resourceNo} item={item} />)
           }
         </view>
-        <view className='botton'>已经到底了~</view>
-      </scroll-view>
+      </List>
     </view>
   )
 }

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 className='index-container'>
         <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;