fix

src/components/CouponCard/Media/Header.jsx

@@ -19,8 +19,7 @@ export default (props) => {
   return (
     <View className='coupun-media_header'>
       {enableCashback && <Cashback money={cashback} style={{ marginTop: '-10px' }} />}
-      <View className='coupun-media_thumb' style={{marginTop:enableCashback?'':'20px'}}>
-        <BadgeTag type={badge} />
+      <View className='coupun-media_thumb' style={{ marginTop: enableCashback ? '' : '20px' }}>
         <View className='image' style={backStyle}></View>
       </View>
     </View>

src/components/MasonryLayout/index.jsx

@@ -18,6 +18,7 @@ import './style.less'
 
 export default (props) => {
   const { className, listData, render } = props
+  console.log("🚀 ~ file: index.jsx ~ line 21 ~ listData", listData)
 
   // rfTimes 用来区分是否更换数据源
   const { list, rfTimes: refresh } = listData
@@ -36,7 +37,7 @@ export default (props) => {
   // const [rightList, appendRight, setRightList] = useColumn()
   const [leftList, setLeftList] = useState([])
   const [rightList, setRightList] = useState([])
-  
+
   // 渲染逻辑
   // const forceRender = useRenderFunc(renderListRef, leftHeight, rightHeight, appendLeft, appendRight)
 
@@ -51,7 +52,7 @@ export default (props) => {
     // //
     // forceRender.current()
   }
-  
+
   // console.debug('------leftHeight------->', leftHeight.current)
   // console.debug('------rightHeight------->', rightHeight.current)
   // console.debug('------renderListRef------->', renderListRef.current)

src/components/foodCards/NoteCard/index.jsx

@@ -0,0 +1,78 @@
+import { useState } from 'react'
+
+import Taro from '@tarojs/taro'
+import { View, Text, Image, Button, ScrollView } from '@tarojs/components'
+import CouponCard from '@/components/CouponCard'
+import { compressImage } from '@/utils'
+import SaveIcon from '@/components/SaveIcon'
+import grassOFF from '@/assets/icons/housemantj/grassOFF.png'
+import grassNO from '@/assets/icons/housemantj/grassNO.png'
+import Popup from '@/components/Popup'
+import './style.less'
+
+
+const CouponMedia = CouponCard.Media
+const Action = CouponCard.Action
+
+//套餐卡片
+export default (props) => {
+  const { item, st, det, editable, setScroll, goshop, scene, subOrderId, id } = props
+  const { shopId } = props.item
+  const goFood = () => {
+    Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${shopId}` })
+  }
+  const [showCutover, setShowCutover] = useState(false)
+  const goDetail = () => {
+    //打开当前套餐详情弹窗
+    setShowCutover(true)
+    //使父组件禁止滚动
+    setScroll(false)
+  }
+  const onClose = () => {
+    //关闭当前套餐详情弹窗
+    setShowCutover(false)
+    //使父组件恢复滚动
+    setScroll(true)
+  }
+
+
+
+  const handlePayClick = () => {
+    Taro.navigateTo({ url: `/pages/PayOrder/index?packageId=${item.packageId}&scene=${scene || ''}&subOrderId=${subOrderId}&id=${id}` })
+  }
+  const PayAction = <Action.Icon icon={grassOFF} text='种草' onClick={handlePayClick} />
+  return (
+    <View style={{ margin: '15px 5px' }} >
+      <View className='packageDetail' style={{ display: goshop ? '' : 'none' }}>
+        <Popup show={showCutover} maskClosable={showCutover} onClose={onClose}>
+          <ScrollView
+            scrollY
+            style={{ maxHeight: '60vh' }}
+          >
+            <Image mode='widthFix' src={item.details ? item.details : item.poster} />
+          </ScrollView>
+        </Popup >
+      </View>
+      <CouponCard action={PayAction}>
+        <CouponMedia onClick={goshop ? goDetail : goFood}>
+          <CouponMedia.Header
+            cashback={item.cashback}
+            image={compressImage(item.poster)}
+            badge='note'
+          />
+          <CouponMedia.Body star={st}>
+            <View className='foodCard'>
+              <View className='cpn-card-text'>
+                {(item.title).toString().length > 25 ? (item.title).substring(0, 25) + '...' : (item.title)}
+              </View>
+              <View className='cpn-md-act'>
+                {/* <Location {...det} /> */}
+                <SaveIcon saved={item.isSaved > 0} targetType='shop_package' editable={editable} targetId={item.packageId} />
+              </View>
+            </View>
+          </CouponMedia.Body>
+        </CouponMedia>
+      </CouponCard>
+    </View>
+  )
+}

src/components/foodCards/NoteCard/style.less

@@ -0,0 +1,47 @@
+.foodCard{
+  .cpn-card-text {
+    font-size: 24px;
+    font-weight: 400;
+    color: #333333;
+    line-height: 40px;
+    vertical-align: baseline;
+
+    & > text {
+      display: inline-block;
+
+      & + text {
+        margin-left: 8px;
+      }
+    }
+    &_mn {
+      font-size: 24px;
+      font-weight: bold;
+      color: #333333;
+    }
+
+    &_rm {
+      font-size: 18px;
+      font-weight: 400;
+      text-decoration: line-through;
+      color: #666666;
+    }
+  }
+
+  .cpn-md-act {
+    display: flex;
+    margin-top: 10px;
+
+    & > view {
+      flex: 1;
+    }
+  }
+}
+.packageDetail{
+  Image{
+    width: 100%;
+  }
+  .weui-dialog__bd{
+    padding: 0;
+    margin: 0;
+  }
+}

src/pages/details/NoteDetails/index.jsx

@@ -13,6 +13,8 @@ import weibaozan from '@/assets/icons/housemantj/unLike.png'
 import zhuandao from "@/assets/icons/housemantj/backTop.png";
 import withLayout from '@/layouts'
 import SpinBox from "@/components/Spin/SpinBox";
+import { getNoteList, getNoteID } from '@/services/note'
+
 import TabIcon from '@/components/HorTabbar/TabIcon'
 import { useState, useEffect } from 'react'
 import { getTouristDetail, getExtendContent, getRecommendList } from '@/services/home'
@@ -20,7 +22,7 @@ import logo from "@/assets/icons/UserCenter/laba.png"
 import { Swiper, SwiperItem, Button, View, Ad } from '@tarojs/components';
 import useSave from "@/utils/hooks/useSave"
 import useLike from "@/utils/hooks/useLike"
-import Cards from '@/components/foodCards/foodCards.jsx'
+import NoteCards from '@/components/foodCards/NoteCard/index'
 import Taro, { useShareAppMessage } from '@tarojs/taro'
 import Extend from '../components/Extend/extend'
 import './index.less'
@@ -28,7 +30,7 @@ import './index.less'
 
 
 export default withLayout((props) => {
-  const { router, person, location } = props
+  const { router, person } = props
   const { id } = props.router.params
   const [detail, setDetail] = useState({})
   const [isSaved, toggleSave] = useSave(detail.isSaved, 'tourist', id)
@@ -48,17 +50,7 @@ export default withLayout((props) => {
   // 推荐套餐列表
   const [recommend, setRecommend] = useState([])
 
-  const openMap = () => {
-    const [lng, lat] = detail.locaton.split(',')
 
-    Taro.openLocation({
-      longitude: lng - 0,
-      latitude: lat - 0,
-      name: detail.touristName,
-      address: detail.address,
-      scale: 12,
-    })
-  }
   //引导显隐
   const [guidance, setGuidance] = useState('shareOff')
   useEffect(() => {
@@ -71,35 +63,33 @@ export default withLayout((props) => {
   useEffect(() => {
     if (id) {
       setLoading(true)
-      getTouristDetail(id, { location }).then((res) => {
+      getNoteID(id).then((res) => {
         setDetail(res)
+        console.log("🚀 ~ file: index.jsx ~ line 68 ~ getNoteID ~ res", res)
         setimglist(res.imageList || [])
-        getRecommendList({ location: res.locaton }).then((res2) => {
-          setRecommend(res2 || [])
-        })
-      })
-      getExtendContent('tourist', id, { pageSize: 500 }).then((res) => {
-        setExtend(res.records || [])
-        setLoading(false)
+        setRecommend(res.wxResourceList || [])
 
-      })
-    } else {
-      getRecommendList({ location }).then((res2) => {
-        setRecommend(res2 || [])
         setLoading(false)
+
       }).catch(e => {
+        console.error("getNoteID错误", e)
         setLoading(false)
+
+      })
+      getExtendContent('note', id, { pageSize: 500 }).then((res) => {
+        setExtend(res.records || [])
+        setLoading(false)
+
       })
     }
-  }, [id, location])
+  }, [id])
   // 分享
   useShareAppMessage(() => {
     return {
       title: detail.touristName,
-      path: `/pages/details/mjDetails/sceneryDetails?id=${id}&enterType=share`,
+      path: `/pages/details/NoteDetails/index?id=${id}&enterType=share`,
       imageUrl: detail.poster,
     }
-
   })
   return (
     <view className='page-index'>
@@ -118,19 +108,26 @@ export default withLayout((props) => {
         <scroll-view scrollY style={{ height: '100%' }}>
           <view className='storeDetails'>
             <View className='huadong'>
-              <Swiper
-                className='swiper'
-                circular
-                onChange={handchange}
-              >
-                {
-                  imglist.map((item, key) => (
-                    item.noteType == 'image' ?
-                      <SwiperItem key={key}>
-                        <image src={compressImage(item.url)} mode='aspectFit' className='storeImage' />
-                      </SwiperItem> : <MoreGuide key={key} item={item} />
-                  ))}
-              </Swiper>
+              {
+                detail.noteType === 'image' ?
+                  <Swiper className='swiper' circular onChange={handchange}>
+                    {
+                      imglist.map((item, key) => (
+                        <SwiperItem key={key}>
+                          <image src={compressImage(item.url)} mode='aspectFit' className='storeImage' />
+                        </SwiperItem>
+                      ))}
+                  </Swiper>
+                  :
+                  <Swiper className='swiper' circular onChange={handchange}>
+                    {
+                      imglist.map((item, key) => (
+                        <MoreGuide key={key} item={item} />
+
+                      ))}
+                  </Swiper>
+              }
+
               <view className='tpPage'>
                 <text>
                   {index + 1}/{imglist.length}
@@ -138,26 +135,13 @@ export default withLayout((props) => {
               </view>
             </View>
 
-            <view className='storeJs'>
-              <view className='introduce'>
-                <text className='storeName'>{detail.touristName}</text>
-              </view>
-              <view className='bz'>
-                <image src={baozan} style={{ width: '15px', height: '15px', marginRight: '10px', marginBottom: '-2px' }} />
-                <text className='bzRight'>爆赞{detail.likeNum}</text>
-              </view>
-              <view className='wz'>{detail.address}</view>
-              <view className='dpPosition' onClick={openMap}>
-                <image src={dw} className='dwTip' />
-                <view className='distance'>{(detail.distance / 1000).toFixed(2)}公里<image src={zhuandao} className='zhuandao' /></view>
-              </view>
-            </view>
+
           </view>
           <view className='jdjs'>
-            <view>{detail.description}</view>
+            <view>{detail.summary}</view>
             <view className='line'></view>
             <view className='sc' onClick={toggleSave}>
-              <image className='scTip' src={isSaved > 0 ? ax : good} /><text>{isSaved > 0 ? '已收藏' : '加入收藏'}</text>
+              {/* <image className='scTip' src={isSaved > 0 ? ax : good} /><text>{isSaved > 0 ? '已收藏' : '加入收藏'}</text> */}
             </view>
           </view>
           <view class='adContainer'>
@@ -168,14 +152,14 @@ export default withLayout((props) => {
               <image src={NoteasICO} />笔记详情
             </view>
             <View style={{ background: '#FFF' }}>
-              {(extend || []).map((item) => <Extend item={item} />)}
+              {(extend || []).map((item) => <Extend key={item} item={item} />)}
             </View>
           </view>
           <view style={{ display: recommend == '' ? 'none' : '' }}>
             <view className='title'>
               <image src={TextMentioned} />文中提及
             </view>
-            {(recommend || []).map((item) => <Cards item={item} det={item} st={parseFloat(item.score.toFixed(1))} />)}
+            {(recommend || []).map((item) => <NoteCards key={item} item={item} det={item} />)}
           </view>
           <view className='botton'>这是我的底线</view>
         </scroll-view>

src/pages/details/NoteDetails/index.less

@@ -1,7 +1,6 @@
 .storeDetails {
   background-color: #fff;
   border-radius: 12px;
-  margin-bottom: 20px;
   .huadong {
     position: relative;
     .swiper {

src/pages/index/components/NoteCard/index.jsx

@@ -0,0 +1,43 @@
+
+import { useMemo } from 'react'
+import Taro from '@tarojs/taro'
+import useSave from "@/utils/hooks/useSave"
+import { compressImage, random } from '@/utils'
+import msTip from '@/assets/icons/housemantj/foodtip.png'
+import mjTip from '@/assets/icons/housemantj/mjtip.png'
+import location from '@/assets/icons/housemantj/location.png'
+import onlove from '@/assets/icons/housemantj/onlove.png'
+import love from '@/assets/icons/housemantj/bheart.png'
+import './style.less'
+
+export default (props) => {
+
+  const { className, item, style, } = props
+
+  const uqClass = useMemo(() => random('f'), [])
+
+  // const cls = useMemo(() => [className, 'contentCard', uqClass].filter(Boolean).join(' '), [className, uqClass])
+
+  const [isSaved, toggleSave] = useSave(item.isSaved, item.targetType, item.targetId)
+  const Detail = () => {
+
+    Taro.navigateTo({ url: `/pages/details/NoteDetails/index?id=${item.noteId}` });
+
+
+  }
+  return (
+    <view className={uqClass} style={{ overflow: 'hidden' }}>
+      <view className='contentCard' style={style}>
+        <view className='cardTop'>
+          <image mode='widthFix' onClick={Detail} src={compressImage(item.poster)} className='cCardimg' />
+          {/* <image className='lefttips' src={item.targetType === 'tourist' ? mjTip : msTip} /> */}
+          <image onClick={toggleSave} src={isSaved > 0 ? onlove : love} className='loveharde'></image>
+        </view>
+        <view className='bContent' onClick={Detail}>
+          <view className='cCword'>{(item.summary).toString().length > 35 ? (item.summary).substring(0, 35) + '...' : (item.summary)}</view>
+        </view>
+      </view>
+    </view>
+  )
+
+}

src/pages/index/components/NoteCard/style.less

@@ -0,0 +1,75 @@
+.contentCard {
+  background: #fff;
+  box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
+  border-radius: 24px;
+  overflow: hidden;
+  margin-bottom: 30px;
+  break-inside: avoid;
+  position: relative;
+  width: calc(100% - 30px);
+  box-sizing: border-box;
+  margin-left: 15px;
+  .cardTop {
+    border-radius: 24px 24px 0px 0px;
+    .cCardimg {
+      width: 100%;
+      border-radius: 24px 24px 0px 0px;
+    }
+    .lefttips {
+      width: 99px;
+      height: 37px;
+      position: absolute;
+      left: 0;
+      top: 0;
+    }
+    .loveharde {
+      width: 28px;
+      height: 26px;
+      position: absolute;
+      right: 20px;
+      top: 10px;
+    }
+  }
+  .bContent {
+    padding: 20px;
+    .cCword {
+      font-size: 24px;
+      font-weight: bold;
+      color: #404040;
+      text-align: justify;
+      padding-bottom: 40px;
+    }
+    .cCBottom {
+      display: flex;
+      .cCleft {
+        flex: 3;
+        position: relative;
+        padding: 40px 0 30px 0;
+        .cCicon {
+          width: 17px;
+          height: 21px;
+          position: absolute;
+          left: 0;
+          top: 48px;
+        }
+        .distance {
+          padding-left: 24px;
+          font-size: 24px;
+          color: #c0c8d3;
+        }
+      }
+      .cCright {
+        flex: 2;
+        position: relative;
+        padding: 40px 0 30px 0;
+        .price {
+          font-size: 24px;
+          color: #ff3434;
+          .money {
+            font-size: 20px;
+          }
+        }
+      }
+    }
+  }
+}

src/pages/index/tabs/Recommend.jsx

@@ -7,9 +7,12 @@ import List from '@/components/List';
 import MasonryLayout from '@/components/MasonryLayout';
 import { getIndexType, getResourceList } from '@/services/home'
 import { random } from '@/utils'
+import { getNoteList } from '@/services/note'
+
 import Card from '../components/Card'
+import NoteCard from '../components/NoteCard'
 import './less/Recommend.less'
-
+import RecommendNote from './RecommendNote'
 
 const listStyle = { height: '100%' }
 
@@ -17,12 +20,9 @@ export default (props) => {
   const { router, person, location } = props
   const listClass = useMemo(() => random('f'), [])
   const [activeTab, setActiveTab] = useState(0)
-  const [typeList, setTypeList] = useState([])
   const listRef = useRef()
 
-  const [queryParams, setQueryParams] = useState({ location, pageNum: 1, pageSize: 10, typeId: '' })//地点
-
-  // const [queryParams, setQueryParams] = useState({ location, pageNum: 1, pageSize: 10, typeId: '' })//笔记
+  const [queryParams, setQueryParams] = useState({ location, pageNum: 1, pageSize: 10, typeId: '' })
   const rfTimes = useRef(0)
 
   // 获取资源表信息
@@ -30,32 +30,20 @@ export default (props) => {
 
 
   //分类标签
-  const tabs = [{ title: '地点' }, { title: '笔记' }].concat(typeList.map(x => ({ ...x, title: x.typeName })))
-
-  //笔记
-  const penDetails = (index, tab) => {
-    // setActiveTab(index)
-    // setQueryParams({
-    //   ...queryParams,
-    //   typeId: tab
-    // })
-  }
+  const tabs = [{ title: '地点' }, { title: '笔记' }]
+
+  const details = (index, tab) => {
+
 
 
-  const placeDetails = (index, tab) => {
-    setActiveTab(index)
-    setQueryParams({
-      ...queryParams,
-      typeId: tab
-    })
   }
   //切换上面的标签
   const handleTabChange = (e) => {
     const { index } = e.detail
-    // if (index = 0) {
+    setActiveTab(index)
+    setQueryParams({ ...queryParams })
 
-    // }
-    placeDetails(index, tabs[index].typeId || '')
+    details(index, tabs[index].typeId || '')
   }
 
   const handleDataChange = (value, e) => {
@@ -69,13 +57,7 @@ export default (props) => {
     setListData({ list: value, rfTimes: rfTimes.current })
   }
 
-  useEffect(() => {
-    //查询分类标签表
-    getIndexType({ pageSize: 20 }).then((res) => {
-      setTypeList(res.records || [])
-      placeDetails(1, res.records[0]?.typeId)
-    })
-  }, [])
+
 
   const onSearch = () => {
     // 用绝对路径
@@ -114,23 +96,38 @@ export default (props) => {
         </scroll-view>
       </view>
       <view className={listClass} style={{ flex: '1', overflow: 'hidden' }}>
-        <List
-          ref={listRef}
-          style={listStyle}
-          request={getResourceList}
-          params={queryParams}
-          refresherEnabled={false}
-          onDataChange={handleDataChange}
-        >
-          <view style={{ padding: '30rpx 15rpx' }}>
-            <MasonryLayout
-              itemKey='resourceNo'
-              listData={listData}
-              render={(item) => <Card key={item.resourceNo} item={item} />}
-            />
-          </view>
-        </List>
+        {
+          activeTab == 0 ?
+            <List
+              ref={listRef}
+              style={listStyle}
+              request={getResourceList}
+              params={queryParams}
+              refresherEnabled={false}
+              onDataChange={handleDataChange}
+            >
+              <view style={{ padding: '30rpx 15rpx' }}>
+
+                <MasonryLayout
+                  itemKey='resourceNo'
+                  listData={listData}
+                  render={(item) => <Card key={item.resourceNo} item={item} />}
+                />
+              </view>
+            </List>
+            :
+            <RecommendNote />
+
+
+
+
+
+
+        }
+
       </view>
+
+
     </view>
   )
-}
+}

src/pages/index/tabs/RecommendNote/index.jsx

@@ -0,0 +1,100 @@
+import Taro, { useDidShow } from '@tarojs/taro'
+import { React, useState, useEffect, useRef, useMemo } 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 MasonryLayout from '@/components/MasonryLayout';
+import { getIndexType, getResourceList } from '@/services/home'
+import { random } from '@/utils'
+import { getNoteList } from '@/services/note'
+
+import NoteCard from '../../components/NoteCard'
+
+const listStyle = { height: '100%' }
+
+export default (props) => {
+  const { router, person, location } = props
+  const listClass = useMemo(() => random('f'), [])
+  const [activeTab, setActiveTab] = useState(0)
+  const listRef = useRef()
+
+  const [queryParams, setQueryParams] = useState({ location, pageNum: 1, pageSize: 10, })
+  const rfTimes = useRef(0)
+
+  // 获取资源表信息
+  const [listData, setListData] = useState({ list: [], rfTimes: 0 })
+
+
+  //分类标签
+  const tabs = [{ title: '地点' }, { title: '笔记' }]
+
+  const details = (index, tab) => {
+
+    // if (index === 1) {
+
+    //   getNoteList({ location: location }).then(res => {
+
+    //     setListData({ list: res.records })
+
+    //   })
+    // }
+
+  }
+  //切换上面的标签
+  const handleTabChange = (e) => {
+    const { index } = e.detail
+    setActiveTab(index)
+    setQueryParams({ ...queryParams })
+
+    details(index, tabs[index].typeId || '')
+  }
+
+  const handleDataChange = (value, e) => {
+    if (e.paramsChanged) {
+      rfTimes.current += 1
+      //如果context有的话代表他滚动了   那么切换tab页就置顶
+      if (listRef.current?.context) {
+        listRef.current.context.scrollTo({ top: 0 })
+      }
+    }
+    setListData({ list: value, rfTimes: rfTimes.current })
+  }
+
+
+
+  const onSearch = () => {
+    // 用绝对路径
+    Taro.navigateTo({ url: '/pages/search/search' });
+  }
+
+
+  return (
+    <view style={{ height: '100%', overflow: 'hidden', display: 'flex', flexDirection: 'column' }}>
+
+      <List
+        ref={listRef}
+        style={listStyle}
+        request={getNoteList}
+        params={queryParams}
+        refresherEnabled={false}
+        onDataChange={handleDataChange}
+      >
+        <view style={{ padding: '30rpx 15rpx' }}>
+
+          <MasonryLayout
+            itemKey='noteId'
+            listData={listData}
+            render={(item) => <NoteCard key={item.noteId} item={item} />}
+          />
+        </view>
+      </List>
+
+
+
+
+
+
+    </view>
+  )
+}

src/pages/searchResult/searchResult.jsx

@@ -1,16 +1,16 @@
 import { React, useState, useRef } from 'react'
 // .就是当前路径
-import iconsearch from '../../assets/icons/housemantj/search.png'
 import CustomNav from '@/components/CustomNav'
 import Taro from '@tarojs/taro'
 import { View } from '@tarojs/components';
-import Card from '../index/components/Card'
 import { getResourceList } from '@/services/home'
 import MasonryLayout from '@/components/MasonryLayout';
 import NoData from '@/components/NoData'
 import List from '@/components/List';
 import withLayout from '@/layouts'
 import './searchResult.less'
+import Card from '../index/components/Card'
+import iconsearch from '../../assets/icons/housemantj/search.png'
 
 
 const listStyle = { height: '100%' }
@@ -22,40 +22,13 @@ export default withLayout((props) => {
   const [listData, setListData] = useState({ list: [], rfTimes: 0 })
 
   // 横向tab
-  const [activeTab, setActiveTab] = useState(0)
   const [queryParams, setQueryParams] = useState({ q: q, location, pageNum: 1, pageSize: 10, typeId: '' })
   const rfTimes = useRef(0)
 
-  const tabs = [
-    {
-      title: '全部',
-    },
-    {
-      title: '美食',
-    },
-    {
-      title: '景点',
-    },
-  ]
+
   const listRef = useRef()
 
-  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) {
-      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: '' })
-    }
-    //如果context有的话代表他滚动了   那么切换tab页就置顶
-    if (listRef.current?.context) {
-      listRef.current.context.scrollTo({ top: 0 })
-    }
-  }
+
 
   const handleDataChange = (value, e) => {
     if (e.paramsChanged) {
@@ -84,19 +57,8 @@ export default withLayout((props) => {
           <image className='searchicon' src={iconsearch} />
           <view className='lineSearch'></view>
         </view>
-        <view className='index-tabs'>
-          <mp-tabs
-            tabClass='tabs-Unselected'
-            swiperClass='tabs-swiper'
-            activeClass='tabs-Selected'
-            tabs={tabs}
-            current={activeTab}
-            onChange={handleTabChange}
-            activeTab={activeTab}
-          >
-          </mp-tabs>
-        </view>
-        <View style={{ flex:1, overflow: 'hidden'}}>
+
+        <View style={{ flex: 1, overflow: 'hidden' }}>
           <List
             ref={listRef}
             style={listStyle}

src/services/note.js

@@ -0,0 +1,26 @@
+
+import request from '@/utils/request'
+
+
+
+
+/**
+ * 笔记查询
+ * @param {*} 
+ * @returns 
+ */
+
+export const getNoteList = (params) => request(`/note`, { params })
+
+
+/**
+ * 笔记查询根据ID
+ * @param {*} id 
+ * @returns 
+ */
+
+export const getNoteID = (id, params) => request(`/note/${id}`, { params })
+
+
+
+