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

config/dev.js

@@ -3,7 +3,7 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    // HOST: '"http://127.0.0.1:8080"',
+    // HOST: '"http://192.168.89.147:8080"',
     HOST: '"http://sgl-v2-test.njyunzhi.com"',
     OSS: '"yz-shigongli.oss-accelerate.aliyuncs.com"',
     VERSION: '"2.0.33"',

config/index.js

@@ -50,6 +50,10 @@ const config = {
           generateScopedName: '[name]__[local]___[hash:base64:5]'
         }
       }
+    },
+    webpackChain (chain, webpack) {
+      chain.plugin('analyzer')
+        .use(require('webpack-bundle-analyzer').BundleAnalyzerPlugin, [])
     }
   },
   h5: {

config/prod.js

@@ -5,7 +5,7 @@ module.exports = {
   defineConstants: {
     HOST: '"https://sgl-v2.njyunzhi.com"',
     OSS: '"yz-shigongli.oss-accelerate.aliyuncs.com"',
-    VERSION: '"2.0.36_2021-10-11 22:14:48"',
+    VERSION: '"3.0.1_2021-11-10"',
   },
   mini: {},
   h5: {

package.json

@@ -56,6 +56,7 @@
     "eslint-plugin-import": "^2.12.0",
     "eslint-plugin-react": "^7.8.2",
     "eslint-plugin-react-hooks": "^4.2.0",
-    "stylelint": "9.3.0"
+    "stylelint": "9.3.0",
+    "webpack-bundle-analyzer": "^4.5.0"
   }
 }

src/components/BottomMoadl/index.jsx

@@ -0,0 +1,114 @@
+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(() => {
+    setLoading(true)
+    getRecommendList({ location: location, pageNum: textNextSum, pageSize: 3 }).then(e => {
+      setRecommendContent(e.records)
+      setLoading(false)
+
+    }).catch(s => {
+      setLoading(false)
+
+    })
+  }, [location, textNextSum])
+
+
+  //换一批
+  const handleTextNext = (e) => {
+    // setLoading(true)
+    setTextNext(textNextSum + 1)
+
+    e.stopPropagation()
+
+    // 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} editable='1' 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.2s ease forwards;
+}
+@keyframes wrapAnimate {
+  0% {
+  }
+  100% {
+    background: rgba(0, 0, 0, 0.35);
+  }
+}
+.wrapAnimateOut {
+  animation: wrapAnimateOut 0.4s ease 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/CollectList/MyCollect/index.jsx

@@ -13,6 +13,7 @@ const CouponMedia = CouponCard.Media
 const Action = CouponCard.Action
 export default (props) => {
   const { item, cardNavigateTo } = props
+  console.log("🚀 ~ file: index.jsx ~ line 16 ~ item", item)
 
   const targetType = item.targetType
   const star = parseFloat(((item.sweetScore + item.environmentScore + item.serviceScore) / 3).toFixed(1));
@@ -20,9 +21,27 @@ export default (props) => {
 
 
   const handleDetail = () => {
-    targetType == "shop_package" ? Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.shopId}` })
-      : targetType == "tourist" ? Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}` })
-        : Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.targetId}` })
+    switch (targetType) {
+      case "shop_package":
+        Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.shopId}` })
+        break;
+      case "shop":
+        Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.targetId}` })
+        break;
+      case "tourist":
+        Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}` })
+        break;
+      case "note":
+        Taro.navigateTo({ url: `/pages/details/NoteDetails/index?id=${item.targetId}` })
+        break;
+      default:
+        break;
+    }
+
+    // targetType == "shop_package" && Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.shopId}` })
+    // targetType == "shop" && Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.targetId}` })
+    // targetType == "tourist" && Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}` })
+    // targetType == "note" && Taro.navigateTo({ url: `/pages/details/NoteDetails/index?id=${item.targetId}` })
   }
 
   const PayAction = <Action.Icon icon={SeeDetails} text='查看详情' onClick={handleDetail} />
@@ -44,7 +63,7 @@ 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={{ lineHeight:'10px' }}>
+                  <View className='cpn-card-text' style={{ lineHeight: '10px' }}>
                     <Text className='cpn-card-text_mn'>￥{`${(item.actualPrice / 100)?.toFixed(2)}元`}</Text>
                     <Text className='cpn-card-text_rm'>{`门市价${(item.standardPrice / 100)?.toFixed(2)}元`}</Text>
                   </View>
@@ -58,7 +77,7 @@ export default (props) => {
         )
       }
       {
-        targetType !== "shop_package" && (
+        targetType === "shop" && (
           <View style={{ margin: '15px 5px' }}>
             <CouponCard action={PayAction}>
               <CouponMedia>
@@ -70,7 +89,7 @@ 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={{ lineHeight:'10px' }}>
+                  <View className='cpn-card-text' style={{ lineHeight: '10px' }}>
                     <Text className='cpn-card-text_mn'>￥{`${formatPrice(item.averagePrice)}元`}</Text>
                   </View>
                   <View className='cpn-md-act'>
@@ -86,6 +105,65 @@ export default (props) => {
           </View>
         )
       }
+
+      {
+        targetType === "tourist" && (
+          <View style={{ margin: '15px 5px' }}>
+            <CouponCard action={PayAction}>
+              <CouponMedia>
+                <CouponMedia.Header
+                  image={compressImage(item.poster)}
+                  badge={targetType}
+                />
+                <CouponMedia.Body >
+                  <View className='cpn-card-text'>
+                    {(item.title).toString().length > 25 ? (item.title).substring(0, 25) + '...' : (item.title)}
+                  </View>
+                  <View className='cpn-card-text' style={{ lineHeight: '10px' }}>
+                    <Text className='cpn-card-text_mn'>￥{`${formatPrice(item.averagePrice)}元`}</Text>
+                  </View>
+                  <View className='cpn-md-act'>
+                    <Location {...item} />
+                    <view className='wdscbaozan'>
+                      <image className='title-on' src={baozan} />
+                      <text className='title-on-text'>爆赞 {item.likeNum}</text>
+                    </view>
+                  </View>
+                </CouponMedia.Body>
+              </CouponMedia>
+            </CouponCard>
+          </View>
+        )
+      }
+      {
+        targetType === 'note' && (
+          <View style={{ margin: '15px 5px' }}>
+            <CouponCard action={PayAction}>
+              <CouponMedia>
+                <CouponMedia.Header
+                  image={compressImage(item.poster)}
+                  badge={targetType}
+                />
+                <CouponMedia.Body >
+                  <View className='cpn-card-text'>
+                    {(item.title).toString().length > 25 ? (item.title).substring(0, 25) + '...' : (item.title)}
+                  </View>
+                  {/* <View className='cpn-card-text' style={{ lineHeight: '10px' }}>
+                  <Text className='cpn-card-text_mn'>￥{`${formatPrice(item.averagePrice)}元`}</Text>
+                </View> */}
+                  {/* <View className='cpn-md-act'>
+                  <Location {...item} />
+                  <view className='wdscbaozan'>
+                    <image className='title-on' src={baozan} />
+                    <text className='title-on-text'>爆赞 {item.likeNum}</text>
+                  </view>
+                </View> */}
+                </CouponMedia.Body>
+              </CouponMedia>
+            </CouponCard>
+          </View>
+        )
+      }
     </View>
   )
 }

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/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/SearchBar/index.jsx

@@ -10,7 +10,7 @@ export default (props) => {
 
 
   return (
-    <View className='searchBar'>
+    <View className='searchBar' >
       <mp-searchbar
         placeholder={placeholder}
         onBlur={onBlur}

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.targetId} />
+              </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/RecommendedCard/index.jsx

@@ -0,0 +1,108 @@
+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) => {
+
+    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.targetId} />
+              </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/ShareCard/index.jsx

@@ -0,0 +1,108 @@
+import { useState } from 'react'
+
+import Taro from '@tarojs/taro'
+
+import { View, Text } from '@tarojs/components'
+import CouponCard from '@/components/CouponCard'
+import { compressImage } from '@/utils'
+import SaveIcon from '@/components/SaveIcon'
+import Location from '@/components/Location'
+import SeeDetails from '@/assets/icons/GuideCheck/SeeDetails.png'
+
+
+
+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={SeeDetails} text='查看详情' onClick={item.targetType === 'tourist' ? goDetail : goFood} />
+
+
+
+
+  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 >
+          <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.targetId} />
+              </View>
+            </View>
+          </CouponMedia.Body>
+        </CouponMedia>
+      </CouponCard>
+    </View>
+  )
+}

src/components/foodCards/ShareCard/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/ShopNoteCard/index.jsx

