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

src/components/List/index.jsx

@@ -17,11 +17,11 @@ export default (props) => {
   const [payload, setPayload] = useState({})
   const [list, setList] = useState([])
   const pageRef = useRef({ current: 1, pages: 0 })
+  const hasMore = pageRef.current.current < pageRef.current.pages
 
   // 滚动
   const handleScrollToLower = (e) => {
     const loading = loadingRef.current
-    const hasMore = pageRef.current.current < pageRef.current.pages
 
     if (!loading && hasMore) {
       setPayload({
@@ -46,7 +46,6 @@ export default (props) => {
     loadingRef.current = true
     request(payload).then((res) => {
       const { records, ...pageInfo } = res || {}
-
       const lst = pageInfo.current === 1 ? records || [] : list.concat(records || [])
       setList(lst)
       if (onDataChange) {
@@ -76,6 +75,7 @@ export default (props) => {
           ? props.children
           : list.map((item, index) => render({ item, index }))
       }
+      <view className='botton' style={{display:hasMore?'none':''}}>已经到底了~</view>
     </ScrollView>
   )
 }

src/hotel/components/HouseManage/houseManage.jsx

@@ -115,9 +115,9 @@ export default React.forwardRef((props, ref) => {
         <ShareCard showCutover={showCard} onClose={onClose} />
         <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" style={{ height: 'calc(100vh - 244px)' }}>
           {
-            detail?.map((item) =>
+            (detail || []).map((item) =>
               <view className='houseCard'>
-                <view className='houseName'>{item.roomName}</view>
+                <view className='houseName'>{item.roomName||''}</view>
                 <view className='operation'>
                   <view onClick={() => handelOrder(item)}><image src={see} />查看入住人</view>
                   <view onClick={() => ShowMoldeOn(item)}><image src={share} />分享链接</view>

src/hotel/components/Income/income.jsx

@@ -62,7 +62,7 @@ export default (props) => {
           
           <view className='title' >{accountlog.length!=''?'推广收入记录':'暂无推广收入'}</view>
             {
-              accountlog?.map((item) => 
+              (accountlog || []).map((item) => 
                 <view className='spreadCard'>
                   <view className='card'>
                     <view className='spreadTime'>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间：<text>{formatTime(item.createDate,'yyyy/MM/dd hh:mm:ss')}</text></view>

src/hotel/pages/landlord/roomOrder/roomOrder.jsx

@@ -49,10 +49,10 @@ export default withLayout((props) => {
 
         {
           detail.length==0?<View className='houseCard'>暂无入住人数据</View>
-           :detail?.map((item) =>
+           :detail.map((item) =>
             <View className='houseCard'>
               {
-                item.personList?.map((item2) =>
+                (item.personList||[]).map((item2) =>
                   <View className='operation'>
                     <View style={{display:'inline-block'}} onClick={()=>CopyName(item2.customerName)}>
                       <Label>{item2.customerName}</Label>

src/pages/MineUserAll/RefundMoney/CheckRefund/index.jsx

@@ -127,7 +127,7 @@ export default withLayout((props) => {
       </view>
       {/* 商品信息结束 */}
       <view>
-        {list?.map((item) => {
+        {(list||[]).map((item) => {
           return (
             <view class="wrapper" key={item.orderId}>
               <view class="left-complete-one">

src/pages/MineUserAll/RefundMoney/index.jsx

@@ -86,7 +86,7 @@ export default withLayout((props) => {
         onscrolltolower={pageLoadMore}
       >
         <view>
-          {list?.map((item) => {
+          {(list||[]).map((item) => {
             return (
               <view class="wrapper" key={item.orderId}>
                 <view class="left-complete-one">

src/pages/PayOrder/index.jsx

@@ -216,7 +216,7 @@ export default withLayout((props) => {
         </view>
       </Popup>
       <view class="coupon-list">
-        {list?.map((item) => {
+        {(list||[]).map((item) => {
           return (
             <view class="wrapper">
               <view class="left-complete-one">

src/pages/TobeShop/index.jsx

@@ -147,7 +147,7 @@ export default withLayout((props) => {
           <text className="shop-title-title">请选择你要核销的套餐</text>
         </view>
         <view>
-          {list?.map((item) => {
+          {(list||[]).map((item) => {
 
             return (
               <view class="wrapper" key={item.verifyNo} onClick={() => setChecked(item.verifyNo)}>

src/pages/details/foodDetails/foodDetails.jsx

@@ -181,7 +181,7 @@ export default withLayout((props) => {
             <view className='title'>
               <image src={titlezs} /><text>返现套餐</text>
             </view>
-            {spackage?.map((item) => <Cards star={star} item={item} />)}
+            {(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' />
@@ -192,7 +192,7 @@ export default withLayout((props) => {
               <image src={titlezs} />
               <text>本店指南</text>
             </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' />

src/pages/details/mjDetails/sceneryDetails.jsx

@@ -23,8 +23,8 @@ import './sceneryDetails.less'
 
 
 export default withLayout((props) => {
-  const { router, person } = props
-  const { id, distance, location } = props.router.params
+  const { router, person ,location } = props
+  const { id, distance, loc } = props.router.params
   const [detail, setDetail] = useState({})
   const [isSaved, toggleSave] = useSave(detail.isSaved, 'tourist', id)
   const [isLike, toggleLike] = useLike(detail.isLike, 'tourist', id)
@@ -66,7 +66,8 @@ export default withLayout((props) => {
   }
   const log = useRef('')
   const lat = useRef('')
-
+  const [queryParams, setQueryParams] = useState({ location: location, pageNum: 1, pageSize: 10, typeId: '',targetId:id  })
+  const [nloction,setNLoction]=useState()
 
   useEffect(() => {
     getTouristDetail(id).then((res) => {
@@ -81,9 +82,13 @@ export default withLayout((props) => {
       setAllextNum(res.total)
       setNewextNum(res.records.length)
     })
-    getRecommendList({ location: location }).then((res) => {
+    getRecommendList({ location: loc }).then((res) => {
       setRecommend(res || [])
     })
+    getResourceList(queryParams).then((res)=>{
+      console.log(queryParams)
+      console.log(res)
+    })
   }, [])
   
   // 分享
@@ -148,7 +153,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' />
@@ -158,7 +163,7 @@ 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>

src/pages/index/components/Card.js

@@ -16,7 +16,7 @@ export default (props) => {
   const Detail = () => {
     if (item.targetType == 'tourist') {
       let loc = item.lng + ',' + item.lat
-      Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}&distance=${(item.distance / 1000).toFixed(2)}&location=${loc}` });
+      Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}&distance=${(item.distance / 1000).toFixed(2)}&loc=${loc}` });
     }
     else {
       Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.targetId}` })

src/pages/index/tabs/Guide.jsx

@@ -245,7 +245,7 @@ export default (props) => {
                   <image mode='scaleToFill' className='title-image-cup' src={BlackSpot} />
                   <text className='title-title-boss' >更多指引</text>
                 </view>
-                {extend?.map((item, index) => <MoreGuide key={(index)} item={item} />)}
+                {(extend||[]).map((item, index) => <MoreGuide key={(index)} item={item} />)}
 
                 <view className='showMore' style={{ display: newextNum == AllextNum ? 'none' : '' }} onClick={extendMore}>
                   <view>点击查看更多</view>
@@ -261,7 +261,7 @@ export default (props) => {
             <text className='title-title-boss' >老板推荐好吃的</text>
           </view>
         </view>
-        {spackage?.map((item, index) => <BossCard cardNavigateTo={cardNavigateTo} key={(index)} item={item} />)}
+        {(spackage||[]).map((item, index) => <BossCard cardNavigateTo={cardNavigateTo} key={(index)} item={item} />)}
         {/* 卡片------------- */}
         {/* <view className='Guide-Content-box-two'>
           <view className='title-image-two'>

src/pages/index/tabs/Recommend.jsx

@@ -34,13 +34,14 @@ export default (props) => {
       setQueryParams({ location: location, pageNum: 1, pageSize: 10, typeId: '' })
     }
   }
-
   useEffect(() => {
     //查询分类标签表
     getIndexType({ pageSize: 20 }).then((res) => {
       setTypeList(res.records || [])
-    })    
+    })
   }, [])
+
+
   const onSearch = () => {
     // 用绝对路径
     Taro.navigateTo({ url: '/pages/search/search' });
@@ -75,7 +76,7 @@ export default (props) => {
       </view>
 
       <List
-        style={{ height: 'calc(100% - 160px)' }}
+        style={{ height: 'calc(100% - 145px)' }}
         request={getResourceList}
         params={queryParams}
         onDataChange={setAllList}

src/pages/search/search.jsx

@@ -35,7 +35,7 @@ export default withLayout((props) => {
                 <view className='hotSearch'>热门搜索</view>
                 <view className='hotSearchtip'>
                     {
-                        hotList?.map((item) => <view onClick={()=>hotSearch(item.word)}>{item.word}</view>)
+                        (hotList||[]).map((item) => <view onClick={()=>hotSearch(item.word)}>{item.word}</view>)
                     }
                 </view>
             </view>

src/pages/searchResult/searchResult.jsx

@@ -4,19 +4,20 @@ import iconsearch from '../../assets/icons/housemantj/search.png'
 import CustomNav from '@/components/CustomNav'
 import Taro from '@tarojs/taro'
 import Card from '../index/components/Card'
-import {getResourceList } from '@/services/home'
+import { getResourceList } from '@/services/home'
+import List from '@/components/List';
 import './searchResult.less'
 import withLayout from '@/layouts'
 
 
 
 export default withLayout((props) => {
-  const { router, person,location } = props
-  const { q} = props.router.params
+  const { router, person, location } = props
+  const { q } = props.router.params
 
   // 横向tab
   const [activeTab, setActiveTab] = useState(0)
-  const [queryParams, setQueryParams] = useState({q:q, location: location, pageNum: 1, pageSize: 10, typeId: '' })
+  const [queryParams, setQueryParams] = useState({ q: q, location: location, pageNum: 1, pageSize: 10, typeId: '' })
 
   // 获取资源表信息
   const [alllist, setAllList] = useState([])
@@ -35,13 +36,13 @@ export default withLayout((props) => {
     const { index } = e.detail
     setActiveTab(index)
     if (index == 0) {
-      setQueryParams({q:q, location: location, pageNum: 1, pageSize: 10, typeId: '' })
+      setQueryParams({ q: q, location: location, pageNum: 1, pageSize: 10, typeId: '' })
     }
-    else if(index==1){
-      setQueryParams({q:q,targetType:'shop', location: location, pageNum: 1, pageSize: 10, typeId: '' })      
+    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: '' })
+    else {
+      setQueryParams({ q: q, targetType: 'tourist', location: location, pageNum: 1, pageSize: 10, typeId: '' })
     }
   }
 
@@ -52,11 +53,6 @@ export default withLayout((props) => {
     Taro.navigateTo({ url: '/pages/search/search' });
   }
 
-  useEffect(() => {
-    getResourceList(queryParams).then((res) => {
-      setAllList(res.records || [])
-    })
-  }, [queryParams])
 
 
 
@@ -82,15 +78,18 @@ export default withLayout((props) => {
           >
           </mp-tabs>
         </view>
-
-        <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" style={{height:'100vh'}} >
-          <view className="waterfall">
+        <List
+          style={{ height: 'calc(100% - 90px)' }}
+          request={getResourceList}
+          params={queryParams}
+          onDataChange={setAllList}
+        >
+          <view className='waterfall'>
             {
-              alllist?.map((item) => <Card key={item.resourceNo} item={item} />)
+              alllist.map((item) => <Card key={item.resourceNo} item={item} />)
             }
           </view>
-          <view className='botton'>已经到底了~</view>
-        </scroll-view>
+        </List>
       </view>
     </view>
   )