。

src/components/foodCards/CustomCard/index.jsx

@@ -1,94 +1,37 @@
-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 { 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 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 { item, st, editable, onDelete } = props
   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'>
@@ -97,11 +40,10 @@ export default (props) => {
               </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} />
+                <Location {...item} />
+                <SaveIcon saved={item.isSaved > 0} targetType={item.targetType} editable={editable} targetId={item.targetId} />
               </View>
             </View>
           </CouponMedia.Body>

src/components/foodCards/CustomCard/style.less

@@ -1,7 +1,3 @@
-.view-picker {
-  position: relative;
-  top: 30%;
-}
 
 .foodCard {
   .cpn-card-text {

src/components/foodCards/RecommendedCard/index.jsx

@@ -1,90 +1,44 @@
-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 { View, Text, } from '@tarojs/components'
 import { compressImage } from '@/utils'
+import CouponCard from '@/components/CouponCard'
 import SaveIcon from '@/components/SaveIcon'
 import Location from '@/components/Location'
-
+import { saveTravel } from '@/services/travel'
 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 { item, st, editable, travelId, handelAddTravel, dayNumber } = props
+  const { targetId,  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'>
@@ -93,11 +47,10 @@ export default (props) => {
               </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} />
+                <Location {...item} />
+                <SaveIcon saved={item.isSaved > 0} targetType={item.targetType} editable={editable} targetId={item.targetId} />
               </View>
             </View>
           </CouponMedia.Body>

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

@@ -1,79 +0,0 @@
-
-import { useState } from 'react'
-import CustomCard from '@/components/foodCards/CustomCard/index'
-
-import Taro from '@tarojs/taro'
-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 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

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

src/pages/Travel/Edit/index.jsx

@@ -44,6 +44,7 @@ export default withLayout((props) => {
     })
   }
 
+  //第几天
   const [dayNumber, setDayNumber] = useState(1)
   const sum = dayNum - dayNumber
   const [state, setstate] = useState(true)
@@ -103,7 +104,6 @@ export default withLayout((props) => {
   const onDelete = (e) => {
     //这个删除是需要两个id的前一个id是整个行程的id需要根据这个id找到这条行程的全部信息  后面那个itemId是行程数组travelItemList里面的一条当前点击的需要删除的信息的id
     const itemId = e
-    console.log(e)
     Taro.showModal({
       title: '提示',
       content: '确定要删除吗',
@@ -190,7 +190,7 @@ export default withLayout((props) => {
               <View className='View-box'>
                 {
                   showCutover.map((item, index) =>
-                    <CustomCard key={index} item={item} det={item} editable='1' travelId={item.travelId} onDelete={onDelete} />
+                    <CustomCard key={index} item={item} editable='1' travelId={item.travelId} onDelete={onDelete} />
                   )
                 }
               </View>