@@ -0,0 +1,221 @@
+import { useState, useEffect, useRef } from 'react'
+
+import Taro from '@tarojs/taro'
+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 VideoStart from '@/assets/icons/housemantj/VideoStart.png'
+import Popup from '@/components/Popup'
+import { saveTravel, newTravelMine, getTravelMine } from '@/services/travel'
+
+import './style.less'
+
+
+const CouponMedia = CouponCard.Media
+const Action = CouponCard.Action
+
+//套餐卡片
+export default (props) => {
+  const { item, st, editable, setScroll, goshop, travelMine, resourceList, det, handelNoteList } = props
+  // const travelId = travelMineContent?.records[0]?.travelId
+  const targetId = props.item?.targetId
+  const targetType = props.item?.targetType
+
+
+  const goFood = () => {
+    Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${targetId}` })
+
+  }
+  const [showCutover, setShowCutover] = useState(false)
+  const [valueList, setValueList] = useState([])
+
+
+  useEffect(() => {
+    if (item == []) {
+      console.log('asdasdsadasd');
+    }
+    setValueList(travelMine.records)
+
+
+  }, [travelMine.records, item])
+
+  const onClose = () => {
+    //关闭当前套餐详情弹窗
+    setShowCutover(false)
+    //使父组件恢复滚动
+    setScroll(true)
+  }
+
+  //列改变
+  const [traveCoumun, setTraveCoumun] = useState()
+
+
+  const numberTrave = (new Array(traveCoumun).fill()).map((_, index) => ({ id: index + 1, title: `第 ${index + 1} 天` }))
+
+  const array = [valueList, travelMine.records == '' ? [] : numberTrave]
+
+
+  const handleColumn = e => {
+    // console.log(e.detail.column);
+
+    const { column, value } = e.detail
+
+
+    const firstValue = valueList[value]
+    setTraveCoumun(firstValue.dayNum)
+
+  }
+
+
+  const day = new Date();
+  const y = day.getFullYear();
+  const m = day.getMonth() + 1;
+  const d = day.getDate();
+  let number = 0
+  const onChange = (e) => {
+
+
+
+    if (travelMine.records == '') {
+
+
+      console.log('没有行程');
+      newTravelMine({ title: `我的行程 ${y}-${m}-${d}` }).then(res => {
+        handelNoteList()
+        // 首先创建一个行程，然后才能拿到下面的这些数据
+
+        const [firstInx, secondInx] = e.detail?.value
+
+        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(res.travelId, { dayOrder: i, targetId: targetId, targetType: targetType }).then((val) => {
+          Taro.showToast({
+            title: '添加成功',
+            icon: 'none',
+            duration: 1000
+          })
+          resourceList(travelId)
+        })
+      })
+    } else {
+      console.log('有行程', e);
+      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');
+
+    }
+  }
+
+
+  const handlePayClick = () => {
+    if (travelMine.records == '') {
+      Taro.showToast({
+        title: '暂无行程，已自动创建',
+        icon: 'none',
+        duration: 3000
+      })
+
+      newTravelMine({ title: `我的行程 ${y}-${m}-${d}` }).then(res => {
+        handelNoteList()
+        // 首先创建一个行程，然后才能拿到下面的这些数据
+      })
+
+    }
+
+
+
+    // Taro.navigateTo({ url: `/pages/PayOrder/index?packageId=${item.packageId}&scene=${scene || ''}&subOrderId=${subOrderId}&id=${id}` })
+
+  }
+  const PayAction = travelMine.total >= 1 ?
+    <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>
+    :
+    <Action.Icon icon={item.isVisited < 1 ? grassOFF : grassNO} text={item.isVisited < 1 ? '种草' : '已种草'} 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={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-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.targetId} />
+              </View>
+            </View>
+          </CouponMedia.Body>
+        </CouponMedia>
+      </CouponCard>
+    </View>
+  )
+}

src/components/foodCards/ShopNoteCard/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/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/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/layouts/index.jsx

@@ -5,6 +5,7 @@ import { useModel } from '@/store'
 import { getQueryString } from '@/utils'
 import useRouter from '@/utils/hooks/useRouter'
 import useTrackPage from '@/utils/hooks/useTrackPage'
+import useShareOpen from '@/utils/hooks/useShareOpen'
 import Loading from './Loading'
 import { getPageBy, getIndexPageOf } from '../routes'
 
@@ -22,6 +23,9 @@ export default (Child) => (props) => {
   }
   useTrackPage(trackPageData)
 
+  // 打开分享
+  useShareOpen(person?.personId, router.params.shareId)
+
   // 确保人员信息到位, 确保二维码解析结束
   const loading = !person?.personRole || (router.params.scene && !router.params.parseQRFinished);
 

src/pages/MineUserAll/AllOrder/index.jsx

@@ -1,5 +1,5 @@
 import { useState, useEffect, useMemo, } from 'react'
-import {Taro, useRouter } from '@tarojs/taro'
+import { Taro, useRouter } from '@tarojs/taro'
 import { View } from '@tarojs/components'
 import withLayout from '@/layouts'
 import CustomNav from '@/components/CustomNav'

src/pages/MineUserAll/MyTravel/index.config.js

@@ -0,0 +1,5 @@
+export default {
+  navigationBarTitleText: '我的行程',
+  navigationStyle: 'custom',
+  disableScroll: true,
+}

src/pages/MineUserAll/MyTravel/index.jsx

@@ -0,0 +1,100 @@
+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 withLayout((props) => {
+
+  const [loading, setLoading] = useState(false)
+
+  //删除
+  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 [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'>
+        <CustomNav title='我的行程' />
+      </View>
+      <View className='index-container'>
+        <SpinBox loading={loading}>
+          <scroll-view
+            scrollY
+            style='height: 100%;'
+          >
+            <View className='View-box'>
+              {
+                travelMine.map((item, index) =>
+
+                  <SlideView key={index} del onDelete={() => handelDelete(item)} className='myTravel'>
+                    <View className='View-box-Card' onClick={() => handelEdit(item)}>
+                      <View className='bottom'>
+                        <View className='travelName'>{item.title}</View>
+                        <Image src={editImg} className='edit'></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>
+        </SpinBox>
+      </View>
+    </View >
+  )
+})

src/pages/MineUserAll/MyTravel/style.less

@@ -0,0 +1,51 @@
+.box-content {
+  background-color: #F8F8F8;
+  height: 100vh;
+  .View-box {
+    margin: 30px 20px 0 20px;
+    .myTravel{
+      .slideview-content{
+        margin:7.5px 0;
+      }
+    }
+    .View-box-Card{
+      background: #FFF;
+      box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
+      border-radius: 12px;
+      padding: 40px 34px 40px 26px;
+      line-height: 31.5px;
+      font-weight: bold;
+      color: #666;
+      margin: 15px 10px;
+      .travelName{
+        font-size: 34px;
+        color: #333;
+      }
+      .edit{
+        width: 40px;
+        height: 40px;
+      }
+      .bottom{   
+        display: flex;
+        justify-content: space-between;  
+        .travelDay{
+          margin-top: 40px;
+          font-size: 28px;
+        }
+        .travelDate{
+          margin-top: 40px;
+          font-size: 24px;
+          font-weight: 400;
+        }
+      }
+    }
+
+    .foot {
+      font-size: 28px;
+      color: #c0c8d3;
+      margin: 40px 0;
+      text-align: center;
+    }
+  }
+}
+

src/pages/RandomItinerary/ResultOver/index.config.js

@@ -0,0 +1,7 @@
+export default {
+  navigationBarTitleText: '',
+  navigationStyle: 'custom',
+  disableScroll: true,
+  enableShareAppMessage: true
+
+}

src/pages/RandomItinerary/ResultOver/index.jsx

@@ -0,0 +1,88 @@
+import Taro, { useShareAppMessage } from "@tarojs/taro"
+import { Text, View, Button } from "@tarojs/components"
+import { useEffect, useState } from "react"
+
+import CustomNav from '@/components/CustomNav'
+import withLayout from '@/layouts'
+import { getTravelDestiny } from "@/services/travel"
+import { share } from "@/services/share"
+import ShareCard from "@/components/foodCards/ShareCard"
+import './style.less'
+
+
+export default withLayout((props) => {
+  const { ico, textNext } = props
+  const [traveContent, setTraveContent] = useState()
+  const [shareList, setShareList] = useState([])
+  const ShowOver = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/RandomIIcon/ShowOver.png'
+
+
+  useEffect(() => {
+
+    getTravelDestiny().then(e => {
+      setTraveContent(e)
+      setShareList(e?.travelItemList || [])
+    })
+
+
+  }, [])
+
+  useShareAppMessage((e) => {
+
+    return {
+      promise: share({ shareUrl: '/pages/index/index', targetId: traveContent.serialNo, targetType: 'travel' }).then(res => {
+        return {
+          title: '',
+          path: `/pages/index/index?shareId=${res.shareId}`,
+        }
+      })
+
+    }
+  })
+
+
+  return (
+    <view className='page-index'>
+      <view className='index-navbar'>
+        <CustomNav title='命定行程' />
+      </view>
+      <scroll-view scrollY style='height: calc(100% - 75px);margin-bottom: 40px;' >
+
+        <View className='Over-box'>
+
+          <View className='Over-index-box' >
+            <image className='OI-image' src={ShowOver} />
+            <View className='OI-text-box'>
+              <Text className='OI-text'>
+                整体运势或有起伏的情况，需要做好各方面的平衡避免有故此彼伏的情况。 你要学会自己衡量得失利弊，但时间不够用的时候就要面临个人的
+              </Text>
+              <Text className='OI-text'>
+                未必就是走的人多的路就是对，你可以保持自己的想法。
+              </Text>
+              <Text className='OI-text'>
+                南京对于你而言是梦想中的地方，你的命定行程适合阳光、梦幻的地方。结合你的回答你的命定行程如下：
+              </Text>
+              <View className='bottom-text'>》</View>
+            </View>
+          </View>
+          {
+            traveContent?.isHidden === false && shareList.map((item) => <ShareCard det={item} item={item} key={item.itemId} />
+
+
+            )
+          }
+          {
+            traveContent?.isHidden &&
+            <Button openType='share' className='purebtn'><View className='shareImg'>分享并邀请好友点开查看完整命定行程</View></Button>
+            // <View className='content' >分享并邀请好友点开查看完整命定行程</View>
+
+          }
+        </View>
+
+      </scroll-view>
+
+    </view >
+
+
+  )
+})

src/pages/RandomItinerary/ResultOver/style.less

@@ -0,0 +1,52 @@
+.Over-box {
+  .Over-index-box {
+    width: 690px;
+    background: #ffffff;
+    border: 2px solid #dce6e3;
+    border-radius: 10px;
+    margin: 15px auto;
+    .OI-image {
+      width: 630px;
+      height: 223px;
+      margin: 10px 30px;
+    }
+    .OI-text-box {
+      width: 100%;
+      padding: 10px 25px;
+
+      .OI-text {
+        text-indent: 2em;
+        display: block;
+        width: 94%;
+        font-size: 28px;
+        font-weight: 400;
+        color: #202020;
+        line-height: 80px;
+      }
+      .bottom-text {
+        transform: rotate(90deg);
+        width: 200px;
+        text-align: center;
+        margin: 0 auto;
+
+        position: relative;
+        right: 5vw;
+      }
+    }
+  }
+  .shareImg {
+    width: 95%;
+    height: 115px;
+    background: url("../../../assets/icons/GuideCheck/shareImage.png") no-repeat;
+    background-size: 100%;
+    margin: 0 auto;
+    margin-bottom: 2em;
+    font-size: 29px;
+    font-weight: 400;
+    color: #1a3b83;
+    line-height: 120px;
+    text-align: center;
+  }
+  .content {
+  }
+}

src/pages/RandomItinerary/components/ConstellationCard/index.jsx

@@ -0,0 +1,238 @@
+import Taro from "@tarojs/taro"
+import { Icon, View } from "@tarojs/components"
+import { useEffect, useState } from "react"
+import CustomNav from '@/components/CustomNav'
+import withLayout from '@/layouts'
+
+
+import './style.less'
+
+
+
+
+
+export default (props) => {
+  const { ico, textNext, onSelected } = props
+  const [netxIma, setNetxIma] = useState(false)
+
+  const Ari = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/ConstelPhoto/Ari.png'
+  const Tau = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/ConstelPhoto/Tau.png'
+  const Gem = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/ConstelPhoto/Gem.png'
+  const Cnc = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/ConstelPhoto/Cnc.png'
+  const Leo = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/ConstelPhoto/Leo.png'
+  const Vir = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/ConstelPhoto/Vir.png'
+
+  const Lib = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/ConstelPhoto/Lib.png'
+  const Sco = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/ConstelPhoto/Sco.png'
+  const Sgr = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/ConstelPhoto/Sgr.png'
+  const Cap = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/ConstelPhoto/Cap.png'
+  const Agr = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/ConstelPhoto/Agr.png'
+  const Psc = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/ConstelPhoto/Psc.png'
+
+  const [filterImage, setFilterImage] = useState(
+    [
+      {
+        title: '白羊座',
+        moon: '03.21-04.19',
+        ico: Ari,
+        active: false
+      },
+      {
+        title: '金牛座',
+        moon: '04.20-05.20',
+        ico: Tau,
+        active: false
+
+      },
+      {
+        title: '双子座',
+        moon: '05.21-06.21',
+        ico: Gem,
+        active: false
+
+      },
+      {
+        title: '巨蟹座',
+        moon: '06.22-07.22',
+        ico: Cnc,
+        active: false
+
+      },
+      {
+        title: '狮子座',
+        moon: '07.23-08.22',
+        ico: Leo,
+        active: false
+
+      },
+      {
+        title: '处女座',
+        moon: '08.23-09.22',
+        ico: Vir,
+        active: false
+
+      },
+    ]
+  )
+  const [twoImage, setTwoImage] = useState(
+    [
+      {
+        title: '天秤座',
+        moon: '09.23-10.23',
+        ico: Lib,
+        active: false
+
+      },
+      {
+        title: '天蝎座',
+        moon: '10.24-11.22',
+        ico: Sco,
+        active: false
+
+      },
+      {
+        title: '射手座',
+        moon: '11.23-12.21',
+        ico: Sgr,
+        active: false
+
+      },
+      {
+        title: '摩羯座',
+        moon: '12.22-01.19',
+        ico: Cap,
+        active: false
+
+      },
+      {
+        title: '水瓶座',
+        moon: '01.20-02.18',
+        ico: Agr,
+        active: false
+
+      },
+      {
+        title: '双鱼座',
+        moon: '02.19-03.20',
+        ico: Psc,
+        active: false
+
+      },
+    ]
+  )
+
+
+
+  const handleTextNext = () => {
+    setNetxIma(!netxIma)
+  }
+
+  //第一组
+  const handleFilter = (e) => {
+    onSelected()
+    const res = filterImage.map((item, inx) => {
+      if (item.title == e.title) {
+
+        item.active = true
+
+      } else {
+
+        item.active = false
+      }
+      return item
+
+    })
+    setFilterImage(res)
+
+
+
+  }
+
+  //第二组
+  const handleTwoFilter = (e) => {
+    onSelected()
+
+    const res = twoImage.map((item, inx) => {
+
+      if (item.title == e.title) {
+
+        item.active = true
+
+      } else {
+
+        item.active = false
+      }
+      return item
+
+    })
+    setTwoImage(res)
+
+
+  }
+
+
+
+
+
+
+
+
+
+
+
+
+  return (
+    <View >
+      <View style='font-size: 20px;font-weight: bold;color: #140F0F;marginLeft:10px;margin-bottom: 1em;'>
+        1<text style='font-size: 13px;font-weight: bold;color: #140F0F;'> / 5 </text>你是什么星座的？
+      </View>
+      {
+        netxIma === false ? filterImage.map((item, index) =>
+          <view className='Random-Conste-box' key={index} onClick={() => handleFilter(item)} >
+            <View className='RC-box-imageContent'>
+              <image className={`RC-box-image ${item.active && 'imageLess'}`} src={item.ico} />
+            </View>
+            <view className='RC-box-content' >
+              <View className='RC-box-C-title' >
+                {item.title}
+              </View>
+              <View className='RC-box-C-moon' >
+                {item.moon}
+              </View>
+            </view>
+
+          </view>
+
+        )
+          :
+          twoImage.map((item, index) =>
+            <view className='Random-Conste-box' key={index} onClick={() => handleTwoFilter(item)} >
+              <View className='RC-box-imageContent'>
+                <image className={`RC-box-image ${item.active && 'imageLess'}`} src={item.ico} />
+
+              </View>
+              <view className='RC-box-content' >
+                <View className='RC-box-C-title' >
+                  {item.title}
+                </View>
+                <View className='RC-box-C-moon' >
+                  {item.moon}
+                </View>
+              </view>
+
+            </view>
+
+          )
+
+      }
+
+      <view className='bottom-text' onClick={handleTextNext}>
+        <image className='btn-image' src={ico} />
+        <text className='btn-text' >{textNext}</text>
+      </view>
+
+    </View>
+
+
+  )
+}

src/pages/RandomItinerary/components/ConstellationCard/style.less

@@ -0,0 +1,73 @@
+.Random-Conste-box {
+  margin: 60px 20px;
+  width: 335px;
+  height: 180px;
+  background: #fbfbfb;
+  -webkit-box-shadow: 0 7px 14px 0 rgba(0, 0, 0, 0.04),
+    0 4px 36px 0 rgba(0, 0, 0, 0.08);
+  box-shadow: 0 14px 28px 0 rgba(0, 0, 0, 0.04),
+    0 8px 72px 0 rgba(0, 0, 0, 0.08);
+  border-radius: 38px;
+
+  display: inline-flex;
+  .RC-box-imageContent {
+    width: 50%;
+    height: 100%;
+    position: relative;
+    bottom: 8vw;
+    .RC-box-image {
+      width: 160px;
+      height: 190px;
+
+      filter: grayscale(95%);
+      opacity: 0.6;
+    }
+    .imageLess {
+      opacity: 1;
+      opacity: 1;
+      filter: grayscale(0%);
+    }
+  }
+
+  .RC-box-content {
+    width: 50%;
+    height: 100%;
+    display: inline-block;
+
+    text-align: center;
+    .RC-box-C-title {
+      font-size: 34px;
+      font-weight: bold;
+      color: #140f0f;
+
+      margin-top: 25%;
+      margin-bottom: 10px;
+    }
+
+    .RC-box-C-moon {
+      font-size: 22px;
+      font-weight: 500;
+      color: #140f0f;
+    }
+  }
+}
+
+.bottom-text {
+  margin-left: 40%;
+  margin-top: -2em;
+  width: 100%;
+  padding: 0.5em 0 2em 0;
+  display: flex;
+  align-items: center;
+  .btn-image {
+    width: 32px;
+    height: 32px;
+  }
+  .btn-text {
+    width: 110px;
+    font-size: 30px;
+    font-weight: bold;
+    color: #202020;
+    margin-left: 10px;
+  }
+}

src/pages/RandomItinerary/components/FiveSenses/index.jsx

@@ -0,0 +1,110 @@
+import Taro from "@tarojs/taro"
+import { Icon, View } from "@tarojs/components"
+import { useEffect, useState } from "react"
+import CustomNav from '@/components/CustomNav'
+import withLayout from '@/layouts'
+
+import './style.less'
+
+const ear = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/RandomIIcon/ear.png'
+const Eye = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/RandomIIcon/Eye.png'
+const Eyebrow = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/RandomIIcon/Eyebrow.png'
+const nose = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/RandomIIcon/nose.png'
+const mouth = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/RandomIIcon/mouth.png'
+
+export default (props) => {
+  const { ico, textNext, onSelected } = props
+
+
+  const [netxIma, setNetxIma] = useState(false)
+  const [oneImage, setOneImage] = useState([
+    {
+      title: '眉毛',
+      ico: Eyebrow,
+      active: false
+    },
+    {
+      title: '眼睛',
+      ico: Eye,
+      active: false
+    },
+    {
+      title: '嘴巴',
+      ico: mouth,
+      active: false
+    },
+    {
+      title: '鼻子',
+      ico: nose,
+      active: false
+    },
+    {
+      title: '耳朵',
+      ico: ear,
+      active: false
+    },
+
+  ])
+
+  const handleTextNext = (e) => {
+    onSelected()
+
+    const res = oneImage.map((item, inx) => {
+
+      if (item.title == e.title) {
+
+        item.active = true
+
+      } else {
+
+        item.active = false
+      }
+      return item
+
+    })
+    setOneImage(res)
+
+
+  }
+
+
+
+
+
+
+
+  return (
+    <View >
+      <View style='font-size: 20px;font-weight: bold;color: #140F0F;marginLeft:10px;;marginLeft:10px;'>
+        4<text style='font-size: 13px;font-weight: bold;color: #140F0F;'> / 5 </text>现在开始想你的一个五官，你想到的是？
+      </View>
+      {
+        oneImage.map((item, index) =>
+          <view className='Five-Conste-box' key={index} onClick={() => handleTextNext(item)}>
+            <View className='Five-box-imageContent'>
+              <image className={`Five-box-image ${item.active && 'Five-imageLess'}`} src={item.ico} />
+
+            </View>
+            <view className='Five-box-content' >
+              <View className='Five-box-C-title' >
+                {item.title}
+              </View>
+              <View className='Five-box-C-moon' >
+              </View>
+            </view>
+
+          </view>
+
+        )
+
+
+
+
+      }
+
+
+    </View>
+
+
+  )
+}

src/pages/RandomItinerary/components/FiveSenses/style.less

@@ -0,0 +1,51 @@
+.Five-Conste-box {
+  margin: 20px 20px;
+  width: 335px;
+  height: 180px;
+  background: #fbfbfb;
+  -webkit-box-shadow: 0 7px 14px 0 rgba(0, 0, 0, 0.04),
+    0 4px 36px 0 rgba(0, 0, 0, 0.08);
+  box-shadow: 0 14px 28px 0 rgba(0, 0, 0, 0.04),
+    0 8px 72px 0 rgba(0, 0, 0, 0.08);
+  border-radius: 38px;
+
+  display: inline-flex;
+  .Five-box-imageContent {
+    width: 50%;
+    height: 100%;
+    position: relative;
+    .Five-box-image {
+      width: 160px;
+      height: 190px;
+      padding-left: 10px;
+
+      filter: grayscale(95%);
+      opacity: 0.6;
+    }
+    .Five-imageLess {
+      opacity: 1;
+      filter: grayscale(0%);
+    }
+  }
+
+  .Five-box-content {
+    width: 50%;
+    height: 100%;
+    display: inline-block;
+
+    text-align: center;
+    .Five-box-C-title {
+      font-size: 34px;
+      font-weight: bold;
+      color: #140f0f;
+
+      margin-top: 35%;
+    }
+
+    .Five-box-C-moon {
+      font-size: 22px;
+      font-weight: 500;
+      color: #140f0f;
+    }
+  }
+}

src/pages/RandomItinerary/components/GirlFriend/index.jsx

@@ -0,0 +1,82 @@
+import Taro from "@tarojs/taro"
+import { Icon, View } from "@tarojs/components"
+import { useEffect, useState } from "react"
+import CustomNav from '@/components/CustomNav'
+import withLayout from '@/layouts'
+
+
+import './style.less'
+
+
+export default (props) => {
+  const { ico, textNext, onSelected } = props
+
+  const YES = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/RandomIIcon/YES.png'
+  const No = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/RandomIIcon/No.png'
+
+  const [imageOne, setImageOne] = useState(false)
+  const [imageTow, setImageTow] = useState(false)
+
+  const handleYES = () => {
+    setImageOne(true)
+    setImageTow(false)
+    onSelected()
+  }
+
+
+  const handleNo = () => {
+    setImageOne(false)
+    setImageTow(true)
+    onSelected()//未选择不给到下一题
+  }
+
+
+
+
+
+  return (
+    <View >
+      <View style='font-size: 20px;font-weight: bold;color: #140F0F;marginLeft:10px;;'>
+        2<text style='font-size: 13px;font-weight: bold;color: #140F0F;'> / 5 </text>你是单身吗？
+      </View>
+
+
+      <view className='Girl-Conste-box' onClick={handleYES}  >
+        <View className='Girl-box-imageContent'>
+          <image className={`Girl-box-image  imageTwo ${imageOne && 'Girl-imageLess'} `} src={YES} />
+
+        </View>
+        <view className='Girl-box-content' >
+          <View className='Girl-box-C-title' >
+            YES
+          </View>
+          <View className='Girl-box-C-moon' >
+            是
+          </View>
+        </view>
+
+      </view>
+
+      <view className='Girl-Conste-box' onClick={handleNo} >
+        <View className='Girl-box-imageContent'>
+          <image className={`Girl-box-image ${imageTow && 'Girl-imageLess'} `} src={No} />
+        </View>
+        <view className='Girl-box-content' >
+          <View className='Girl-box-C-title' >
+            No
+          </View>
+          <View className='Girl-box-C-moon' >
+            否
+          </View>
+        </view>
+
+      </view>
+
+
+
+
+    </View>
+
+
+  )
+}

src/pages/RandomItinerary/components/GirlFriend/style.less

@@ -0,0 +1,66 @@
+.Girl-Conste-box {
+  width: 630px;
+  height: 315px;
+  background: #fbfbfb;
+  -webkit-box-shadow: 0 7px 14px 0 rgba(0, 0, 0, 0.04),
+    0 4px 36px 0 rgba(0, 0, 0, 0.08);
+  box-shadow: 0 14px 28px 0 rgba(0, 0, 0, 0.04),
+    0 8px 72px 0 rgba(0, 0, 0, 0.08);
+  border-radius: 38px;
+  margin: 0 auto;
+  margin-top: 3em;
+  display: flex;
+  .Girl-box-imageContent {
+    width: 50%;
+    height: 100%;
+    position: relative;
+    bottom: 8vw;
+    .Girl-box-image {
+      width: 200px;
+      height: 360px;
+      position: relative;
+      bottom: -22px;
+      left: 90px;
+      filter: grayscale(95%);
+      opacity: 0.6;
+    }
+    .imageTwo {
+      height: 420px;
+      width: 240px;
+      position: relative;
+      left: 0em;
+      bottom: 45px;
+      filter: grayscale(95%);
+      opacity: 0.6;
+    }
+
+    .Girl-imageLess {
+      opacity: 1;
+      filter: grayscale(0%);
+    }
+  }
+
+  .Girl-box-content {
+    width: 50%;
+    height: 100%;
+    display: inline-block;
+    text-align: center;
+    /* margin: 1em; */
+    margin-top: 1.5em;
+    .Girl-box-C-title {
+      font-size: 66px;
+      font-weight: bold;
+      color: #140f0f;
+      margin: 15px;
+    }
+
+    .Girl-box-C-moon {
+      font-weight: bold;
+      color: #140f0f;
+    }
+  }
+}
+
+.imageTwo {
+  width: 200px;
+}

src/pages/RandomItinerary/components/Hand/index.jsx

@@ -0,0 +1,80 @@
+import Taro from "@tarojs/taro"
+import { Icon, View } from "@tarojs/components"
+import { useEffect, useState } from "react"
+import CustomNav from '@/components/CustomNav'
+import withLayout from '@/layouts'
+
+
+
+import './style.less'
+
+
+export default (props) => {
+  const { ico, onSelected } = props
+  const LeftHand = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/RandomIIcon/LeftHand.png'
+  const RightHand = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/RandomIIcon/RightHand.png'
+
+  const [imageOne, setImageOne] = useState(false)
+  const [imageTow, setImageTow] = useState(false)
+
+  const handleLeftHand = () => {
+    setImageOne(true)
+    setImageTow(false)
+    onSelected()
+  }
+
+
+  const handleRightHand = () => {
+    setImageOne(false)
+    setImageTow(true)
+    onSelected()
+  }
+
+
+
+  return (
+    <View >
+      <View style='font-size: 20px;font-weight: bold;color: #140F0F;marginLeft:10px;;'>
+        3<text style='font-size: 13px;font-weight: bold;color: #140F0F;'> / 5 </text>双手交叉相握，你是拇指在上还是右手拇指在上？
+      </View>
+
+
+      <view className='Hand-Conste-box' onClick={handleLeftHand} >
+        <View className='Hand-box-imageContent'>
+          <image className={`Hand-box-image  ${imageOne && 'Hand-imageLess'} `} src={LeftHand} />
+        </View>
+        <view className='Hand-box-content' >
+          <View className='Hand-box-C-title' >
+            Head
+          </View>
+          <View className='Hand-box-C-moon' >
+            左手
+          </View>
+        </view>
+
+      </view>
+
+      <view className='Hand-Conste-box' onClick={handleRightHand} >
+        <View className='Hand-box-imageContent'>
+          <image className={`Hand-box-image  ${imageTow && 'Hand-imageLess'} `} src={RightHand} />
+
+        </View>
+        <view className='Hand-box-content' >
+          <View className='Hand-box-C-title' >
+            Right
+          </View>
+          <View className='Hand-box-C-moon' >
+            右手
+          </View>
+        </view>
+
+      </view>
+
+
+
+
+    </View>
+
+
+  )
+}

src/pages/RandomItinerary/components/Hand/style.less

@@ -0,0 +1,52 @@
+.Hand-Conste-box {
+  width: 630px;
+  height: 315px;
+  background: #fbfbfb;
+  -webkit-box-shadow: 0 7px 14px 0 rgba(0, 0, 0, 0.04),
+    0 4px 36px 0 rgba(0, 0, 0, 0.08);
+  box-shadow: 0 14px 28px 0 rgba(0, 0, 0, 0.04),
+    0 8px 72px 0 rgba(0, 0, 0, 0.08);
+  border-radius: 38px;
+  margin: 0 auto;
+  margin-top: 3em;
+  display: flex;
+  .Hand-box-imageContent {
+    width: 50%;
+    height: 100%;
+    position: relative;
+    bottom: 8vw;
+    .Hand-box-image {
+      width: 200px;
+      height: 360px;
+      position: relative;
+      bottom: -10px;
+      left: 90px;
+      filter: grayscale(95%);
+      opacity: 0.6;
+    }
+    .Hand-imageLess {
+      opacity: 1;
+      filter: grayscale(0%);
+    }
+  }
+
+  .Hand-box-content {
+    width: 50%;
+    height: 100%;
+    display: inline-block;
+    text-align: center;
+    /* margin: 1em; */
+    margin-top: 1.5em;
+    .Hand-box-C-title {
+      font-size: 66px;
+      font-weight: bold;
+      color: #140f0f;
+      margin: 15px;
+    }
+
+    .Hand-box-C-moon {
+      font-weight: bold;
+      color: #140f0f;
+    }
+  }
+}

src/pages/RandomItinerary/components/ResultOver/index.jsx

@@ -0,0 +1,38 @@
+import Taro from "@tarojs/taro"
+import { Text, View } from "@tarojs/components"
+import { useEffect, useState } from "react"
+
+import './style.less'
+
+
+export default (props) => {
+  const { ico, textNext } = props
+  const ShowOver = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/RandomIIcon/ShowOver.png'
+
+
+
+
+  return (
+    <View className='Over-box'>
+
+      <View className='Over-index-box' >
+        <image className='OI-image' src={ShowOver} />
+        <View className='OI-text-box'>
+          <Text className='OI-text'>
+            整体运势或有起伏的情况，需要做好各方面的平衡避免有故此彼伏的情况。 你要学会自己衡量得失利弊，但时间不够用的时候就要面临个人的
+          </Text>
+          <Text className='OI-text'>
+            未必就是走的人多的路就是对，你可以保持自己的想法。
+          </Text>
+          <Text className='OI-text'>
+            南京对于你而言是梦想中的地方，你的命定行程适合阳光、梦幻的地方。结合你的回答你的命定行程如下：
+          </Text>
+          <View className='bottom-text'>》</View>
+        </View>
+
+      </View>
+      <View className='content'>分享并邀请好友点开查看完整命定行程</View>
+    </View>
+
+  )
+}

src/pages/RandomItinerary/components/UFO/index.jsx

@@ -0,0 +1,116 @@
+import Taro from "@tarojs/taro"
+import { Icon, View } from "@tarojs/components"
+import { useEffect, useState } from "react"
+import CustomNav from '@/components/CustomNav'
+import withLayout from '@/layouts'
+
+
+
+
+import './style.less'
+
+
+export default (props) => {
+  const { ico, onSelected } = props
+  const [netxIma, setNetxIma] = useState(false)
+
+  const MaJiang = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/RandomIIcon/MaJiang.png'
+  const hello = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/RandomIIcon/hello.png'
+  const WeChat = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/RandomIIcon/WeChat.png'
+  const police = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/RandomIIcon/police.png'
+  const RunAway = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/RandomIIcon/RunAway.png'//
+
+
+  const [ufoImage, setUfoImage] = useState([
+    {
+      title: '打麻将',
+      ico: MaJiang,
+      active: false
+    },
+    {
+      title: '打招呼',
+      ico: hello,
+      active: false
+
+    },
+    {
+      title: '加微信',
+      ico: WeChat,
+      active: false
+
+    },
+    {
+      title: '报警',
+      ico: police,
+      active: false
+
+    },
+    {
+      title: '逃跑',
+      ico: RunAway,
+      active: false
+
+    },
+
+  ]
+
+  )
+
+
+
+  const handleTexUfo = (e) => {
+    onSelected()
+    const res = ufoImage.map((item, inx) => {
+
+      if (item.title == e.title) {
+
+        item.active = true
+
+      } else {
+
+        item.active = false
+      }
+      return item
+
+    })
+    setUfoImage(res)
+
+
+  }
+
+
+  return (
+    <View >
+      <View style='font-size: 20px;font-weight: bold;color: #140F0F;marginLeft:10px;;marginLeft:10px;'>
+        5<text style='font-size: 13px;font-weight: bold;color: #140F0F;'> / 5 </text>当你看到外星人是第一时间会做什么？
+      </View>
+      {
+        ufoImage.map((item, index) =>
+          <view className='UFO-Conste-box' key={index} onClick={() => handleTexUfo(item)}>
+            <View className='UFO-box-imageContent'>
+              <image className={`UFO-box-image ${item.active && 'UFO-imageLess'}`} src={item.ico} />
+
+            </View>
+            <view className='UFO-box-content' >
+              <View className='UFO-box-C-title' >
+                {item.title}
+              </View>
+              <View className='UFO-box-C-moon' >
+              </View>
+            </view>
+
+          </view>
+
+        )
+
+
+
+
+      }
+
+
+    </View>
+
+
+  )
+}

src/pages/RandomItinerary/components/UFO/style.less

@@ -0,0 +1,50 @@
+.UFO-Conste-box {
+  margin: 20px 20px;
+  width: 335px;
+  height: 180px;
+  background: #fbfbfb;
+  -webkit-box-shadow: 0 7px 14px 0 rgba(0, 0, 0, 0.04),
+    0 4px 36px 0 rgba(0, 0, 0, 0.08);
+  box-shadow: 0 14px 28px 0 rgba(0, 0, 0, 0.04),
+    0 8px 72px 0 rgba(0, 0, 0, 0.08);
+  border-radius: 38px;
+
+  display: inline-flex;
+  .UFO-box-imageContent {
+    width: 50%;
+    height: 100%;
+    position: relative;
+    .UFO-box-image {
+      width: 160px;
+      height: 190px;
+      padding-left: 10px;
+      filter: grayscale(95%);
+      opacity: 0.6;
+    }
+    .UFO-imageLess {
+      opacity: 1;
+      filter: grayscale(0%);
+    }
+  }
+
+  .UFO-box-content {
+    width: 50%;
+    height: 100%;
+    display: inline-block;
+
+    text-align: center;
+    .UFO-box-C-title {
+      font-size: 34px;
+      font-weight: bold;
+      color: #140f0f;
+
+      margin-top: 35%;
+    }
+
+    .UFO-box-C-moon {
+      font-size: 22px;
+      font-weight: 500;
+      color: #140f0f;
+    }
+  }
+}

src/pages/RandomItinerary/index.config.js

@@ -0,0 +1,11 @@
+export default {
+  navigationBarTitleText: '命定行程',
+  navigationStyle: 'custom',
+  disableScroll: true,
+
+  usingComponents: {
+
+  }
+
+
+}

src/pages/RandomItinerary/index.jsx

@@ -0,0 +1,116 @@
+import Taro from "@tarojs/taro"
+import { View } from "@tarojs/components"
+import { useEffect, useState } from "react"
+import CustomNav from '@/components/CustomNav'
+import withLayout from '@/layouts'
+import ChangeNext from '@/assets/icons/Travel/ChangeNext.png'
+import { seaveTravelDestiny } from "@/services/travel"
+import ConstellationCard from "./components/ConstellationCard"//星座
+import FiveSenses from "./components/FiveSenses"//五官
+import GirlFriend from "./components/GirlFriend"//有没有女朋友
+import Hand from "./components/Hand"//左右手
+import UFO from "./components/UFO"//不明飞行物
+import './style.less'
+
+
+
+export default withLayout((props) => {
+  const { router, person } = props
+  const [show, setShow] = useState(1)
+  const [btn, setBtn] = useState(true)
+
+  //是否选择
+  const [i, setI] = useState(false)
+
+  const onSelected = () => {
+    setI(true)
+  }
+
+
+  const handleGoTo = () => {
+    if (show >= 5) {
+      if (i === false) {
+        Taro.showToast({
+          title: '请选择一项噢',
+          icon: 'none',
+          duration: 2000
+        })
+
+      } else {
+        setI(false)
+        seaveTravelDestiny().then(e => {
+
+          Taro.navigateTo({ url: `/pages/RandomItinerary/ResultOver/index` })
+
+        })
+
+      }
+
+
+
+
+    } else {
+      if (i === false) {
+        Taro.showToast({
+          title: '请选择一项噢',
+          icon: 'none',
+          duration: 2000
+        })
+
+      } else {
+        setShow(show + 1)
+        setI(false)
+
+      }
+
+    }
+
+  }
+
+
+  return (
+    <view className='page-index'>
+      <view className='index-navbar'>
+        <CustomNav title='命定行程' />
+      </view>
+      <scroll-view scrollY style='height: calc(100% - 75px);margin-bottom: 40px;' >
+
+        <View className='index-container'>
+          {
+            show === 1 && <ConstellationCard ico={ChangeNext} textNext='换一批' onSelected={onSelected} />
+          }
+          {
+            show === 2 && <GirlFriend onSelected={onSelected} />
+          }
+          {
+            show === 3 && <Hand onSelected={onSelected} />
+          }
+          {
+            show === 4 && <FiveSenses onSelected={onSelected} />
+          }
+          {
+            show === 5 && <UFO onSelected={onSelected} />
+          }
+
+        </View>
+
+
+
+        {
+
+          btn === true && <View className='btn-bottom' onClick={handleGoTo}>
+            <text >
+              {
+                show > 4 ? '查看我的命定行程' : '下一题'
+              }
+            </text>
+          </View>
+        }
+
+
+
+      </scroll-view>
+
+    </view >
+  )
+})

src/pages/RandomItinerary/style.less

@@ -0,0 +1,24 @@
+.page-index {
+  .btn-bottom {
+    width: 690px;
+    height: 92px;
+    border: 2px solid #1a3b83;
+    border-radius: 44px;
+    font-size: 30px;
+    font-weight: bold;
+    color: #1a3b83;
+    margin: 0 auto;
+    display: flex;
+    align-items: center;
+    // margin-top: 1.5em;
+    // margin-bottom: 2em;
+    position: absolute;
+    left: 4%;
+    bottom: 0;
+
+    text {
+      text-align: center;
+      width: 100%;
+    }
+  }
+}

src/pages/RoomOrder/index.jsx

@@ -17,6 +17,7 @@ export default withLayout((props) => {
   const [taRoomContent, setTaRoomContent] = useState([])
   const [orderContent, setOrderContent] = useState([])
   const [titleLogo, settitleLogo] = useState('none')
+  const [loading, setLoading] = useState(false)
 
   const { hotelId } = orderContent
   const CarNumber = orderContent?.personNum
@@ -28,6 +29,7 @@ export default withLayout((props) => {
   }
 
   const handleSubmit = (e) => {
+    setLoading(true)
 
     // 订阅消息
     withSubscribeMessage([TPL_MESSAGE_HOTEL_CHECK_OUT], () => {
@@ -45,6 +47,8 @@ export default withLayout((props) => {
         // Taro.navigateBack({
         //   delta: 1
         // })
+        setLoading(false)
+
         Taro.reLaunch({
           url: `/pages/index/index?tab=1&roomId=${roomId}`
         })
@@ -80,7 +84,7 @@ export default withLayout((props) => {
               )
             })
           }
-          <button className='button-OK' onClick={handleSubmit} >确定</button>
+          <button className='button-OK' onClick={handleSubmit} loading={loading} disabled={loading} >确定</button>
         </scroll-view>
       </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/components/RecommendModel/index.jsx

@@ -0,0 +1,11 @@
+
+import './style.less'
+
+export default (props) => {
+  const { showCutover ,onClose} = props
+  return (
+    <mp-dialog buttons={[]} show={showCutover} mask maskClosable={showCutover} onClose={onClose}>
+      {props.children}
+    </mp-dialog>
+  )
+}

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

@@ -0,0 +1,13 @@
+export default {
+  navigationBarTitleText: '定制行程',
+  navigationStyle: 'custom',
+  styleIsolation: 'shared',
+  enableShareAppMessage: true,
+  disableScroll: true,
+
+  usingComponents: {
+    "mp-dialog": "weui-miniprogram/dialog/dialog",
+
+  }
+}
+

src/pages/Travel/Edit/index.jsx

@@ -0,0 +1,242 @@
+import Taro from '@tarojs/taro'
+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 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 { deleteTravelItem, getTravelID, getRecommendList } from '@/services/travel'
+
+import NewCustom from './NewCustom'
+import './style.less'
+
+export default withLayout((props) => {
+  const { router, location } = props
+  const { id, dayNum } = router.params
+
+
+
+  const [loading, setLoading] = useState(false)
+  const [bottomDayNum, setBottomDayNum] = useState(true)
+
+
+
+  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 [dayNumber, setDayNumber] = useState(1)
+  const sum = dayNum - dayNumber
+  const [state, setstate] = useState(true)
+
+
+  const addTextSum = () => {
+    setDayNumber(dayNumber + 1)
+
+    if (dayNumber == 1) {
+      setstate(false)
+    }
+
+
+
+  }
+  const minusTextSum = () => {
+    setDayNumber(dayNumber - 1)
+    if (dayNumber == 2) {
+      setstate(true)
+
+    }
+
+
+  }
+
+
+  const netx = (e) => {
+
+
+    let a = e.filter((val) => {
+      return val.dayOrder == dayNumber
+    })
+    setShowCutover(a)
+
+  }
+
+  const handelAddTravel = () => {
+    setLoading(true)
+
+    //获取我的行程。
+    getTravelID(id).then(e => {
+      setTravelCustom(e)
+      setShowCutover(e.travelItemList)
+      netx(e.travelItemList)
+      setLoading(false)
+
+    }).catch(e => {
+      setLoading(false)
+
+    })
+
+
+  }
+
+  useEffect(() => {
+    if (dayNum == 1) {
+      setBottomDayNum(false)
+    } else {
+      setBottomDayNum(true)
+
+    }
+
+    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 handelCancel = () => {
+    Taro.redirectTo({ url: '/pages/MineUserAll/MyTravel/index' })
+  }
+
+  return (
+    <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} editable='1' travelId={item.travelId} onDelete={onDelete} />
+
+                  )
+                }
+              </View>
+            </SpinBox>
+          </View>
+
+
+          <View className='tuijian' onClick={setRecommend}>
+            <Image src={Travel}></Image>
+            <Text>查看行程推荐</Text>
+          </View>
+
+
+          {
+            bottomDayNum &&
+            <View className='bottom'>
+              {
+
+                // dayNumber >= dayNum && <Button className='bottom-btn bottom-btn-cancel' onClick={minusTextSum} >上一天</Button>
+                state === false && <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

@@ -0,0 +1,100 @@
+.box-content {
+  height: 100vh;
+  .TravelTitle {
+    font-weight: bold;
+    color: #333;
+    line-height: 44px;
+    margin: 63px 30px 15px;
+    display: flex;
+    .edit {
+      width: 40px;
+      height: 40px;
+      margin: 0 30px;
+    }
+  }
+  .View-box {
+    margin: 30px 20px 0 20px;
+  }
+  .tuijian {
+    margin-bottom: 2em;
+    font-size: 28px;
+    font-weight: bold;
+    text-decoration: underline;
+    color: #274291;
+    line-height: 30px;
+    text-align: center;
+    image {
+      width: 42px;
+      height: 41px;
+      position: relative;
+      top: 8px;
+      right: 6px;
+    }
+  }
+  .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;
+      border-radius: 12px;
+      font-weight: bold;
+      color: #274290;
+      float: left;
+    }
+
+    .btnok {
+      width: 236px;
+      background: #274291;
+      border-radius: 12px;
+      font-size: 30px;
+      font-weight: bold;
+      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

@@ -0,0 +1,63 @@
+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 [datNum, setDayNum] = 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 = (e) => {
+    onClose()
+
+    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 = (e) => {
+
+    onClose()
+  }
+
+  const handelChangle = (e) => {
+    setDayNum(e)
+
+  }
+  return (
+    <Popup show={showCutover} maskClosable={showCutover} onClose={handelClose}>
+      <View className='from-room srl'>
+        <View style={{ marginBottom: '25px' }}>
+          <View className='rzline' /><Label className='srl mg'>温馨提示</Label><View className='rzline' />
+        </View>
+        <View className='srleft'>
+          <Label>出行天数：</Label>
+          <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>
+        </View>
+      </View>
+    </Popup>
+  )
+}

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

@@ -0,0 +1,61 @@
+.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;
+  }
+  .srleft{
+    text-align: left;
+    Input{
+      height: 92px;
+      font-size: 28px;
+      color: #999;
+      background: #FEFEFE;
+      box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, 0.08);
+      margin-bottom: 40px;
+    }
+    .picker{
+      font-size: 28px;
+      color: #999;
+      line-height: 92px;
+      height: 92px;
+      background: #FEFEFE;
+      margin-bottom: 40px;
+      box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, 0.08);
+    }
+  }  
+  .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/ThreeModel/index.jsx

@@ -0,0 +1,57 @@
+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 = () => {
+    onClose()
+
+    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

@@ -0,0 +1,57 @@
+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}` }).then(res => {
+      onClose()
+      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/TipModel/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/TwoModel/index.jsx

@@ -0,0 +1,57 @@
+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 = () => {
+    onClose()
+
+    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.config.js

@@ -0,0 +1,10 @@
+export default {
+  navigationBarTitleText: '定制行程',
+  navigationStyle: 'custom',
+  styleIsolation: 'shared',
+  enableShareAppMessage: true,
+  disableScroll: true,
+  usingComponents: {
+    "mp-dialog": "weui-miniprogram/dialog/dialog"
+  }
+}

src/pages/Travel/customizedTravel/index.jsx

@@ -0,0 +1,80 @@
+import Taro from '@tarojs/taro'
+import { Image, Button, View, Text } from '@tarojs/components'
+import React, { useState } from 'react'
+import CustomNav from '@/components/CustomNav'
+import oneDay from '@/assets/icons/Travel/oneDay.png'
+import twoDay from '@/assets/icons/Travel/twoDay.png'
+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 handleFinish2 = (val) => {
+
+  }
+  const handelCustom = () => {
+    setShowCutover(true)
+  }
+  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={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' onClick={handelTowDay}></Image>
+          <Image src={threeDay} className='img' onClick={handelThreeDay}></Image>
+          <Image src={custom} className='img' onClick={handelCustom}></Image>
+        </View>
+      </View>
+    </View>
+  )
+}

src/pages/Travel/customizedTravel/style.less

@@ -0,0 +1,15 @@
+.custom{
+  background-image: url('https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20211101150410.png');
+  background-size: 100% 100%;
+  .selectbtn{
+    display: flex;
+    flex-direction: column;
+    margin: 16.89vh 10.35% 0 10.35%;
+    height: 46.75vh;
+    .img{
+      width: 30vw;
+      height: 8vw;
+      margin: 4.7vw auto;
+    }
+  }
+}

src/pages/details/NoteDetails/index.config.js

@@ -0,0 +1,9 @@
+export default {
+  navigationBarTitleText: '笔记详情',
+  disableScroll: true,
+  navigationStyle: 'custom',
+  usingComponents: {
+    // "add-tipsFood": "../../../components/add-tipsFood/index"
+
+  }
+}

src/pages/details/NoteDetails/index.jsx

@@ -0,0 +1,199 @@
+import CustomNav from '@/components/CustomNav'
+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 share from '@/assets/icons/housemantj/touristShare.png'
+import good from '@/assets/icons/housemantj/touristGood.png'
+import baozan from '@/assets/icons/housemantj/bgood.png'
+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 { 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, Video } from '@tarojs/components';
+import useSave from "@/utils/hooks/useSave"
+import useLike from "@/utils/hooks/useLike"
+import ShopNoteCard from '@/components/foodCards/ShopNoteCard/index'
+import Taro, { useShareAppMessage } from '@tarojs/taro'
+import Extend from '../components/Extend/extend'
+import ImageList from "../components/ImageList";
+
+import './index.less'
+
+
+
+export default withLayout((props) => {
+  const { router, person } = props
+  const { id } = props.router.params
+  const [detail, setDetail] = useState({})
+  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()
+  //banner图集数组
+  const [imglist, setimglist] = useState([])
+  const [index, setIndex] = useState(0)
+  const handchange = (e) => {
+    setIndex(e.detail.current)
+  }
+
+  //本店指南
+  const [extend, setExtend] = useState([])
+
+  // 推荐套餐列表
+  const [recommend, setRecommend] = useState([])
+
+
+  //引导显隐
+  const [guidance, setGuidance] = useState('shareOff')
+  useEffect(() => {
+    if (router.params.enterType === "share") {
+      setGuidance('shareOn')
+    }
+  }, [router.params.enterType])
+  const resourceList = () => {
+    getNoteID(id).then((res) => {
+      setDetail(res)
+      setimglist(res.imageList || [])
+      setRecommend(res.wxResourceList || [])
+
+
+    }).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)
+      getNoteID(id).then((res) => {
+        setDetail(res)
+        setimglist(res.imageList || [])
+        setRecommend(res.wxResourceList || [])
+
+        setLoading(false)
+
+      }).catch(e => {
+        console.error("getNoteID错误", e)
+        setLoading(false)
+
+      })
+      getExtendContent('note', id, { pageSize: 500 }).then((res) => {
+        setExtend(res.records || [])
+        setLoading(false)
+
+      })
+    }
+  }, [id])
+  // 分享
+  useShareAppMessage(() => {
+    return {
+      title: detail.touristName,
+      path: `/pages/details/NoteDetails/index?id=${id}&enterType=share`,
+      imageUrl: detail.poster,
+    }
+  })
+
+
+  return (
+    <view className='page-index'>
+      {
+        guidance === 'shareOn' ? <view className='index-navbar'>
+          <add-tipsFood logo={logo} custom duration={-1} />
+          <CustomNav title='十公里' noback />
+        </view> :
+          <view className='index-navbar'>
+            <CustomNav title='十公里' />
+          </view>
+      }
+
+
+      <SpinBox loading={loading} className='index-container' style={{ padding: '0 30rpx', background: '#F8F8F8' }}>
+        <scroll-view scrollY style={{ height: '100%' }}>
+          <view className='storeDetails'>
+            <View className='huadong'>
+              {
+                detail.noteType === 'image' ?
+                  <ImageList imglist={imglist} />
+                  :
+                  <Video
+                    controls
+                    autoplay={false}
+                    loop={false}
+                    muted={false} style={{ width: "100%", height: '200px' }} src={detail.videoUrl}
+                  >
+                  </Video>
+              }
+            </View>
+
+
+          </view>
+          <view className='jdjs'>
+            <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> */}
+            </view>
+          </view>
+          <view class='adContainer'>
+            <Ad unit-id='adunit-a0f97bb7ec8ec7bb' ad-intervals='30' />
+          </view>
+          <view style={{ position: 'relative', display: extend == '' ? 'none' : '' }}>
+            <view className='title'>
+              <image src={NoteasICO} />笔记详情
+            </view>
+            <View style={{ background: '#FFF' }}>
+              {(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) => <ShopNoteCard resourceList={resourceList} editable='1' travelMine={travelMine} key={item} item={item} det={item} handelNoteList={handelNoteList} />)}
+          </view>
+          <view className='botton'>这是我的底线</view>
+        </scroll-view>
+      </SpinBox>
+
+      <view className='index-tabber weui-tabbar' style={{ background: '#fff' }}>
+        <view className='weui-tabbar__item'>
+          <Button openType='share' className='purebtn'><TabIcon icon={share} text='分享' /></Button>
+        </view>
+        <view className='weui-tabbar__item' onClick={toggleLike}>
+          <TabIcon icon={isLike > 0 ? baozan : weibaozan} text={isLike > 0 ? "已爆赞" : "爆赞"} />
+        </view>
+        <view className='weui-tabbar__item' onClick={toggleSave}>
+          <TabIcon icon={isSaved > 0 ? ax : good} text={isSaved > 0 ? "已收藏" : "加入收藏"} />
+        </view>
+      </view>
+    </view>
+  )
+})
+
+

