feat

src/components/MoreGuide/index.jsx

@@ -1,9 +1,12 @@
 import { Video } from '@tarojs/components';
+import { useState } from 'react';
 import { compressImage } from '@/utils'
 import './style.less'
 
 export default (props) => {
-  const { item } = props
+  const { item, } = props
+
+
   return (
     <>
       {
@@ -17,8 +20,12 @@ export default (props) => {
             <Video
               controls
               autoplay={false}
+              VideoType={false}
               loop={false}
-              muted={false} style={{ width: "100%", height: '200px' }} src={item.content}></Video>
+              muted={false} style={{ width: "100%", height: '200px' }} src={item.content}
+            >
+
+            </Video>
       }
     </>
   )

src/components/foodCards/NoteCard/index.jsx

@@ -1,13 +1,15 @@
-import { useState } from 'react'
+import { useState, useEffect, useRef } from 'react'
 
 import Taro from '@tarojs/taro'
-import { View, Text, Image, Button, ScrollView } from '@tarojs/components'
+import { View, Picker, Image, 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 { saveTravel, newTravelMine, getTravelMine } from '@/services/travel'
+
 import './style.less'
 
 
@@ -16,18 +18,23 @@ const Action = CouponCard.Action
 
 //套餐卡片
 export default (props) => {
-  const { item, st, det, editable, setScroll, goshop, scene, subOrderId, id } = props
-  const { shopId } = props.item
+  const { item, st, editable, setScroll, goshop, travelMine, travelMineContent } = props
+  // const travelId = travelMineContent?.records[0]?.travelId
+  const { targetId } = props.item
   const goFood = () => {
-    Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${shopId}` })
+    Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${targetId}` })
+
   }
   const [showCutover, setShowCutover] = useState(false)
-  const goDetail = () => {
-    //打开当前套餐详情弹窗
-    setShowCutover(true)
-    //使父组件禁止滚动
-    setScroll(false)
-  }
+  const [valueList, setValueList] = useState([])
+
+
+  useEffect(() => {
+    setValueList(travelMine?.records)
+
+
+  }, [travelMine?.records])
+
   const onClose = () => {
     //关闭当前套餐详情弹窗
     setShowCutover(false)
@@ -35,12 +42,104 @@ export default (props) => {
     setScroll(true)
   }
 
+  //列改变
+  const [traveCoumun, setTraveCoumun] = useState()
+
+
+  const numberTrave = (new Array(traveCoumun).fill()).map((_, index) => ({ id: index + 1, title: `第 ${index + 1} 天` }))
+
+  const array = [valueList, numberTrave]
+
+
+  const handleColumn = e => {
+    // console.log(e.detail.column);
+
+    const { column, value } = e.detail
+
+
+    const firstValue = valueList[value]
+    console.log("🚀 ~ file: index.jsx ~ line 61 ~ firstValue", firstValue)
+    setTraveCoumun(firstValue.dayNum)
+
+  }
+
+
+
+  const day = new Date();
+  const y = day.getFullYear();
+  const m = day.getMonth();
+  const d = day.getDate();
+  let number = 0
+
+  const onChange = (e) => {
+    const [firstInx, secondInx] = e.detail.value
+
+    const firstValue = valueList[firstInx]
+    const secondValue = numberTrave[secondInx]
+
+    const { travelId } = firstValue//行程内容
+    const { i } = secondValue//天数
+
+
+    console.log(firstValue, secondValue);
+
+
+    if (travelMine.records.total < 0) {
+      newTravelMine({ title: `我的行程 ${y}-${m == 0 ? 1 : m}-${d}` }).then(e => {
+        console.log("🚀 ~ file: index.jsx ~ line 61 ~ newTravelMine ~ e", e)
+        // saveTravel({})
+        saveTravel(travelId, { dayOrder: i, targetId: targetId, targetType: 'note' }).then((res) => {
+          Taro.
+            Taro.showToast({
+              title: '添加成功',
+              icon: 'none',
+              duration: 1000
+            })
+          console.log(res);
+        })
+      })
+    } else {
+      saveTravel(travelId, { dayOrder: i, targetId: targetId, targetType: 'note' }).then((res) => {
+        console.log(res);
+        Taro.showToast({
+          title: '添加成功',
+          icon: 'none',
+
+          duration: 1000
+        })
+      })
+      // console.log('else');
+
+    }
+  }
 
 
   const handlePayClick = () => {
-    Taro.navigateTo({ url: `/pages/PayOrder/index?packageId=${item.packageId}&scene=${scene || ''}&subOrderId=${subOrderId}&id=${id}` })
+    // Taro.navigateTo({ url: `/pages/PayOrder/index?packageId=${item.packageId}&scene=${scene || ''}&subOrderId=${subOrderId}&id=${id}` })
+
   }
-  const PayAction = <Action.Icon icon={grassOFF} text='种草' onClick={handlePayClick} />
+  const PayAction =
+    <View className='view-picker'>
+      <Picker
+        className='picker-box'
+        mode='multiSelector'
+        range={array}
+        range-key='title'
+        onColumnChange={handleColumn}
+        onChange={onChange}
+        scrollType='link'
+      // value={}
+
+      >
+
+        <Action.Icon icon={item.isVisited > 1 ? grassOFF : grassNO} text={item.isVisited > 1 ? '种草' : '已种草'} onClick={handlePayClick} />
+
+      </Picker>
+
+    </View>
+
+
+
   return (
     <View style={{ margin: '15px 5px' }} >
       <View className='packageDetail' style={{ display: goshop ? '' : 'none' }}>
@@ -54,7 +153,7 @@ export default (props) => {
         </Popup >
       </View>
       <CouponCard action={PayAction}>
-        <CouponMedia onClick={goshop ? goDetail : goFood}>
+        <CouponMedia onClick={goFood}>
           <CouponMedia.Header
             cashback={item.cashback}
             image={compressImage(item.poster)}

src/components/foodCards/NoteCard/style.less

@@ -1,4 +1,9 @@
-.foodCard{
+.view-picker {
+  position: relative;
+  top: 30%;
+}
+
+.foodCard {
   .cpn-card-text {
     font-size: 24px;
     font-weight: 400;
@@ -36,12 +41,12 @@
     }
   }
 }
-.packageDetail{
-  Image{
+.packageDetail {
+  Image {
     width: 100%;
   }
-  .weui-dialog__bd{
+  .weui-dialog__bd {
     padding: 0;
     margin: 0;
   }
-}
+}

src/hotel/components/HouseManage/houseManage.jsx

@@ -1,24 +1,25 @@
 import Taro, { useDidShow } from '@tarojs/taro'
 import { View, Image } from '@tarojs/components';
+import ToggleRole from '@/components/ToggleRole'
+
 import see from '@/assets/icons/landlord/lookPerson.png'
 import share from '@/assets/icons/landlord/shareLink.png'
 import del from '@/assets/icons/landlord/delete.png'
 import addImg from '@/assets/icons/landlord/add.png'
 import copyRoomImg from '@/assets/icons/landlord/copyroom.png'
 import React, { useState, useEffect, useRef, useImperativeHandle, useMemo } from 'react'
-import { getRoomList,deleteRoom,copyRoom } from '@/services/landlord'
+import { getRoomList, deleteRoom, copyRoom } from '@/services/landlord'
 import Spin3 from '@/components/Spin/Spin3';
 import List from '@/components/List';
 import Picker from '@/components/Picker'
 import SearchBar from '@/components/SearchBar'
 import ShareRoom from '../shareRoom/ShareRoom.jsx'
 import ShareCard from '../shareCard/shareCard'
-import ToggleRole from '@/components/ToggleRole'
 import './houseManage.less'
 
 
 export default React.forwardRef((props, ref) => {
-  const { hotel, hotelList, onHotelChange,isBind } = props
+  const { hotel, hotelList, onHotelChange, isBind } = props
   const [detail, setDetail] = useState([])
   const [search, setSearch] = useState()
 
@@ -46,8 +47,8 @@ export default React.forwardRef((props, ref) => {
               title: '删除房源成功',
               icon: 'none',
             })
-            getRoomList({ hotelId: hotel.hotelId }).then((res) => {
-              setDetail(res.records || [])
+            getRoomList({ hotelId: hotel.hotelId }).then((vals) => {
+              setDetail(vals.records || [])
             })
           })
         }
@@ -61,8 +62,8 @@ export default React.forwardRef((props, ref) => {
   const [showCutover, setShowCutover] = useState(false)
   const [showCard, setShowCard] = useState(false)
   const [room, setRoom] = useState({})
-  const ShowMoldeOn = (room) => {
-    setRoom(room)
+  const ShowMoldeOn = (rooms) => {
+    setRoom(rooms)
     setShowCutover(true)
   }
   const onClose = () => {
@@ -160,9 +161,9 @@ export default React.forwardRef((props, ref) => {
         <Spin3 show={loading} />
       </View>
       <View style={{ flex: 'none' }}>
-        <view className='storeName'>店名：<Picker style={{ display: 'inline-block' }} placeholder="请选择民宿" value={hotel?.hotelId} kv={['hotelName', 'hotelId']} dicts={hotelList} onChange={handleHotelChange} /></view>
+        <view className='storeName'>店名：<Picker style={{ display: 'inline-block' }} placeholder='请选择民宿' value={hotel?.hotelId} kv={['hotelName', 'hotelId']} dicts={hotelList} onChange={handleHotelChange} /></view>
         <view className='User-info-cutover-normal'>
-            <ToggleRole role='hotel' isBind={isBind}/>
+          <ToggleRole role='hotel' isBind={isBind} />
         </view>
       </View>
       <View style={{ flex: 'none' }}>
@@ -179,7 +180,7 @@ export default React.forwardRef((props, ref) => {
           params={queryParams}
           onDataChange={setDetail}
           refresherEnabled={false}
-          noData="暂无房源信息"
+          noData='暂无房源信息'
         >
           <view className='waterfall'>
             {

src/pages/details/NoteDetails/index.jsx

@@ -14,17 +14,20 @@ 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 { getTravelMine } from '@/services/travel'
 
 import TabIcon from '@/components/HorTabbar/TabIcon'
 import { useState, useEffect } from 'react'
 import { getTouristDetail, getExtendContent, getRecommendList } from '@/services/home'
 import logo from "@/assets/icons/UserCenter/laba.png"
-import { Swiper, SwiperItem, Button, View, Ad } from '@tarojs/components';
+import { Swiper, SwiperItem, Button, View, Ad, Video } from '@tarojs/components';
 import useSave from "@/utils/hooks/useSave"
 import useLike from "@/utils/hooks/useLike"
 import NoteCards from '@/components/foodCards/NoteCard/index'
 import Taro, { useShareAppMessage } from '@tarojs/taro'
 import Extend from '../components/Extend/extend'
+import ImageList from "../components/ImageList";
+
 import './index.less'
 
 
@@ -36,7 +39,8 @@ export default withLayout((props) => {
   const [isSaved, toggleSave] = useSave(detail.isSaved, 'tourist', id)
   const [isLike, toggleLike] = useLike(detail.isLike, 'tourist', id)
   const [loading, setLoading] = useState(false)
-
+  const [travelMine, setTravelMine] = useState()
+  const [travelMineContent, setTravelMineContent] = useState()
   //banner图集数组
   const [imglist, setimglist] = useState([])
   const [index, setIndex] = useState(0)
@@ -61,11 +65,18 @@ export default withLayout((props) => {
 
 
   useEffect(() => {
+    //获取我的行程。
+    getTravelMine({ pageNum: 1, pageSize: 99, simple: true }).then(e => {
+      setTravelMine(e)
+
+    })
+
+
+
     if (id) {
       setLoading(true)
       getNoteID(id).then((res) => {
         setDetail(res)
-        console.log("🚀 ~ file: index.jsx ~ line 68 ~ getNoteID ~ res", res)
         setimglist(res.imageList || [])
         setRecommend(res.wxResourceList || [])
 
@@ -91,6 +102,8 @@ export default withLayout((props) => {
       imageUrl: detail.poster,
     }
   })
+
+
   return (
     <view className='page-index'>
       {
@@ -110,29 +123,16 @@ export default withLayout((props) => {
             <View className='huadong'>
               {
                 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>
+                  <ImageList imglist={imglist} />
                   :
-                  <Swiper className='swiper' circular onChange={handchange}>
-                    {
-                      imglist.map((item, key) => (
-                        <MoreGuide key={key} item={item} />
-
-                      ))}
-                  </Swiper>
+                  <Video
+                    controls
+                    autoplay={false}
+                    loop={false}
+                    muted={false} style={{ width: "100%", height: '200px' }} src={detail.videoUrl}
+                  >
+                  </Video>
               }
-
-              <view className='tpPage'>
-                <text>
-                  {index + 1}/{imglist.length}
-                </text>
-              </view>
             </View>
 
 
@@ -159,7 +159,7 @@ export default withLayout((props) => {
             <view className='title'>
               <image src={TextMentioned} />文中提及
             </view>
-            {(recommend || []).map((item) => <NoteCards key={item} item={item} det={item} />)}
+            {(recommend || []).map((item) => <NoteCards travelMine={travelMine} travelMineContent={travelMineContent} key={item} item={item} det={item} />)}
           </view>
           <view className='botton'>这是我的底线</view>
         </scroll-view>

src/pages/index/tabs/Guide.jsx

@@ -169,7 +169,7 @@ export default (props) => {
               </view>
               {/* --------停车场-------- */}
               {
-                !taRoomContent.parkingLocation ?null:
+                !taRoomContent.parkingLocation ? null :
                   <view className='room-box-info-Parking'>
                     <view className='room-bi-name-Parking' >
                       <view className='room-bin-title-Parking'>停车位置</view>
@@ -185,7 +185,7 @@ export default (props) => {
               }
               {/* --------无线网-------- */}
               {
-                !taRoomContent.wifiName && !taRoomContent.wifiPassword ?null:
+                !taRoomContent.wifiName && !taRoomContent.wifiPassword ? null :
                   <view className='room-box-info-WIFIContent'>
                     <view className='room-bi-name-WIFIContent' >
                       <view className='room-bin-title-WIFIContent'>WiFi信息</view>

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

@@ -14,7 +14,7 @@ import NoteCard from '../../components/NoteCard'
 const listStyle = { height: '100%' }
 
 export default (props) => {
-  const { router, person, location } = props
+  const { router, person, location, queryParamsSearch } = props
   const listClass = useMemo(() => random('f'), [])
   const [activeTab, setActiveTab] = useState(0)
   const listRef = useRef()
@@ -76,7 +76,7 @@ export default (props) => {
         ref={listRef}
         style={listStyle}
         request={getNoteList}
-        params={queryParams}
+        params={queryParamsSearch || queryParams}
         refresherEnabled={false}
         onDataChange={handleDataChange}
       >

src/pages/search/search.jsx

@@ -14,15 +14,18 @@ export default withLayout((props) => {
   const hotSearch = (val) => {
     Taro.navigateTo({ url: `/pages/searchResult/searchResult?q=${val}` });
   }
+
   const onSearch = (e) => {
     if (e.detail.value !== '') {
-      Taro.navigateTo({ url: `/pages/searchResult/searchResult?q=${e.detail.value}` });
+      Taro.navigateTo({ url: `/pages/searchResult/searchResult?q=${e.detail.value}&targetTypeValue=${selectValue}` });
     }
   }
+
   const [selectValue, setselectValue] = useState('地点')
   const state = {
     selector: ['地点', '笔记'],
     selectorChecked: selectValue,
+
     // timeSel: '12:01',
     // dateSel: '2018-04-22'
   }

src/pages/searchResult/searchResult.jsx

@@ -4,6 +4,8 @@ import CustomNav from '@/components/CustomNav'
 import Taro from '@tarojs/taro'
 import { View } from '@tarojs/components';
 import { getResourceList } from '@/services/home'
+import { getNoteList } from '@/services/note'
+
 import MasonryLayout from '@/components/MasonryLayout';
 import NoData from '@/components/NoData'
 import List from '@/components/List';
@@ -11,18 +13,21 @@ import withLayout from '@/layouts'
 import './searchResult.less'
 import Card from '../index/components/Card'
 import iconsearch from '../../assets/icons/housemantj/search.png'
+import RecommendNote from '../index/tabs/RecommendNote/index'
 
 
 const listStyle = { height: '100%' }
 
 export default withLayout((props) => {
   const { router, person, location } = props
-  const { q } = props.router.params
+  console.log("🚀 ~ file: searchResult.jsx ~ line 22 ~ withLayout ~ props", props)
+  const { q, targetTypeValue } = props.router.params
 
   const [listData, setListData] = useState({ list: [], rfTimes: 0 })
 
   // 横向tab
-  const [queryParams, setQueryParams] = useState({ q: q, location, pageNum: 1, pageSize: 10, typeId: '' })
+  // targetType: targetTypeValue 
+  const [queryParams, setQueryParams] = useState({ q: q, location, pageNum: 1, pageSize: 10, })
   const rfTimes = useRef(0)
 
 
@@ -59,23 +64,28 @@ export default withLayout((props) => {
         </view>
 
         <View style={{ flex: 1, overflow: 'hidden' }}>
-          <List
-            ref={listRef}
-            style={listStyle}
-            request={getResourceList}
-            params={queryParams}
-            refresherEnabled={false}
-            onDataChange={handleDataChange}
-            noData={<NoData />}
-          >
-            <view style={{ padding: '30rpx 15rpx' }}>
-              <MasonryLayout
-                itemKey='resourceNo'
-                listData={listData}
-                render={(item) => <Card key={item.resourceNo} item={item} />}
-              />
-            </view>
-          </List>
+          {
+            targetTypeValue == '地点' ?
+              <List
+                ref={listRef}
+                style={listStyle}
+                request={getResourceList}
+                params={queryParams}
+                refresherEnabled={false}
+                onDataChange={handleDataChange}
+                noData={<NoData />}
+              >
+                <view style={{ padding: '30rpx 15rpx' }}>
+                  <MasonryLayout
+                    itemKey='resourceNo'
+                    listData={listData}
+                    render={(item) => <Card key={item.resourceNo} item={item} />}
+                  />
+                </view>
+              </List>
+              : <RecommendNote queryParamsSearch={queryParams} />
+          }
+
         </View>
       </view>
     </view>

src/services/note.js

@@ -24,3 +24,6 @@ export const getNoteID = (id, params) => request(`/note/${id}`, { params })
 
 
 
+
+
+

src/services/travel.js

@@ -0,0 +1,32 @@
+
+import request from '@/utils/request'
+
+
+
+/**
+ * Picker获取行程
+ * @param {*} 
+ * @returns 
+ */
+
+export const getTravelMine = (params) => request(`/travel/mine`, { params })
+
+
+
+/**
+ * 新建保存行程
+ * @param {*} 
+ * @returns 
+ */
+
+export const newTravelMine = (data) => request(`/travel`, { method: 'post', data })
+
+
+
+/**
+ * 保存行程地点
+ * @param {*} 
+ * @returns 
+ */
+
+export const saveTravel = (id, data) => request(`/travel/${id}/travel-item`, { method: 'post', data })

src/shop/components/ShopKeeper/shopKeeper.jsx

@@ -88,12 +88,12 @@ export default (props) => {
     },
   ]
   return (
-    <view style={{height:'100%'}}>
-      <view style={{ padding: '0 15px 0 15px', height: '100%',display:'flex' ,flexDirection:'column' }}>
-        <view className='storexx' style={{flex:'none'}}>
-          <view className='storeName'>店名：<Picker style={{ display: 'inline-block' }} placeholder='请选择商铺' value={shop?.shopId} kv={['shopName', 'shopId']} dicts={shopList} onChange={handleHotelChange} /></view>          
+    <view style={{ height: '100%' }}>
+      <view style={{ padding: '0 15px 0 15px', height: '100%', display: 'flex', flexDirection: 'column' }}>
+        <view className='storexx' style={{ flex: 'none' }}>
+          <view className='storeName'>店名：<Picker style={{ display: 'inline-block' }} placeholder='请选择商铺' value={shop?.shopId} kv={['shopName', 'shopId']} dicts={shopList} onChange={handleHotelChange} /></view>
           <view className='User-info-cutover-normal'>
-            <ToggleRole role='shop' isBind={isBind}/>
+            <ToggleRole role='shop' isBind={isBind} />
           </view>
           <view className='tip'>（计算收入以核销为准）</view>
           <view className='money'>
@@ -114,10 +114,10 @@ export default (props) => {
               </view></view>
           </view>
         </view>
-        <view className='search' style={{flex:'none'}}>
+        <view className='search' style={{ flex: 'none' }}>
           <SearchBar placeholder='搜索订单(输入客户手机号码)' onBlur={handelSearch} />
         </view>
-        <view className='index-tabs' style={{flex:'none'}}>
+        <view className='index-tabs' style={{ flex: 'none' }}>
           <mp-tabs
             tabClass='tabs-Unselected'
             swiperClass='tabs-swiper'
@@ -129,33 +129,33 @@ export default (props) => {
           >
           </mp-tabs>
         </view>
-        <view style={{flex:1,overflow:'hidden'}}>
+        <view style={{ flex: 1, overflow: 'hidden' }}>
           {/* 未核销 */}
           {activeTab === 0 &&
-              <List
-                style={{ height: '100%' }}
-                request={getVerifiedOrder}
-                params={queryParams}
-                refresherEnabled={refres}
-                refresOff={refresOff}
-                noData={<NoData />}
-                render={({ item, index }) =>
-                  <ShopUnused key={(index)} item={item} />}
-              >
-              </List>
+            <List
+              style={{ height: '100%' }}
+              request={getVerifiedOrder}
+              params={queryParams}
+              refresherEnabled={refres}
+              refresOff={refresOff}
+              noData={<NoData />}
+              render={({ item, index }) =>
+                <ShopUnused key={(index)} item={item} />}
+            >
+            </List>
           }
           {/* 已核销 */}
           {activeTab === 1 &&
-              <List
-                style={{ height: '100%' }}
-                noData={<NoData />}
-                request={getVerifiedOrder}
-                params={queryParams}
-                refresherEnabled={refres}
-                refresOff={refresOff}
-                render={({ item, index }) => <ShopUsed verifiedOrder={verifiedOrder} key={(index)} item={item} />}
-              >
-              </List>
+            <List
+              style={{ height: '100%' }}
+              noData={<NoData />}
+              request={getVerifiedOrder}
+              params={queryParams}
+              refresherEnabled={refres}
+              refresOff={refresOff}
+              render={({ item, index }) => <ShopUsed verifiedOrder={verifiedOrder} key={(index)} item={item} />}
+            >
+            </List>
           }
         </view>
       </view>