定制行程 创建行程

src/components/BottomMoadl/index.jsx

@@ -0,0 +1,111 @@
+import Taro from '@tarojs/taro'
+import { View, Text } from '@tarojs/components'
+import DeleteTravel from '@/assets/icons/Travel/delete.png'
+import RecommendedCard from '@/components/foodCards/RecommendedCard'
+import SpinBox from "@/components/Spin/SpinBox";
+
+import { useState, useEffect } from 'react'
+import { deleteTravel, getRecommendList } from '@/services/travel'
+
+import './style.css'
+
+
+export default (props) => {
+  const { frameTitle, onRecommend, flag, ico, textNext, location, dayNumber, travelId, handelAddTravel } = props
+
+  // const [flag, setFlag] = useState(false)
+  // const [wrapAnimate, setWrapAnimate] = useState('wrap wrapAnimate')
+  // const [frameAnimate, setFrameAnimate] = useState('frame-wrapper frameAnimate')
+  let wrapAnimate = 'wrap wrapAnimate'
+  let frameAnimate = 'frame-wrapper frameAnimate'
+  const [textNextSum, setTextNext] = useState(1)
+  const [recommendContent, setRecommendContent] = useState([])
+  const [loading, setLoading] = useState(false)
+
+  const hideFrame = () => {
+    wrapAnimate = 'wrap wrapAnimateOut'
+    frameAnimate = 'frame-wrapper frameAnimateOut'
+    onRecommend()
+
+  }
+
+  const catchNone = () => {
+    //阻止冒泡
+
+  }
+  const handelText = () => {
+    handleTextNext()
+
+  }
+
+
+  useEffect(() => {
+
+    getRecommendList({ location: location, pageNum: textNextSum, pageSize: 3 }).then(e => {
+      setRecommendContent(e.records)
+
+    })
+  }, [])
+
+
+  //换一批
+  const handleTextNext = (e) => {
+    setLoading(true)
+    console.log("🚀 ~ file: index.jsx ~ line 61 ~ handleTextNext ~ e", e)
+
+    e.stopPropagation()
+
+    setTextNext(textNextSum + 1)
+    getRecommendList({ location: location, pageNum: textNextSum, pageSize: 3 }).then(e => {
+      setRecommendContent(e.records)
+      setLoading(false)
+
+    }).catch(s => {
+      setLoading(false)
+
+    })
+
+  }
+
+  return (
+    flag && <view  >
+      <view className={wrapAnimate} style='background:rgba(0,0,0,0);'></view>
+      <view onClick={hideFrame} className={frameAnimate}>
+        <view onClick={catchNone} className='frame'>
+          {/* 标题  */}
+          <view className='title-wrapper '>
+            <view>{frameTitle}</view>
+            {/* <image onClick={hideFrame} src={DeleteTravel} mode='widthFix'></image> */}
+          </view>
+          {/* 内容 */}
+
+          <View style='overflow-x: hidden;'>
+            <SpinBox loading={loading}>
+
+              {
+                recommendContent.map((item, index) =>
+
+
+
+                  <RecommendedCard key={index} item={item} det={item} location={location} travelId={travelId} dayNumber={dayNumber} handelAddTravel={handelAddTravel} />
+                )
+              }
+              {props.children}
+            </SpinBox>
+
+            <view className='bottom-text' onClick={handleTextNext}>
+              <image src={ico} />
+              <text>{textNext}</text>
+            </view>
+          </View>
+
+        </view>
+
+      </view>
+
+    </view>
+  )
+
+
+
+}

src/components/BottomMoadl/style.css

@@ -0,0 +1,117 @@
+.wrapAnimate {
+  animation: wrapAnimate 0.5s ease-in-out forwards;
+}
+@keyframes wrapAnimate {
+  0% {
+  }
+  100% {
+    background: rgba(0, 0, 0, 0.35);
+  }
+}
+.wrapAnimateOut {
+  animation: wrapAnimateOut 0.4s ease-in-out forwards;
+}
+@keyframes wrapAnimateOut {
+  0% {
+    background: rgba(0, 0, 0, 0.35);
+  }
+
+  100% {
+    background: rgba(0, 0, 0, 0);
+  }
+}
+.frameAnimate {
+  animation: frameAnimate 0.5s ease forwards;
+}
+@keyframes frameAnimate {
+  0% {
+  }
+  100% {
+    opacity: 1;
+    top: 0vh;
+  }
+}
+.frameAnimateOut {
+  animation: frameAnimateOut 0.5s ease forwards;
+}
+@keyframes frameAnimateOut {
+  0% {
+    opacity: 2;
+    top: 0vh;
+  }
+  50% {
+    opacity: 1;
+    top: 50vh;
+  }
+  100% {
+    opacity: 0;
+    top: 100vh;
+  }
+}
+.frame-wrapper {
+  position: fixed;
+  height: 100vh;
+  width: 100vw;
+  z-index: 2;
+  top: 50vh;
+}
+.frame {
+  background: #fff;
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  padding: 2.9vw 2.9vw 0;
+  border-top-left-radius: 20px;
+  border-top-right-radius: 20px;
+  z-index: 3;
+  box-sizing: border-box;
+  align-items: center;
+  text-align: center;
+}
+.title-wrapper {
+  justify-content: space-between;
+
+  text-align: center;
+  height: 28px;
+  font-size: 35px;
+  font-weight: 700;
+  color: #202020;
+  margin-bottom: 5.9vw;
+}
+.title-wrapper > image {
+  width: 3.5vw;
+  height: 3.5vw;
+  padding: 0 5vw;
+  margin-right: -5vw;
+}
+/* .flex {
+  display: flex;
+  align-items: center;
+} */
+.wrap {
+  position: fixed;
+  z-index: 1;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+
+.bottom-text {
+  margin-left: 40%;
+  width: 100%;
+  padding: 1.5em 0 1.5em 0;
+  display: flex;
+  align-items: center;
+}
+
+.bottom-text > image {
+  width: 32px;
+  height: 32px;
+}
+.bottom-text > text {
+  width: 110px;
+  font-size: 30px;
+  font-weight: bold;
+  color: #202020;
+}

src/components/foodCards/CustomCard/index.jsx

@@ -0,0 +1,112 @@
+import { useState, useEffect, useRef } from 'react'
+
+import Taro from '@tarojs/taro'
+import { deleteTravel, deleteTravelItem } from '@/services/travel'
+
+import { View, Text, Image, ScrollView } from '@tarojs/components'
+import CouponCard from '@/components/CouponCard'
+import { compressImage } from '@/utils'
+import SaveIcon from '@/components/SaveIcon'
+import Location from '@/components/Location'
+
+import grassOFF from '@/assets/icons/housemantj/grassOFF.png'
+import DeleteTravel from '@/assets/icons/Travel/delete.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, editable, setScroll, goshop, det, onDay, onDelete } = props
+  // const travelId = travelMineContent?.records[0]?.travelId
+  const { targetId, itemId } = props.item
+  const goDetail = () => {
+    Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${targetId}` })
+
+  }
+  const goFood = () => {
+    Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${targetId}` })
+
+  }
+  const [showCutover, setShowCutover] = useState(false)
+  const [valueList, setValueList] = useState([])
+
+
+
+
+
+
+
+
+
+  // useEffect(() => {
+
+  // }, [item])
+
+  const onClose = () => {
+    //关闭当前套餐详情弹窗
+    setShowCutover(false)
+    //使父组件恢复滚动
+    setScroll(true)
+  }
+
+
+
+
+  const handlePayClick = (e) => {
+
+    onDelete(itemId)
+
+    // Taro.navigateTo({ url: `/pages/PayOrder/index?packageId=${item.packageId}&scene=${scene || ''}&subOrderId=${subOrderId}&id=${id}` })
+
+  }
+  const PayAction = <Action.Icon icon={DeleteTravel} 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={item.targetType === 'tourist' ? goDetail : goFood}>
+          <CouponMedia.Header
+            cashback={item.cashback}
+            image={compressImage(item.poster)}
+          // badge='food'
+          />
+          <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-card-text' style={{ marginTop: '10rpx' }}>
+                <Text className='cpn-card-text_mn'>￥{`${(item.averagePrice == '' ? '0.00' : item.averagePrice / 100)?.toFixed(2)}元`}</Text>
+                {/* <Text className='cpn-card-text_rm'>{`门市价${(item.standardPrice / 100)?.toFixed(2)}元`}</Text> */}
+              </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/CustomCard/style.less