src/pages/details/NoteDetails/index.less

@@ -0,0 +1,133 @@
+.storeDetails {
+  background-color: #fff;
+  border-radius: 12px;
+  .huadong {
+    position: relative;
+    .swiper {
+      height: calc((100vw - 60px) * 0.6);
+      .storeImage {
+        border-radius: 22px;
+        width: 100%;
+        height: 100%;
+      }
+    }
+    .tpPage {
+      position: absolute;
+      right: 20px;
+      bottom: 20px;
+      background: #000000;
+      border-radius: 16px;
+      font-size: 24px;
+      color: #ffffff;
+      padding: 0 7px;
+      opacity: 0.4;
+      line-height: 32px;
+      padding: 7px 8px 8px 7px;
+      text {
+        opacity: 0.64;
+      }
+    }
+  }
+  .storeJs {
+    padding: 22px;
+    .introduce {
+      display: inline-block;
+      .storeName {
+        font-size: 32px;
+        font-weight: bold;
+        color: #020200;
+      }
+    }
+    .bz {
+      float: right;
+      .bzRight {
+        font-size: 24px;
+        color: #202020;
+        line-height: 34px;
+        height: 23px;
+      }
+    }
+    .wz {
+      font-size: 24px;
+      padding: 30rpx 0 32rpx 0;
+      font-weight: bold;
+      color: #404040;
+    }
+    .dpPosition {
+      position: relative;
+      .dwTip {
+        width: 48px;
+        height: 48px;
+        top: -8px;
+        left: -8px;
+        position: absolute;
+      }
+      .distance {
+        padding-left: 38px;
+        font-size: 24px;
+        color: #c0c8d3;
+        .zhuandao {
+          width: 14px;
+          height: 24px;
+          transform: rotate(180deg);
+          position: relative;
+          left: 8px;
+          top: 5px;
+        }
+      }
+    }
+  }
+}
+.jdjs {
+  background: #fff;
+  border-radius: 12px 12px 0px 0px;
+  padding: 30px 20px 43px 20px;
+  text-align: justify;
+  font-size: 24px;
+  font-weight: bold;
+  color: #202020;
+  line-height: 54px;
+  overflow: hidden;
+  margin-bottom: 20px;
+  .line {
+    height: 1px;
+    background: #000;
+    opacity: 0.1;
+    margin: 57px 0 42px 0;
+  }
+  .sc {
+    font-size: 20px;
+    font-weight: bold;
+    color: #333;
+    float: right;
+    line-height: 0;
+    margin-right: 4px;
+    .scTip {
+      width: 20px;
+      height: 20px;
+      margin-right: 8px;
+    }
+  }
+}
+.title {
+  margin: 40px 0 40px 0;
+  font-size: 34px;
+  font-weight: bold;
+  color: #202020;
+  display: flex;
+  align-items: center;
+  image {
+    width: 35px;
+    height: 35px;
+    margin-right: 10px;
+  }
+}
+
+.botton {
+  font-size: 28px;
+  color: #c0c8d3;
+  line-height: 34px;
+  text-align: center;
+  padding: 40px 0;
+  background-color: #f8f8f8;
+}