@@ -0,0 +1,52 @@
+.view-picker {
+  position: relative;
+  top: 30%;
+}
+
+.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/components/foodCards/NoteCard/index.jsx

@@ -1,10 +1,12 @@
 import { useState, useEffect, useRef } from 'react'
 
 import Taro from '@tarojs/taro'
-import { View, Picker, Image, ScrollView } from '@tarojs/components'
+import { View, Picker, Image, ScrollView, Text } from '@tarojs/components'
 import CouponCard from '@/components/CouponCard'
 import { compressImage } from '@/utils'
 import SaveIcon from '@/components/SaveIcon'
+import Location from '@/components/Location'
+
 import grassOFF from '@/assets/icons/housemantj/grassOFF.png'
 import grassNO from '@/assets/icons/housemantj/grassNO.png'
 import Popup from '@/components/Popup'
@@ -18,9 +20,13 @@ const Action = CouponCard.Action
 
 //套餐卡片
 export default (props) => {
-  const { item, st, editable, setScroll, goshop, travelMine, travelMineContent } = props
+  const { item, st, editable, setScroll, goshop, travelMine, resourceList, det, handelNoteList } = props
+  console.log("🚀 ~ file: index.jsx ~ line 24 ~ item", item.targetId)
   // const travelId = travelMineContent?.records[0]?.travelId
-  const { targetId } = props.item
+  const targetId = props.item?.targetId
+  const targetType = props.item?.targetType
+
+
   const goFood = () => {
     Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${targetId}` })
 
@@ -30,10 +36,10 @@ export default (props) => {
 
 
   useEffect(() => {
-    setValueList(travelMine?.records)
+    setValueList(travelMine.records)
 
 
-  }, [travelMine?.records])
+  }, [travelMine.records, item])
 
   const onClose = () => {
     //关闭当前套餐详情弹窗
@@ -48,7 +54,7 @@ export default (props) => {
 
   const numberTrave = (new Array(traveCoumun).fill()).map((_, index) => ({ id: index + 1, title: `第 ${index + 1} 天` }))
 
-  const array = [valueList, numberTrave]
+  const array = [valueList, travelMine.records == '' ? [] : numberTrave]
 
 
   const handleColumn = e => {
@@ -58,55 +64,73 @@ export default (props) => {
 
 
     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 m = day.getMonth() + 1;
   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//天数
+
+    if (travelMine.records == '') {
 
 
-    console.log(firstValue, secondValue);
+      console.log('没有行程');
+      newTravelMine({ title: `我的行程 ${y}-${m}-${d}` }).then(res => {
+        handelNoteList()
+        // 首先创建一个行程，然后才能拿到下面的这些数据
 
+        const [firstInx, secondInx] = e.detail?.value
 
-    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)
+        const firstValue = valueList[firstInx] || ''
+        console.log("🚀 ~ file: index.jsx ~ line 89 ~ newTravelMine ~ e.detail", firstValue)
+
+        const secondValue = numberTrave[secondInx] || ''
+
+        const { travelId } = firstValue
+
+        //行程内容
+        const { i } = secondValue//天数
         // saveTravel({})
-        saveTravel(travelId, { dayOrder: i, targetId: targetId, targetType: 'note' }).then((res) => {
-          Taro.
-            Taro.showToast({
-              title: '添加成功',
-              icon: 'none',
-              duration: 1000
-            })
-          console.log(res);
+        saveTravel(res.travelId, { dayOrder: i, targetId: targetId, targetType: targetType }).then((val) => {
+          Taro.showToast({
+            title: '添加成功',
+            icon: 'none',
+            duration: 1000
+          })
+          resourceList(travelId)
         })
       })
     } else {
-      saveTravel(travelId, { dayOrder: i, targetId: targetId, targetType: 'note' }).then((res) => {
-        console.log(res);
+      console.log('有行程');
+      const [firstInx, secondInx] = e.detail.value
+
+      const firstValue = valueList[firstInx]
+
+      const secondValue = numberTrave[secondInx]
+
+      const { travelId } = firstValue
+
+      //行程内容
+      const { i } = secondValue//天数
+
+      saveTravel(travelId, { dayOrder: i, targetId: targetId, targetType: targetType }).then((res) => {
         Taro.showToast({
           title: '添加成功',
           icon: 'none',
 
           duration: 1000
         })
+        resourceList(travelId)
+
+        // setGrowGrass(grassNO)
+
       })
       // console.log('else');
 
@@ -115,6 +139,14 @@ export default (props) => {
 
 
   const handlePayClick = () => {
+    travelMine.records == '' ?
+      Taro.showToast({
+        title: '暂无行程，点击种草自动创建',
+        icon: 'none',
+        duration: 3000
+      })
+      : ''
+
     // Taro.navigateTo({ url: `/pages/PayOrder/index?packageId=${item.packageId}&scene=${scene || ''}&subOrderId=${subOrderId}&id=${id}` })
 
   }
@@ -129,13 +161,9 @@ export default (props) => {
         onChange={onChange}
         scrollType='link'
       // value={}
-
       >
-
-        <Action.Icon icon={item.isVisited > 1 ? grassOFF : grassNO} text={item.isVisited > 1 ? '种草' : '已种草'} onClick={handlePayClick} />
-
+        <Action.Icon icon={item.isVisited < 1 ? grassOFF : grassNO} text={item.isVisited < 1 ? '种草' : '已种草'} onClick={handlePayClick} />
       </Picker>
-
     </View>
 
 
@@ -164,8 +192,12 @@ export default (props) => {
               <View className='cpn-card-text'>
                 {(item.title).toString().length > 25 ? (item.title).substring(0, 25) + '...' : (item.title)}
               </View>
+              <View className='cpn-card-text' style={{ marginTop: '10rpx' }}>
+                <Text className='cpn-card-text_mn'>￥{`${(item.averagePrice == '' ? '0.00' : item.averagePrice / 100)?.toFixed(2)}元`}</Text>
+                {/* <Text className='cpn-card-text_rm'>{`门市价${(item.standardPrice / 100)?.toFixed(2)}元`}</Text> */}
+              </View>
               <View className='cpn-md-act'>
-                {/* <Location {...det} /> */}
+                <Location {...det} />
                 <SaveIcon saved={item.isSaved > 0} targetType='shop_package' editable={editable} targetId={item.packageId} />
               </View>
             </View>

src/components/foodCards/RecommendedCard/index.jsx

@@ -0,0 +1,109 @@
+import { useState } from 'react'
+
+import Taro from '@tarojs/taro'
+import { saveTravel } from '@/services/travel'
+
+import { View, Text, Image, ScrollView } from '@tarojs/components'
+import CouponCard from '@/components/CouponCard'
+import { compressImage } from '@/utils'
+import SaveIcon from '@/components/SaveIcon'
+import Location from '@/components/Location'
+
+import add from '@/assets/icons/Travel/add.png'
+
+import Popup from '@/components/Popup'
+
+import './style.less'
+
+
+const CouponMedia = CouponCard.Media
+const Action = CouponCard.Action
+
+//套餐卡片
+export default (props) => {
+  const { item, st, editable, setScroll, goshop, det, travelId, handelAddTravel, dayNumber } = props
+  // const travelId = travelMineContent?.records[0]?.travelId
+  const { targetId, itemId, targetType } = props.item
+  const goDetail = () => {
+    Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${targetId}` })
+
+  }
+  const goFood = () => {
+    Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${targetId}` })
+
+  }
+  const [showCutover, setShowCutover] = useState(false)
+  const [valueList, setValueList] = useState([])
+
+
+  const onClose = () => {
+    //关闭当前套餐详情弹窗
+    setShowCutover(false)
+    //使父组件恢复滚动
+    setScroll(true)
+  }
+
+
+
+  const handlePayClick = (e) => {
+    console.log("🚀 ~ file: index.jsx ~ line 25 ~ item", item, travelId)
+
+    saveTravel(travelId, { dayOrder: dayNumber, targetId: targetId, targetType: targetType }).then((res) => {
+      Taro.showToast({
+        title: '添加成功',
+        icon: 'none',
+
+        duration: 1000
+      })
+      handelAddTravel()
+
+
+    })
+
+    // Taro.navigateTo({ url: `/pages/PayOrder/index?packageId=${item.packageId}&scene=${scene || ''}&subOrderId=${subOrderId}&id=${id}` })
+
+  }
+  const PayAction = <Action.Icon icon={add} 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={item.targetType === 'tourist' ? goDetail : goFood}>
+          <CouponMedia.Header
+            cashback={item.cashback}
+            image={compressImage(item.poster)}
+          // badge='food'
+          />
+          <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-card-text' style={{ marginTop: '10rpx' }}>
+                <Text className='cpn-card-text_mn'>￥{`${(item.averagePrice == '' ? '0.00' : item.averagePrice / 100)?.toFixed(2)}元`}</Text>
+                {/* <Text className='cpn-card-text_rm'>{`门市价${(item.standardPrice / 100)?.toFixed(2)}元`}</Text> */}
+              </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/RecommendedCard/style.less

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

src/components/foodCards/foodCards.jsx

@@ -6,8 +6,8 @@ import { compressImage } from '@/utils'
 import SaveIcon from '@/components/SaveIcon'
 import Pay from '@/assets/icons/housemantj/pay.png'
 import Popup from '@/components/Popup'
-import './style.less'
 import { useState } from 'react'
+import './style.less'
 
 
 const CouponMedia = CouponCard.Media
@@ -15,7 +15,7 @@ const Action = CouponCard.Action
 
 //套餐卡片
 export default (props) => {
-  const { item, st, det, editable,setScroll, goshop, scene, subOrderId, id } = 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}` })
@@ -42,8 +42,8 @@ export default (props) => {
   const PayAction = <Action.Icon icon={Pay} text='支付' onClick={handlePayClick} />
   return (
     <View style={{ margin: '15px 5px' }} >
-      <View className='packageDetail' style={{display:goshop?'':'none'}}>
-        <Popup show={showCutover} maskClosable={showCutover}  onClose={onClose}>
+      <View className='packageDetail' style={{ display: goshop ? '' : 'none' }}>
+        <Popup show={showCutover} maskClosable={showCutover} onClose={onClose}>
           <ScrollView
             scrollY
             style={{ maxHeight: '60vh' }}

src/pages/MineUserAll/MyTravel/index.jsx

@@ -1,22 +1,64 @@
 import Taro from '@tarojs/taro'
 import { Image, Button, View } from '@tarojs/components'
 import SpinBox from "@/components/Spin/SpinBox";
+import formatTime from '@/utils/formatTime'
+import withLayout from '@/layouts'
+
 import { useState, useEffect } from "react";
 import SlideView from '@/components/SlideView';
 import editImg from '@/assets/icons/Travel/editimg.png'
 import CustomNav from '@/components/CustomNav'
+import { getTravelMine, deleteTravel } from '@/services/travel'
+
 import './style.less'
 
-export default (props) => {
+export default withLayout((props) => {
 
   const [loading, setLoading] = useState(false)
 
-  const handelDelete = () => {
+  //删除
+  const handelDelete = (e) => {
+    Taro.showModal({
+      title: '提示',
+      content: '确定要删除吗',
+      success: function (res) {
+        if (res.confirm) {
+
+          deleteTravel(e.travelId).then(r => {
+            Taro.showToast({
+              title: '删除成功',
+              icon: 'none',
+              duration: 1000
+            })
+            getList()
+
+          })
 
+        } else if (res.cancel) {
+
+
+        }
+      }
+    })
+
+  }
+  const handelEdit = (item) => {
+    Taro.navigateTo({ url: `/pages/Travel/Edit/index?id=${item.travelId}&dayNum=${item.dayNum}` })
   }
-  const handelEdit=()=>{
-    Taro.navigateTo({ url: '/pages/Travel/Edit/index' })
+
+  const [travelMine, setTravelMine] = useState([])
+  const getList = () => {
+    getTravelMine({ pageNum: 1, pageSize: 99, }).then(e => {
+      setTravelMine(e.records)
+
+
+    })
   }
+
+  useEffect(() => {
+    getList()
+
+  }, [])
   return (
     <View className='page-index box-content'>
       <View className='index-navbar'>
@@ -29,18 +71,25 @@ export default (props) => {
             style='height: 100%;'
           >
             <View className='View-box'>
-              <SlideView del onDelete={() => handelDelete(item)} className='myTravel'>
-                <View className='View-box-Card'>
-                <View className='bottom'>
-                  <View className='travelName'>定制行程1</View>
-                  <Image src={editImg} className='edit' onClick={handelEdit}></Image>
-                  </View>
-                  <View className='bottom'>
-                    <View className='travelDay'>行程时间：1天</View>
-                    <View className='travelDate'>创建时间：2021年10月31日</View>
-                  </View>
-                </View>
-              </SlideView>
+              {
+                travelMine.map((item, index) =>
+
+                  <SlideView key={index} del onDelete={() => handelDelete(item)} className='myTravel'>
+                    <View className='View-box-Card'>
+                      <View className='bottom'>
+                        <View className='travelName'>{item.title}</View>
+                        <Image src={editImg} className='edit' onClick={() => handelEdit(item)}></Image>
+                      </View>
+                      <View className='bottom'>
+                        <View className='travelDay'>行程时间：{item.dayNum}天</View>
+                        <View className='travelDate'>创建时间：{formatTime(item.createDate, "yyyy/MM/dd")}</View>
+                      </View>
+                    </View>
+                  </SlideView>
+
+                )
+              }
+
               <View className='foot'>这是我的底线</View>
             </View>
           </scroll-view>
@@ -48,4 +97,4 @@ export default (props) => {
       </View>
     </View >
   )
-}
+})

src/pages/Travel/Edit/NewCustom/index.jsx

@@ -0,0 +1,86 @@
+
+import { useState } from 'react'
+import CustomCard from '@/components/foodCards/CustomCard/index'
+
+import Taro from '@tarojs/taro'
+import { View, Button } from '@tarojs/components'
+import { getTravelMine, deleteTravelItem } from '@/services/travel'
+import openUp from './ico/openUp.png'
+import packUp from './ico/packUp.png'
+import './style.less'
+
+
+
+export default (props) => {
+  const { item, handleDelete } = props
+  const { travelItemList, travelId, dayNum } = item
+
+
+
+
+  const [unfold, setUnfold] = useState(false)
+  const onUnfold = () => {
+    setUnfold(!unfold)
+
+  }
+
+  const onDay = () => {
+    console.log("🚀 ~ file: index.jsx ~ line 17 ~ item", item)
+
+  }
+
+  const onDelete = (e) => {
+
+    const itemId = e
+    Taro.showModal({
+      title: '提示',
+      content: '确定要删除吗',
+      success: function (res) {
+        if (res.confirm) {
+          handleDelete()
+
+          deleteTravelItem(travelId, itemId).then(val => {
+            Taro.showToast({
+              title: '删除成功',
+              icon: 'none',
+              duration: 1000
+            })
+          })
+        } else if (res.cancel) {
+
+
+        }
+      }
+    })
+
+  }
+
+
+  return (
+    <view style='height:100%'>
+      {
+
+        travelItemList == '' ? '' : <view onClick={onUnfold} className='cssUnfold' >
+          <image className='unfoldIcoCss' src={unfold === true ? packUp : openUp} />
+          展开</view>
+      }
+
+
+      <scroll-view scrollY style={unfold === false ? 'height:100%;' : ' height:0em;'} >
+        {
+
+          travelItemList.map((ite, index) =>
+            item == '' ? <view></view> :
+
+              <CustomCard item={ite} det={ite} travelId={travelId} onDelete={onDelete} />
+
+          )
+
+        }
+
+      </scroll-view>
+    </view>
+
+
+  )
+}

src/pages/Travel/Edit/NewCustom/style.less

@@ -0,0 +1,9 @@
+.cssUnfold {
+  margin-left: 10px;
+  display: flex;
+  align-items: center;
+  .unfoldIcoCss {
+    width: 40px;
+    height: 40px;
+  }
+}

src/pages/Travel/Edit/index.config.js

@@ -4,7 +4,10 @@ export default {
   styleIsolation: 'shared',
   enableShareAppMessage: true,
   disableScroll: true,
+
   usingComponents: {
-    "mp-dialog": "weui-miniprogram/dialog/dialog"
+    "mp-dialog": "weui-miniprogram/dialog/dialog",
+
   }
 }
+

src/pages/Travel/Edit/index.jsx

@@ -1,110 +1,223 @@
 import Taro from '@tarojs/taro'
-import { Image, Button, View,Text } from '@tarojs/components'
+import { Image, Button, View, Text } from '@tarojs/components'
 import SpinBox from "@/components/Spin/SpinBox";
+import CustomCard from '@/components/foodCards/CustomCard/index'
+
 import { useState, useEffect } from "react";
-import NoData from '@/components/NoData'
-import MyCollect from '@/components/CollectList/MyCollect'
+import BottomMoadl from '@/components/BottomMoadl/index'
+import RecommendedCard from '@/components/foodCards/RecommendedCard'
 import Travel from '@/assets/icons/Travel/travel.png'
+import ChangeNext from '@/assets/icons/Travel/ChangeNext.png'
+import withLayout from '@/layouts'
+
 import editImg from '@/assets/icons/Travel/editimg.png'
 import CustomNav from '@/components/CustomNav'
-import RecommendModel from './components/RecommendModel'
+import { deleteTravelItem, getTravelID, getRecommendList } from '@/services/travel'
+
+import NewCustom from './NewCustom'
 import './style.less'
 
-export default (props) => {
+export default withLayout((props) => {
+  const { router, location } = props
+  const { id, dayNum } = router.params
+
 
   const [loading, setLoading] = useState(false)
-  const a = {
-    actualPrice: 0,
-    areaName: "建邺区",
-    areaPName: "南京市",
-    averagePrice: 2900,
-    cashback: 0,
-    cityId: "320105",
-    distance: 11131,
-    environmentScore: 0,
-    lat: "32.052602",
-    likeNum: 3,
-    lng: "118.846892",
-    poster: "http://yz-shigongli.oss-accelerate.aliyuncs.com/2021-09/1631772797192-1631772717(1).jpg",
-    pvNum: 325,
-    resourceNo: 128,
-    saveDate: "2021-09-26T15:42:58",
-    saveId: 512,
-    serviceScore: 0,
-    shopId: null,
-    standardPrice: 0,
-    status: 1,
-    sweetScore: 0,
-    targetId: "45c1fb5116bb429b22b68175481d7726",
-    targetName: "颐和路——一条颐和路，半部民国史",
-    targetType: "tourist",
-    title: "山川过雨晓光浮，初看江南第一州",
-    uvNum: 33,
-    weight: 3
+
+
+
+  const [showCutover, setShowCutover] = useState([])
+  const [travelCustom, setTravelCustom] = useState()
+
+
+  const handleDelete = (res) => {
+    setLoading(true)
+    getTravelID(id).then(e => {
+      setTravelCustom(e)
+      setShowCutover(e.travelItemList)
+      netx(e.travelItemList)
+      setLoading(false)
+
+    }).catch(r => {
+      setLoading(false)
+
+    })
   }
-  const b = [a];
 
 
-  const [showCutover, setShowCutover] = useState(false)
 
-  const handelDelete = () => {
+  const [dayNumber, setDayNumber] = useState(1)
+  const sum = dayNum - dayNumber
+
+
+  const addTextSum = () => {
+    setDayNumber(dayNumber + 1)
+    if (dayNumber > dayNum) {
+      console.log('asdasdsad');
+
+    } else {
+      console.log('98888888');
+    }
+
+
 
   }
-  const onClose = () => {
-    setShowCutover(false)
+  const minusTextSum = () => {
+    setDayNumber(dayNumber - 1)
+
+
   }
-  const handelEdit = () => {
-    //测试用的可以删
-    Taro.redirectTo({url:'/pages/Travel/customizedTravel/index'})
+
+
+  const netx = (e) => {
+
+
+    let a = e.filter((val) => {
+      return val.dayOrder == dayNumber
+    })
+    setShowCutover(a)
+
   }
-  const setRecommend=()=>{
-    setShowCutover(true)
+
+  const handelAddTravel = () => {
+    setLoading(true)
+
+    //获取我的行程。
+    getTravelID(id).then(e => {
+      setTravelCustom(e)
+      setShowCutover(e.travelItemList)
+      netx(e.travelItemList)
+      setLoading(false)
+
+    }).catch(e => {
+      setLoading(false)
+
+    })
+
 
   }
-  const handelCancel=()=>{
-    Taro.redirectTo({url:'/pages/MineUserAll/MyTravel/index'})
+
+  useEffect(() => {
+
+    setLoading(true)
+
+    //获取我的行程。
+    getTravelID(id).then(e => {
+      setTravelCustom(e)
+      setShowCutover(e.travelItemList)
+      netx(e.travelItemList)
+      setLoading(false)
+
+    }).catch(e => {
+      setLoading(false)
+
+    })
+
+
+  }, [id, dayNumber])
+
+
+
+  const onDelete = (e) => {
+
+    const itemId = e
+    Taro.showModal({
+      title: '提示',
+      content: '确定要删除吗',
+      success: function (res) {
+        if (res.confirm) {
+
+          deleteTravelItem(id, itemId).then(val => {
+            Taro.showToast({
+              title: '删除成功',
+              icon: 'none',
+              duration: 1000
+            })
+            handleDelete()
+
+          })
+        } else if (res.cancel) {
+
+
+        }
+      }
+    })
+
+  }
+
+
+  const [showFrame, setShowFrame] = useState(false)
+
+
+
+
+
+  //行程推荐
+  const setRecommend = () => {
+
+
+    setShowFrame(!showFrame)
+
   }
-  const sumbit=()=>{
-    // 新增修改
+
+  const handelCancel = () => {
+    Taro.redirectTo({ url: '/pages/MineUserAll/MyTravel/index' })
   }
+
   return (
-    <View className='page-index box-content'>
-      <View className='index-navbar'>
-        <CustomNav title='定制行程' />
-      </View>
-      <View className='TravelTitle'>
-        定制行程2<Image src={editImg} className='edit' onClick={handelEdit}></Image>
-      </View>
-        <RecommendModel showCutover={showCutover} onClose={onClose}>1111</RecommendModel>
-      <View className='index-container'>
-        <SpinBox loading={loading}>
-          <scroll-view
-            scrollY
-            style='height: 100%;'
-          >
-            <View className='View-box'>
-              {
-                b.length == 0 ?
-                  <NoData /> :
-                  <view className='waterfall'>
-                    {
-                      b.map((item, index) => { return <MyCollect key={(index)} item={item} /> })
-                    }
-                  </view>
-              }
-              <View className='tuijian' onClick={setRecommend}>
-                <Image src={Travel}></Image>
-                <Text>查看行程推荐</Text>
+    <view className='page-index'>
+      {/* 
+      frameTitle 标题
+      flag 弹窗显示 true false
+      ico 底部图标
+      textNext 底部文字
+      */}
+      <BottomMoadl frameTitle='行程推荐' dayNumber={dayNumber} travelId={id} flag={showFrame} handelAddTravel={handelAddTravel} onRecommend={setRecommend} ico={ChangeNext} textNext='换一批' location={location} />
+
+      <View className='box-content'>
+        <View className='index-navbar'>
+          <CustomNav title='定制行程' />
+        </View>
+        <scroll-view scrollY style='height: calc(100% - 75px);margin-bottom: 40px;' >
+
+          <View className='TravelTitle'>
+            {travelCustom?.title}<Image src={editImg} className='edit' ></Image>
+          </View>
+          <View className='index-container'>
+
+            <SpinBox loading={loading}>
+
+              <View className='View-box'>
+
+                {
+                  showCutover.map((item, index) =>
+
+                    <CustomCard key={index} item={item} det={item} travelId={item.travelId} onDelete={onDelete} />
+
+                  )
+                }
               </View>
-            </View>
-          </scroll-view>
-        </SpinBox>
-      </View>
-      <View className='bottom'>
-        <Button className='cancel' onClick={handelCancel}>取消</Button>
-        <Button className='btnok' onClick={sumbit}>确定</Button>
-      </View>
-
-    </View >
+            </SpinBox>
+          </View>
+
+
+          <View className='tuijian' onClick={setRecommend}>
+            <Image src={Travel}></Image>
+            <Text>查看行程推荐</Text>
+          </View>
+          <View className='bottom'>
+            {
+              dayNumber >= dayNum && <Button className='bottom-btn bottom-btn-cancel' onClick={minusTextSum} >上一天</Button>
+            }
+            {
+              sum >= 1 && <Button className='bottom-btn bottom-btn-ok' onClick={addTextSum}>下一天</Button>
+            }
+
+          </View>
+
+        </scroll-view>
+      </View >
+    </view>
+
   )
-}
+})

src/pages/Travel/Edit/style.less

@@ -1,12 +1,12 @@
 .box-content {
   height: 100vh;
-  .TravelTitle{
+  .TravelTitle {
     font-weight: bold;
     color: #333;
     line-height: 44px;
     margin: 63px 30px 15px;
     display: flex;
-    .edit{
+    .edit {
       width: 40px;
       height: 40px;
       margin: 0 30px;
@@ -15,14 +15,15 @@
   .View-box {
     margin: 30px 20px 0 20px;
   }
-  .tuijian{
+  .tuijian {
+    margin-bottom: 2em;
     font-size: 28px;
     font-weight: bold;
     text-decoration: underline;
     color: #274291;
     line-height: 30px;
     text-align: center;
-    image{
+    image {
       width: 42px;
       height: 41px;
       position: relative;
@@ -30,12 +31,37 @@
       right: 6px;
     }
   }
-  .bottom{
-    flex: none; 
-    margin: 60px 100px;
-    letter-spacing: 5px;
-    height: 78px;
-    .cancel{
+  .bottom {
+    // flex: none;
+    margin: 60px 0;
+    // letter-spacing: 5px;
+    // height: 78px;
+
+    text-align: center;
+
+    &-btn {
+      width: 236px;
+      font-size: 30px;
+      border-radius: 12px;
+      font-weight: bold;
+      display: inline-block;
+      border: 2px solid #274190;
+
+      &:nth-child(2) {
+        margin-left: 4em;
+      }
+    }
+
+    &-btn-cancel {
+      color: #274290;
+    }
+
+    &-btn-ok {
+      background: #274291;
+      color: #fff;
+    }
+
+    .cancel {
       width: 236px;
       font-size: 30px;
       border: 2px solid #274190;
@@ -45,14 +71,30 @@
       float: left;
     }
 
-    .btnok{
+    .btnok {
       width: 236px;
       background: #274291;
       border-radius: 12px;
       font-size: 30px;
       font-weight: bold;
-      color: #FFF;
+      color: #fff;
       float: right;
     }
+    .hoverBtnok {
+      width: 236px;
+      background: #274291;
+      border-radius: 12px;
+      font-size: 30px;
+      font-weight: bold;
+      color: #fff;
+    }
+    .hoverCanel {
+      width: 236px;
+      font-size: 30px;
+      border: 2px solid #274190;
+      border-radius: 12px;
+      font-weight: bold;
+      color: #274290;
+    }
   }
 }

src/pages/Travel/customizedTravel/components/CustomDay/index.jsx

@@ -1,21 +1,46 @@
 import React, { useState } from 'react'
 import Taro from '@tarojs/taro'
-import { Input, Button, View,  Label } from '@tarojs/components'
+import { Input, Button, View, Label } from '@tarojs/components'
 import Popup from '@/components/Popup'
+import { newTravelMine } from '@/services/travel'
+
 import './style.less'
 
 
 export default (props) => {
   const { showCutover, onClose, onFinish } = props
-  const [roomNum, setRoomNum] = useState('')
+  const [datNum, setDayNum] = useState('')
   const [loading, setLoading] = useState(false)
-  const handelShare = () => {
-    Taro.navigateTo({url:'/pages/Travel/Edit/index'})
+
+
+  const day = new Date();
+  const y = day.getFullYear();
+  const m = day.getMonth() + 1;
+  const d = day.getDate();
+
+  const handelShare = (e) => {
+    newTravelMine({ title: `我的自定义行程 ${y}-${m}-${d}`, dayNum: datNum }).then(res => {
+      Taro.showToast({
+        title: '创建成功',
+        icon: 'none',
+        duration: 2000
+      })
+      Taro.navigateTo({ url: `/pages/Travel/Edit/index?id=${res.travelId}&dayNum=${res.dayNum}` })
+
+    })
+
+
+    // Taro.navigateTo({url:'/pages/Travel/Edit/index'})
   }
-  const handelClose=()=>{
-    setRoomNum()
+  const handelClose = (e) => {
+
     onClose()
   }
+
+  const handelChangle = (e) => {
+    setDayNum(e)
+
+  }
   return (
     <Popup show={showCutover} maskClosable={showCutover} onClose={handelClose}>
       <View className='from-room srl'>
@@ -24,8 +49,8 @@ export default (props) => {
         </View>
         <View className='srleft'>
           <Label>出行天数：</Label>
-          <Input onInput={(e) => setRoomNum(e.detail.value)} value={roomNum} type='number' placeholder='请输入出行天数' />
-        </View>        
+          <Input onInput={(e) => handelChangle(e.detail.value)} value={datNum} type='number' maxlength='2' min='1' max='10' placeholder='请输入出行天数' />
+        </View>
         <View>
           <Button className='cancel' onClick={handelClose}>取消</Button>
           <Button className='btn' onClick={handelShare} loading={loading} disabled={loading}>确定</Button>

src/pages/Travel/customizedTravel/components/ThreeModel/index.jsx

@@ -0,0 +1,56 @@
+import React, { useState } from 'react'
+import Taro from '@tarojs/taro'
+import { Input, Button, View, Label } from '@tarojs/components'
+import Popup from '@/components/Popup'
+import { newTravelMine } from '@/services/travel'
+import './style.less'
+
+
+export default (props) => {
+  const { showCutover, onClose, onFinish } = props
+  const [roomNum, setRoomNum] = useState('')
+  const [loading, setLoading] = useState(false)
+  const day = new Date();
+  const y = day.getFullYear();
+  const m = day.getMonth() + 1;
+  const d = day.getDate();
+  const handelShare = () => {
+
+    newTravelMine({ title: `我的行程三日游 ${y}-${m}-${d}`, dayNum: 3 }).then(res => {
+      Taro.showToast({
+        title: '创建成功',
+        icon: 'none',
+        duration: 2000
+      })
+      Taro.navigateTo({ url: `/pages/Travel/Edit/index?id=${res.travelId}&dayNum=${res.dayNum}` })
+
+    })
+
+
+  }
+  const handelClose = () => {
+    setRoomNum()
+    onClose()
+  }
+  const goIndex = () => {
+    Taro.navigateTo({ url: '/pages/index/index' })
+  }
+  return (
+    <Popup show={showCutover} maskClosable={showCutover} onClose={handelClose}>
+      <View className='from-room srl'>
+        <View>
+          <View className='rzline' /><Label className='srl mg'>温馨提示</Label><View className='rzline' />
+        </View>
+        <View className='tips'>
+          <View>看看周边推荐</View>
+          <View className='goindex' onClick={goIndex}>戳我快速查看
+            <View className='arrow'><View className='v1'></View><View className='v2'></View></View></View>
+        </View>
+        <View>
+          <Button className='cancel' onClick={handelClose}>取消</Button>
+          <Button className='btn' onClick={handelShare} loading={loading} disabled={loading}>确定</Button>
+        </View>
+      </View>
+    </Popup>
+  )
+}

src/pages/Travel/customizedTravel/components/ThreeModel/style.less

@@ -0,0 +1,73 @@
+.from-room{
+  padding-top: 60px;
+}
+.srl{
+  font-size: 30px;
+  font-weight: bold;
+  color: #202020;  
+  .mg{
+    font-size: 38px;
+    margin: 0 20px 50px 20px;
+  }
+  .rzline{
+    border-top: 2px #999 dashed;
+    height: 2px;
+    width: 80px;
+    display: inline-block;
+    margin-bottom: 8px;
+  }
+   .tips{
+    font-size: 30px;
+    font-weight: bold;
+    color: #333333;
+    letter-spacing: 5px; 
+    line-height: 50px;   
+    margin: 40px 0;
+    .goindex{
+      color: #274291;
+      position: relative;
+    }
+    .arrow{
+      position: absolute;
+      right: 150px;
+      top: 12px;  
+      .v1{
+        width: 0;
+        height: 0;
+        border: 15px solid transparent;
+        border-left-color: #274291;
+      }
+      .v2{
+        width: 0;
+        height: 0;
+        border: 15px solid transparent;
+        border-left-color: #fff;
+        position: absolute;
+        bottom: 0;
+        left: -5px;
+      }
+    }
+   }
+  .cancel{
+    color: #274290;
+    display: inline-block;
+    margin: 20px 20px 0 0;
+    width: 236px;
+    height: 78px;
+    line-height: 78px;
+    border: 2px solid #274190;
+    border-radius: 12px;
+  }
+  .btn {
+    width: 236px;
+    height: 78px;
+    line-height: 78px;
+    background: #274291;
+    border-radius: 12px;
+    display: inline-block;
+    color: #fff;
+  }
+}
+
+  
+  

src/pages/Travel/customizedTravel/components/TipModel/index.jsx

@@ -2,6 +2,7 @@ import React, { useState } from 'react'
 import Taro from '@tarojs/taro'
 import { Input, Button, View, Label } from '@tarojs/components'
 import Popup from '@/components/Popup'
+import { newTravelMine } from '@/services/travel'
 import './style.less'
 
 
@@ -9,8 +10,23 @@ export default (props) => {
   const { showCutover, onClose, onFinish } = props
   const [roomNum, setRoomNum] = useState('')
   const [loading, setLoading] = useState(false)
+  const day = new Date();
+  const y = day.getFullYear();
+  const m = day.getMonth() + 1;
+  const d = day.getDate();
   const handelShare = () => {
-    Taro.navigateTo({ url: '/pages/Travel/Edit/index' })
+
+    newTravelMine({ title: `我的行程一日游 ${y}-${m}-${d}` }).then(res => {
+      Taro.showToast({
+        title: '创建成功',
+        icon: 'none',
+        duration: 2000
+      })
+      Taro.navigateTo({ url: `/pages/Travel/Edit/index?id=${res.travelId}&dayNum=${res.dayNum}` })
+
+    })
+
+
   }
   const handelClose = () => {
     setRoomNum()
@@ -28,7 +44,7 @@ export default (props) => {
         <View className='tips'>
           <View>看看周边推荐</View>
           <View className='goindex' onClick={goIndex}>戳我快速查看
-          <View className='arrow'><View className='v1'></View><View className='v2'></View></View></View>
+            <View className='arrow'><View className='v1'></View><View className='v2'></View></View></View>
         </View>
         <View>
           <Button className='cancel' onClick={handelClose}>取消</Button>

src/pages/Travel/customizedTravel/components/TwoModel/index.jsx

@@ -0,0 +1,56 @@
+import React, { useState } from 'react'
+import Taro from '@tarojs/taro'
+import { Input, Button, View, Label } from '@tarojs/components'
+import Popup from '@/components/Popup'
+import { newTravelMine } from '@/services/travel'
+import './style.less'
+
+
+export default (props) => {
+  const { showCutover, onClose, onFinish } = props
+  const [roomNum, setRoomNum] = useState('')
+  const [loading, setLoading] = useState(false)
+  const day = new Date();
+  const y = day.getFullYear();
+  const m = day.getMonth() + 1;
+  const d = day.getDate();
+  const handelShare = () => {
+
+    newTravelMine({ title: `我的行程二日游 ${y}-${m}-${d}`, dayNum: 2 }).then(res => {
+      Taro.showToast({
+        title: '创建成功',
+        icon: 'none',
+        duration: 2000
+      })
+      Taro.navigateTo({ url: `/pages/Travel/Edit/index?id=${res.travelId}&dayNum=${res.dayNum}` })
+
+    })
+
+
+  }
+  const handelClose = () => {
+    setRoomNum()
+    onClose()
+  }
+  const goIndex = () => {
+    Taro.navigateTo({ url: '/pages/index/index' })
+  }
+  return (
+    <Popup show={showCutover} maskClosable={showCutover} onClose={handelClose}>
+      <View className='from-room srl'>
+        <View>
+          <View className='rzline' /><Label className='srl mg'>温馨提示</Label><View className='rzline' />
+        </View>
+        <View className='tips'>
+          <View>看看周边推荐</View>
+          <View className='goindex' onClick={goIndex}>戳我快速查看
+            <View className='arrow'><View className='v1'></View><View className='v2'></View></View></View>
+        </View>
+        <View>
+          <Button className='cancel' onClick={handelClose}>取消</Button>
+          <Button className='btn' onClick={handelShare} loading={loading} disabled={loading}>确定</Button>
+        </View>
+      </View>
+    </Popup>
+  )
+}

src/pages/Travel/customizedTravel/components/TwoModel/style.less

@@ -0,0 +1,73 @@
+.from-room{
+  padding-top: 60px;
+}
+.srl{
+  font-size: 30px;
+  font-weight: bold;
+  color: #202020;  
+  .mg{
+    font-size: 38px;
+    margin: 0 20px 50px 20px;
+  }
+  .rzline{
+    border-top: 2px #999 dashed;
+    height: 2px;
+    width: 80px;
+    display: inline-block;
+    margin-bottom: 8px;
+  }
+   .tips{
+    font-size: 30px;
+    font-weight: bold;
+    color: #333333;
+    letter-spacing: 5px; 
+    line-height: 50px;   
+    margin: 40px 0;
+    .goindex{
+      color: #274291;
+      position: relative;
+    }
+    .arrow{
+      position: absolute;
+      right: 150px;
+      top: 12px;  
+      .v1{
+        width: 0;
+        height: 0;
+        border: 15px solid transparent;
+        border-left-color: #274291;
+      }
+      .v2{
+        width: 0;
+        height: 0;
+        border: 15px solid transparent;
+        border-left-color: #fff;
+        position: absolute;
+        bottom: 0;
+        left: -5px;
+      }
+    }
+   }
+  .cancel{
+    color: #274290;
+    display: inline-block;
+    margin: 20px 20px 0 0;
+    width: 236px;
+    height: 78px;
+    line-height: 78px;
+    border: 2px solid #274190;
+    border-radius: 12px;
+  }
+  .btn {
+    width: 236px;
+    height: 78px;
+    line-height: 78px;
+    background: #274291;
+    border-radius: 12px;
+    display: inline-block;
+    color: #fff;
+  }
+}
+
+  
+  

src/pages/Travel/customizedTravel/index.jsx

@@ -8,42 +8,70 @@ import threeDay from '@/assets/icons/Travel/threeDay.png'
 import custom from '@/assets/icons/Travel/custom.png'
 import CustomDay from './components/CustomDay/index.jsx'
 import TipModel from './components/TipModel/index.jsx'
+import TwoModel from './components/TwoModel/index.jsx'
+import ThreeModel from './components/ThreeModel/index.jsx'
 import './style.less'
 
 export default (props) => {
   const [showCutover, setShowCutover] = useState(false)
   const [showCutoverTip, setShowCutoverTip] = useState(false)
+  const [showCutoverTwo, setShowCutoverTwo] = useState(false)
+  const [showCutoverThree, setShowCutoverThree] = useState(false)
   const onClose = () => {
     setShowCutover(false)
   }
   const handleFinish = (val) => {
-   
-  }
-  const onClose2 = () => {
-    setShowCutoverTip(false)
+
   }
+
   const handleFinish2 = (val) => {
-   
+
   }
-  const handelCustom=()=>{
+  const handelCustom = () => {
     setShowCutover(true)
   }
-  const handelDay=()=>{
+  const onCloseTip = () => {
+    //关闭一日游
+    setShowCutoverTip(false)
+  }
+  const handelDay = () => {
+    //打开一日游
     setShowCutoverTip(true)
   }
+  // ------------------
+  const onCloseTwo = () => {
+    //关闭二日游
+    setShowCutoverTwo(false)
+  }
+  const handelTowDay = () => {
+    //打开二日游
+    setShowCutoverTwo(true)
+  }
+  // ------------------
+
+  const onCloseThree = () => {
+    //关闭三日游
+    setShowCutoverThree(false)
+  }
+  const handelThreeDay = () => {
+    //打开三日游
+    setShowCutoverThree(true)
+  }
   return (
     <View className='page-index'>
       <View className='index-navbar'>
         <CustomNav title='定制行程' />
       </View>
       <CustomDay showCutover={showCutover} onClose={onClose} onFinish={handleFinish} />
-      <TipModel showCutover={showCutoverTip} onClose={onClose2} onFinish={handleFinish2} />
+      <TipModel showCutover={showCutoverTip} onClose={onCloseTip} />
+      <TwoModel showCutover={showCutoverTwo} onClose={onCloseTwo} />
+      <ThreeModel showCutover={showCutoverThree} onClose={onCloseThree} />
 
       <View className='index-container custom'>
         <View className='selectbtn'>
           <Image src={oneDay} className='img' onClick={handelDay}></Image>
-          <Image src={twoDay} className='img'></Image>
-          <Image src={threeDay} className='img'></Image>
+          <Image src={twoDay} className='img' onClick={handelTowDay}></Image>
+          <Image src={threeDay} className='img' onClick={handelThreeDay}></Image>
           <Image src={custom} className='img' onClick={handelCustom}></Image>
         </View>
       </View>

src/pages/details/NoteDetails/index.jsx

@@ -3,8 +3,6 @@ import ax from '@/assets/icons/housemantj/onlove.png'
 import dw from '@/assets/icons/housemantj/loc-o.png'
 import TextMentioned from '@/assets/icons/housemantj/TextMentioned.png'
 import NoteasICO from '@/assets/icons/housemantj/NoteasICO.png'
-import { compressImage } from '@/utils'
-import MoreGuide from "@/components/MoreGuide";//视频
 
 import share from '@/assets/icons/housemantj/touristShare.png'
 import good from '@/assets/icons/housemantj/touristGood.png'
@@ -40,7 +38,6 @@ export default withLayout((props) => {
   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)
@@ -62,16 +59,35 @@ export default withLayout((props) => {
       setGuidance('shareOn')
     }
   }, [router.params.enterType])
+  const resourceList = () => {
+    getNoteID(id).then((res) => {
+      setDetail(res)
+      setimglist(res.imageList || [])
+      setRecommend(res.wxResourceList || [])
 
 
-  useEffect(() => {
-    //获取我的行程。
+    }).catch(e => {
+      console.error("getNoteID错误", e)
+      setLoading(false)
+
+    })
+
+  }
+  const handelNoteList = () => {
     getTravelMine({ pageNum: 1, pageSize: 99, simple: true }).then(e => {
       setTravelMine(e)
 
     })
 
+  }
+
+  useEffect(() => {
+    //获取我的行程。
 
+    getTravelMine({ pageNum: 1, pageSize: 99, simple: true }).then(e => {
+      setTravelMine(e)
+
+    })
 
     if (id) {
       setLoading(true)
@@ -159,7 +175,7 @@ export default withLayout((props) => {
             <view className='title'>
               <image src={TextMentioned} />文中提及
             </view>
-            {(recommend || []).map((item) => <NoteCards travelMine={travelMine} travelMineContent={travelMineContent} key={item} item={item} det={item} />)}
+            {(recommend || []).map((item) => <NoteCards resourceList={resourceList} travelMine={travelMine} key={item} item={item} det={item} handelNoteList={handelNoteList} />)}
           </view>
           <view className='botton'>这是我的底线</view>
         </scroll-view>

src/pages/details/foodDetails/foodDetails.less

@@ -1,7 +1,7 @@
 .storeDetails {
   background-color: #fff;
   border-radius: 12px;
-  margin-bottom: 20px;  
+  margin-bottom: 20px;
   .storeJs {
     padding: 20px;
     .storeName {

src/pages/index/tabs/Recommend.jsx

@@ -117,8 +117,17 @@ export default (props) => {
             </List>
             :
             <RecommendNote />
+
+
+
+
+
+
         }
+
       </view>
+
+
     </view>
   )
 }

src/services/travel.js

@@ -13,6 +13,17 @@ export const getTravelMine = (params) => request(`/travel/mine`, { params })
 
 
 
+
+/**
+ * 获取行程详情
+ * @param {*} 
+ * @returns 
+ */
+
+export const getTravelID = (id, params) => request(`/travel/${id}`, { params })
+
+
+
 /**
  * 新建保存行程
  * @param {*} 
@@ -22,6 +33,45 @@ export const getTravelMine = (params) => request(`/travel/mine`, { params })
 export const newTravelMine = (data) => request(`/travel`, { method: 'post', data })
 
 
+/**
+ * 获取命定行程
+ * @param {*} 
+ * @returns 
+ */
+
+export const getTravelDestiny = (data) => request(`/travel/destiny`, { method: 'get', data })
+/**
+ * 保存命定行程
+ * @param {*} 
+ * @returns 
+ */
+
+export const addTravelDestiny = (data) => request(`/travel/destiny`, { method: 'post', data })
+
+
+
+/**
+ * 删除行程
+ * @param {*} 
+ * @returns 
+ */
+
+export const deleteTravel = (id, data) => request(`/travel/${id}`, { method: 'delete', data })
+
+
+
+
+
+
+/**
+ * 删除行程地点
+ * @param {*} 
+ * @returns 
+ */
+
+export const deleteTravelItem = (id, no, data) => request(`/travel/${id}/travel-item/${no}`, { method: 'delete', data })
+
+
 
 /**
  * 保存行程地点
@@ -29,4 +79,11 @@ export const newTravelMine = (data) => request(`/travel`, { method: 'post', data
  * @returns 
  */
 
-export const saveTravel = (id, data) => request(`/travel/${id}/travel-item`, { method: 'post', data })
+export const saveTravel = (id, data) => request(`/travel/${id}/travel-item`, { method: 'post', data })
+
+/**
+ * 行程资源推荐 换一批
+ * @returns 
+ * params 
+ */
+export const getRecommendList = (params) => request('/resource/recommend', { params })