src/pages/details/components/ImageList/index.jsx

@@ -0,0 +1,62 @@
+import Taro from "@tarojs/taro";
+import { Image, Swiper, SwiperItem, View, Text } from "@tarojs/components";
+import { useState} from "react";
+import { compressImage } from '@/utils'
+import './style.less'
+
+//详情页面上面的滑动图集
+export default (props) => {
+  const { imglist } = props
+  const [swiperHeight, setSwiperHeight] = useState()
+  const [swiperImgHeightList, setSwiperImgHeightList] = useState([])
+  const [swiperImgWidthList, setSwiperImgWidthList] = useState([])
+  const handleImageOnLoad = (e, inx) => {
+    const { detail } = e;
+    const { height, width } = detail || {}
+    if (height) {
+      const heightList = swiperImgHeightList.slice()
+      heightList[inx] = height
+      setSwiperImgHeightList(heightList)
+      const widthList = swiperImgWidthList.slice()
+      widthList[inx] = width
+      setSwiperImgWidthList(widthList)
+      if (!swiperHeight && inx === 0) {
+        let { screenWidth } = Taro.getSystemInfoSync()
+        let nowHeight = (screenWidth - 30) * height / width
+        setSwiperHeight(`${nowHeight}px`)
+      }
+    }
+  }
+
+  const [index, setIndex] = useState(0);
+  const handchange = (e) => {
+    const inx = e.detail.current
+    setIndex(inx);
+    const height = swiperImgHeightList[inx]
+    const width = swiperImgWidthList[inx]
+    let { screenWidth } = Taro.getSystemInfoSync()
+    let nowHeight = (screenWidth - 30) * height / width
+    setSwiperHeight(nowHeight ? `${nowHeight}px` : 'auto')
+  };
+  return (
+    <View className='huadong'>
+      <Swiper
+        circular
+        className='swiper'
+        onChange={handchange}
+        style={{ height: swiperHeight }}
+      >
+        {imglist.map((item, inx) => (
+          <SwiperItem key={inx}>
+            <Image src={compressImage(item.url)} mode='widthFix' className='storeImage' onLoad={(e) => handleImageOnLoad(e, inx)} />
+          </SwiperItem>
+        ))}
+      </Swiper>
+      <View className='tpPage'>
+        <Text>
+          {index + 1}/{imglist.length}
+        </Text>
+      </View>
+    </View>
+  )
+}

src/pages/details/components/ImageList/style.less

@@ -0,0 +1,27 @@
+.huadong{    
+  position: relative;
+  .swiper {
+    transition: all 0.3s linear;
+    .storeImage {
+      border-radius: 22px;
+      width: 100%;
+      height: 100%;
+    }
+  }
+  .tpPage {
+    position: absolute;
+    right: 20px;
+    bottom: 20px;
+    background: #000000;
+    border-radius: 16px;
+    font-size: 24px;
+    color: #ffffff;
+    padding: 0 7px;
+    opacity: 0.4;
+    line-height: 32px;
+    padding: 7px 8px 8px 7px;
+    text {
+      opacity: 0.64;
+    }
+  }  
+}

src/pages/details/foodDetails/foodDetails.jsx

@@ -8,8 +8,7 @@ import {
 } from "@/services/home";
 import { getVerifyTargetList } from "@/services/payOrder";
 import { useState, useEffect, useRef } from "react";
-import { Button, Swiper, SwiperItem, View, Ad } from "@tarojs/components";
-import { compressImage } from '@/utils'
+import { Button, View, Ad } from "@tarojs/components";
 import Star from "@/components/Star/Star.jsx";
 import NoData from '@/components/NoData'
 import Cards from "@/components/foodCards/foodCards.jsx";
@@ -25,18 +24,18 @@ import share from "@/assets/icons/housemantj/touristShare.png";
 import good from "@/assets/icons/housemantj/touristGood.png";
 import baozan from "@/assets/icons/housemantj/bgood.png";
 import weibaozan from "@/assets/icons/housemantj/unLike.png";
+import logo from "@/assets/icons/UserCenter/laba.png"
+
 import useSave from "@/utils/hooks/useSave";
 import useLike from "@/utils/hooks/useLike";
 import Extend from "../components/Extend/extend";
-import logo from "./laba.png";
-
+import ImageList from "../components/ImageList";
 import "./foodDetails.less";
 
 export default withLayout((props) => {
   const { router, person, location } = props;
   const { id, subOrderId, scene } = props.router.params;
 
-
   useEffect(() => {
     if (id && (scene || subOrderId)) {
       getVerifyTargetList({
@@ -60,10 +59,6 @@ export default withLayout((props) => {
   const [spackage, setPackage] = useState([]);
   //banner图集数组
   const [imglist, setimglist] = useState([]);
-  const [index, setIndex] = useState(0);
-  const handchange = (e) => {
-    setIndex(e.detail.current);
-  };
 
   const [isSaved, toggleSave] = useSave(detail.isSaved, "shop", id);
   const [isLike, toggleLike] = useLike(detail.isLike, "shop", id);
@@ -143,7 +138,6 @@ export default withLayout((props) => {
   const [isScroll, setScroll] = useState(true)
   return (
     <view className='page-index'>
-
       {
         guidance === 'shareOn' ? <view className='index-navbar'>
           <add-tipsFood logo={logo} custom duration={-1} />
@@ -153,31 +147,13 @@ export default withLayout((props) => {
             <CustomNav title='十公里' />
           </view>
       }
-
       <SpinBox loading={loading} className='index-container' style={{ padding: '0 30rpx', background: '#F8F8F8' }}>
         <scroll-view
           scrollY={isScroll}
           style={{ height: '100%' }}
         >
           <view className='storeDetails'>
-            <View className='huadong'>
-              <Swiper
-                circular
-                className='swiper'
-                onChange={handchange}
-              >
-                {imglist.map((item, inx) => (
-                  <SwiperItem key={inx}>
-                    <image src={compressImage(item.url)} mode='aspectFit' className='storeImage' />
-                  </SwiperItem>
-                ))}
-              </Swiper>
-              <view className='tpPage'>
-                <text>
-                  {index + 1}/{imglist.length}
-                </text>
-              </view>
-            </View>
+            <ImageList imglist={imglist} />
             <view className='storeJs'>
               <view style={{ overflow: "hidden" }}>
                 <view className='storeName'>{detail.shopName}</view>
@@ -242,8 +218,8 @@ export default withLayout((props) => {
                     <Cards scene={scene} id={id} setScroll={setScroll} subOrderId={subOrderId} key={item.packageId} editable='1' st={star} goshop='1' item={item} det={detail} />
                   ))}
                 </view>
-                <view class="adContainer">
-                  <Ad unit-id="adunit-a0f97bb7ec8ec7bb" ad-intervals="30" />
+                <view class='adContainer'>
+                  <Ad unit-id='adunit-a0f97bb7ec8ec7bb' ad-intervals='30' />
                 </view>
                 <view
                   style={{
@@ -254,10 +230,10 @@ export default withLayout((props) => {
                     <image src={titlezs} />
                     <text>本店指南</text>
                   </view>
-                  <View style={{background:'#FFF'}}>
-                  {(extend || []).map((item) => (
-                    <Extend key={item.extId} item={item} />
-                  ))}
+                  <View style={{ background: '#FFF' }}>
+                    {(extend || []).map((item) => (
+                      <Extend key={item.extId} item={item} />
+                    ))}
                   </View>
                 </view>
                 <view

src/pages/details/foodDetails/foodDetails.less

@@ -2,33 +2,6 @@
   background-color: #fff;
   border-radius: 12px;
   margin-bottom: 20px;
-  .huadong{    
-    position: relative;
-    .swiper {
-      height: calc((100vw - 60px) * 0.6);
-      .storeImage {
-        border-radius: 22px;
-        width: 100%;
-        height: 100%;
-      }
-    }
-    .tpPage {
-      position: absolute;
-      right: 20px;
-      bottom: 20px;
-      background: #000000;
-      border-radius: 16px;
-      font-size: 24px;
-      color: #ffffff;
-      padding: 0 7px;
-      opacity: 0.4;
-      line-height: 32px;
-      padding: 7px 8px 8px 7px;
-      text {
-        opacity: 0.64;
-      }
-    }  
-  }
   .storeJs {
     padding: 20px;
     .storeName {

src/pages/details/mjDetails/sceneryDetails.jsx

@@ -3,7 +3,6 @@ import ax from '@/assets/icons/housemantj/onlove.png'
 import dw from '@/assets/icons/housemantj/loc-o.png'
 import titlejd from '@/assets/icons/housemantj/goodTourist.png'
 import titlems from '@/assets/icons/housemantj/goodFood.png'
-import { compressImage } from '@/utils'
 import share from '@/assets/icons/housemantj/touristShare.png'
 import good from '@/assets/icons/housemantj/touristGood.png'
 import baozan from '@/assets/icons/housemantj/bgood.png'
@@ -14,15 +13,17 @@ import SpinBox from "@/components/Spin/SpinBox";
 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 useSave from "@/utils/hooks/useSave"
 import useLike from "@/utils/hooks/useLike"
 import Cards from '@/components/foodCards/foodCards.jsx'
 import Taro, { useShareAppMessage } from '@tarojs/taro'
 import Extend from '../components/Extend/extend'
-import logo from "../foodDetails/laba.png";
-
 import './sceneryDetails.less'
+import ImageList from "../components/ImageList";
+
+
 
 export default withLayout((props) => {
   const { router, person, location } = props
@@ -34,10 +35,6 @@ export default withLayout((props) => {
 
   //banner图集数组
   const [imglist, setimglist] = useState([])
-  const [index, setIndex] = useState(0)
-  const handchange = (e) => {
-    setIndex(e.detail.current)
-  }
 
   //本店指南
   const [extend, setExtend] = useState([])
@@ -114,25 +111,7 @@ export default withLayout((props) => {
       <SpinBox loading={loading} className='index-container' style={{ padding: '0 30rpx', background: '#F8F8F8' }}>
         <scroll-view scrollY style={{ height: '100%' }}>
           <view className='storeDetails'>
-            <View className='huadong'>
-              <Swiper
-                className='swiper'
-                circular
-                onChange={handchange}
-              >
-                {
-                  imglist.map((item) => (
-                    <SwiperItem>
-                      <image src={compressImage(item.url)} mode='aspectFit' className='storeImage' />
-                    </SwiperItem>
-                  ))}
-              </Swiper>
-              <view className='tpPage'>
-                <text>
-                  {index + 1}/{imglist.length}
-                </text>
-              </view>
-            </View>
+            <ImageList imglist={imglist} />
 
             <view className='storeJs'>
               <view className='introduce'>
@@ -145,7 +124,7 @@ export default withLayout((props) => {
               <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 className='distance'>{(detail.distance / 1000).toFixed(2)}公里<image src={zhuandao} className='zhuandao' /></view>
               </view>
             </view>
           </view>
@@ -156,8 +135,8 @@ export default withLayout((props) => {
               <image className='scTip' src={isSaved > 0 ? ax : good} /><text>{isSaved > 0 ? '已收藏' : '加入收藏'}</text>
             </view>
           </view>
-          <view class="adContainer">
-            <Ad unit-id="adunit-a0f97bb7ec8ec7bb" ad-intervals="30" />
+          <view class='adContainer'>
+            <Ad unit-id='adunit-a0f97bb7ec8ec7bb' ad-intervals='30' />
           </view>
           <view style={{ position: 'relative', display: extend == '' ? 'none' : '' }}>
             <view className='title'>

src/pages/details/mjDetails/sceneryDetails.less

@@ -1,34 +1,7 @@
 .storeDetails {
   background-color: #fff;
   border-radius: 12px;
-  margin-bottom: 20px;
-  .huadong{    
-    position: relative;
-    .swiper {
-      height: calc((100vw - 60px) * 0.6);
-      .storeImage {
-        border-radius: 22px;
-        width: 100%;
-        height: 100%;
-      }
-    }
-    .tpPage {
-      position: absolute;
-      right: 20px;
-      bottom: 20px;
-      background: #000000;
-      border-radius: 16px;
-      font-size: 24px;
-      color: #ffffff;
-      padding: 0 7px;
-      opacity: 0.4;
-      line-height: 32px;
-      padding: 7px 8px 8px 7px;
-      text {
-        opacity: 0.64;
-      }
-    }  
-  }
+  margin-bottom: 20px;  
   .storeJs {
     padding: 22px;
     .introduce {

src/pages/index/components/Card/index.jsx

@@ -32,7 +32,7 @@ export default (props) => {
       <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 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}>

src/pages/index/components/Customized/index.jsx

@@ -0,0 +1,63 @@
+
+
+import Taro from '@tarojs/taro'
+import { View } from '@tarojs/components'
+import { getTravelDestiny } from '@/services/travel'
+// import ResultOver from "../../../RandomItinerary/components/ResultOver/index"//结果
+
+import './style.less'
+
+export default (props) => {
+  const { item, onMoldeOn } = props
+
+
+  const goToTravel = () => {
+    Taro.navigateTo({ url: `/pages/Travel/customizedTravel/index` })
+
+  }
+
+  //跳转答题页
+  const goToRandomItinerary = () => {
+
+    getTravelDestiny().then(e => {
+
+      if (!e) {
+        Taro.navigateTo({ url: `/pages/RandomItinerary/index` })
+
+      } else {
+        Taro.navigateTo({ url: `/pages/RandomItinerary/ResultOver/index` })
+
+      }
+
+    })
+
+
+
+
+  }
+
+  return (
+    <view style='width:100%;display:flex;'>
+      <view style='width:45%'>
+        <view onClick={goToTravel} className='CustomizedEntrance'  ></view>
+        <image className='MiniYellow' src='https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/GuideCheck/MiniYellow.png' />
+
+        <image className='BigPink' src='https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/GuideCheck/BigPink.png' />
+
+      </view>
+      <view className='style=width:45%'>
+        <view className='BigYellow'  ></view>
+
+        {/* <view className='MiniPink'  ></view> */}
+        <image className='MiniPink' src='https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/GuideCheck/MiniPink.png' />
+
+
+        <view onClick={goToRandomItinerary} className='LtineraryEntrance'  ></view>
+
+      </view>
+    </view>
+
+
+
+  )
+}

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

@@ -0,0 +1,172 @@
+.CustomizedEntrance {
+  width: 345px;
+  height: 440px;
+  position: relative;
+  top: 50px;
+  animation: CustomizedEntrance 3s ease infinite;
+  animation-iteration-count: infinite; /*动作循环的次数：infinite 无限循环*/
+  background: url("https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/GuideCheck/CustomizedEntrance.png")
+    no-repeat;
+  background-size: 100% 100%;
+
+  animation-fill-mode: both; /*播放后的状态*/
+}
+
+.MiniYellow {
+  width: 90px;
+
+  height: 100px;
+  position: relative;
+  animation: MiniYellow 2.2s ease infinite;
+  animation-iteration-count: infinite; /*动作循环的次数：infinite 无限循环*/
+  // background: url("https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/GuideCheck/MiniYellow.png")
+  //   no-repeat;
+  // background-size: 100% 100%;
+
+  animation-fill-mode: both; /*播放后的状态*/
+  left: 201px;
+  bottom: 20px;
+}
+
+.BigPink {
+  width: 321px;
+  height: 250px;
+  position: relative;
+  left: 54px;
+  animation: BigPink 2.4s ease infinite;
+  animation-iteration-count: infinite; /*动作循环的次数：infinite 无限循环*/
+  // background: url("https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/GuideCheck/BigPink.png")
+  //   no-repeat;
+  // background-size: 100% 100%;
+  bottom: 10px;
+  animation-fill-mode: both; /*播放后的状态*/
+}
+
+// 右面部分
+
+.LtineraryEntrance {
+  background: url("https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/GuideCheck/LtineraryEntrance.png")
+    no-repeat;
+
+  width: 345px;
+  height: 440px;
+  position: relative;
+  left: 0;
+  top: -30px;
+  animation: LtineraryEntrance 3.5s ease-out infinite;
+  animation-iteration-count: infinite; /*动作循环的次数：infinite 无限循环*/
+
+  background-size: 100% 100%;
+
+  animation-fill-mode: both; /*播放后的状态*/
+}
+.BigYellow {
+  width: 267px;
+  height: 190px;
+  position: relative;
+  left: 80px;
+  top: 50px;
+
+  z-index: -1;
+  animation: BigYellow 2.4s ease infinite;
+  animation-iteration-count: infinite; /*动作循环的次数：infinite 无限循环*/
+  background: url("https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/GuideCheck/BigYellow.png")
+    no-repeat;
+  background-size: 100% 100%;
+  bottom: 10px;
+  animation-fill-mode: both; /*播放后的状态*/
+}
+.MiniPink {
+  width: 135px;
+  height: 184px;
+
+  position: relative;
+  left: 0px;
+  animation: MiniPink 2.4s ease infinite;
+  animation-iteration-count: infinite; /*动作循环的次数：infinite 无限循环*/
+  // background: url("https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/GuideCheck/MiniPink.png")
+  //   no-repeat;
+  // background-size: 100% 100%;
+  animation-fill-mode: both; /*播放后的状态*/
+}
+
+@keyframes CustomizedEntrance {
+  0% {
+    transform: translateY(-3px);
+  }
+
+  50% {
+    transform: translateY(-50px);
+  }
+
+  100% {
+    transform: translateY(-3px);
+  }
+}
+
+@keyframes MiniYellow {
+  0% {
+    transform: translateY(-3px);
+  }
+
+  50% {
+    transform: translateY(-50px);
+  }
+
+  100% {
+    transform: translateY(-3px);
+  }
+}
+@keyframes BigPink {
+  0% {
+    transform: translateX(-3px);
+  }
+
+  50% {
+    transform: translateX(-50px);
+  }
+
+  100% {
+    transform: translateX(-3px);
+  }
+}
+
+@keyframes LtineraryEntrance {
+  0% {
+    transform: translatey(-0px);
+  }
+
+  50% {
+    transform: translatey(80px);
+  }
+
+  100% {
+    transform: translatey(0px);
+  }
+}
+@keyframes BigYellow {
+  0% {
+    transform: translateX(-3px);
+  }
+
+  50% {
+    transform: translateX(-30px);
+  }
+
+  100% {
+    transform: translateX(-3px);
+  }
+}
+@keyframes MiniPink {
+  0% {
+    transform: translateY(-3px);
+  }
+
+  50% {
+    transform: translateY(-50px);
+  }
+
+  100% {
+    transform: translateY(-3px);
+  }
+}

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

@@ -0,0 +1,45 @@
+
+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 VideoStart from '@/assets/icons/housemantj/VideoStart.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, 'note', item.noteId)
+  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.noteType == 'video' ? VideoStart : ''} />
+          <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,76 @@
+.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: 60px;
+      height: 50px;
+
+      position: absolute;
+      left: 40%;
+      top: 30%;
+    }
+    .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/index.config.js

@@ -1,7 +1,6 @@
 export default {
   navigationBarTitleText: '十公里',
   navigationStyle: 'custom',
-
   styleIsolation: 'shared',
   enableShareAppMessage: true,
   disableScroll: true,

src/pages/index/tabbar.js

@@ -6,7 +6,7 @@ const tabbar = [
     selectedIconPath: require('@/assets/icons/tabbar/recommend_active.png'),
   },
   {
-    text: '入住指引',
+    text: '我的指引',
     iconPath: require('@/assets/icons/tabbar/guide.png'),
     selectedIconPath: require('@/assets/icons/tabbar/guide_active.png'),
   },

src/pages/index/tabs/Guide.jsx

@@ -9,10 +9,10 @@ import copy_logo from '@/assets/icons/GuideCheck/copy_logo.png'
 import Cup from '@/assets/icons/GuideCheck/Cup.png'
 import BlackSpot from '@/assets/icons/GuideCheck/BlackSpot.png'
 import { getRecommendList, getExtendContent } from '@/services/home'
-import sleep from '@/assets/icons/GuideCheck/sleep_logo.png'
 import { getTaRoom, goToRoomForm } from '@/services/taRoom​'
 import useTrackClick from '@/utils/hooks/useTrackClick'
 import { useModel } from "@/store";
+import Customized from '../components/Customized'
 import './GuideCss/style.less'
 
 
@@ -135,14 +135,6 @@ export default (props) => {
   return (
     <scroll-view scrollY style={{ height: '100%' }}  >
       <view className='Guide-Home-box'>
-        {
-          ifroomId === 'havenot' && (
-            <view className='Guide-image-text-box'>
-              <image className='Guide-images' src={sleep} />
-              <view className='Guide-text'>您还没有入住订单哟~</view>
-            </view>
-          )
-        }
         {/* 有民宿的情况下 */}
         {
           ifroomId === 'reality' && (
@@ -169,7 +161,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 +177,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>
@@ -216,16 +208,14 @@ export default (props) => {
           )
         }
         <view className='Guide-Content-box'>
-          <view className='title-image'>
-            <image mode='scaleToFill' className='title-image-cup' src={Cup} />
-            <text className='title-title-boss' >老板推荐好吃的</text>
-          </view>
+          <Customized />
         </view>
-        <view style={{ marginTop: '10rpx', paddingBottom: '60rpx' }}>
-          {(spackage || []).map((item, index) => <BossCard det={item} st={parseFloat(item.score.toFixed(1))} key={(index)} trackClick={trackClick} taRoomContent={taRoomContent} item={item} />)}
+        <view className={`Guide-bottom-box ${ifroomId === 'reality' ? '' : 'Guide-bottom-two'}`}>
+          <Image mode='widthFix' style={{ width: '100%' }} src='http://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/hotel_guide_help.png' onClick={goIndex} />
+
         </view>
-        <Image mode='widthFix' style={{ width: '100%' }} src='http://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/hotel_guide_help.png' onClick={goIndex} />
       </view>
+
     </scroll-view>
   )
 }

src/pages/index/tabs/GuideCss/style.less

@@ -3,7 +3,6 @@
 .Guide-Home-box {
   width: 94%;
   margin: auto;
-
   .room-box-info-ROOM {
     display: flex;
     padding: 10px;
@@ -262,7 +261,6 @@
     }
   }
   .Guide-Content-box {
-    margin-top: 2em;
     .title-image {
       display: flex;
       // width: 270px;
@@ -306,7 +304,17 @@
       }
     }
   }
-    
+  .Guide-bottom-box {
+    width: 100%;
+    position: absolute;
+    left: 0;
+    z-index: 9999;
+  }
+
+  .Guide-bottom-two {
+    bottom: 0vw;
+  }
+
   //攻略卡片.
   .Raiders-box-one {
     margin-bottom: 60px;