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

src/components/BottomMoadl/index.jsx

@@ -54,8 +54,6 @@ export default (props) => {
 
   //换一批
   const handleTextNext = (e) => {
-    console.log('换一批触发');
-    // setLoading(true)
     setTextNext(textNextSum + 1)
 
     e.stopPropagation()

src/components/CollectList/MyCollect/index.jsx

@@ -13,8 +13,6 @@ 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));
 

src/components/CompoentsOrder/AlreadyUsed/index.jsx

@@ -32,7 +32,6 @@ export default (props) => {
     }
     else {
       saveEvaluate(evaluate.targetType, evaluate.targetId, evaluate).then((res) => {
-        console.log(res)
         onFinish()
       })
       onClose()

src/components/MasonryLayout/Waterfall.jsx

@@ -26,7 +26,6 @@ export default (props) => {
   // useEffect(() => {
   //   const t = setTimeout(() => {
   //     Taro.createSelectorQuery().selectAll(`.${uqClass} .waterfall-item`).boundingClientRect(rects => {
-  //       console.log('---------waterfall-item---------->', rects)
   //     }).exec()
   //     clearTimeout(t)
   //   }, 500)

src/components/foodCards/ShareCard/index.jsx

@@ -14,95 +14,51 @@ 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 { item, st, editable, det } = props
   const { targetId, itemId } = props.item
+  //进入详情页面
   const goDetail = () => {
-    Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${targetId}` })
-
-  }
-  const goFood = () => {
+    item.targetType === 'tourist' ?  
+    Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${targetId}` }): 
     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 backStyle = {
+    background: `url('${compressImage(item.poster)}') no-repeat`,
+    backgroundSize: '100% 100%',
   }
-  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 style={{ margin: '15px 15px' }} >
+      <View className='coupon-card' onClick={goDetail}>
+        <View className='coupon-card_body' style='background: #fff;border-radius: 12px;'>
+          <View className='coupun-media'>
+            <View className='coupun-media_header'>
+              <View className='coupun-media_thumb' style="margin-top: 20px;">
+                <View className='image' style={backStyle}></View>
               </View>
-              <View className='cpn-md-act'>
-                <Location {...det} />
-                <SaveIcon saved={item.isSaved > 0} targetType='shop_package' editable={editable} targetId={item.targetId} />
+            </View>
+            <View className='coupun-media_body'>
+              <View class="coupun-media_body_ctt" style={{ marginTop: '20px' }}>
+                <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: '5px' }}>
+                    <Text className='cpn-card-text_mn'>￥{`${(item.averagePrice == '' ? '0.00' : item.averagePrice / 100)?.toFixed(2)}元`}</Text>
+                  </View>
+                  <View className='cpn-md-act'>
+                    <Location {...det} />
+                    <SaveIcon saved={item.isSaved > 0} targetType={item.targetType} editable={editable} targetId={item.targetId} />
+                  </View>
+                </View>
               </View>
             </View>
-          </CouponMedia.Body>
-        </CouponMedia>
-      </CouponCard>
+          </View>
+        </View>
+      </View>
     </View>
   )
 }

src/components/foodCards/ShopNoteCard/index.jsx

@@ -21,12 +21,11 @@ const Action = CouponCard.Action
 //套餐卡片
 export default (props) => {
   const { item, st, editable, setScroll, goshop, travelMine, resourceList, det, handelNoteList } = props
+  console.log("🚀 ~ file: index.jsx ~ line 24 ~ resourceList", resourceList)
   // 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}` })
 
@@ -87,7 +86,6 @@ export default (props) => {
     if (travelMine?.records == '') {
 
 
-      // console.log('没有行程');
       // newTravelMine({ title: `我的行程 ${y}-${m}-${d}` }).then(res => {
       //   handelNoteList()
       //   // 首先创建一个行程，然后才能拿到下面的这些数据
@@ -115,7 +113,6 @@ export default (props) => {
 
       return;
     } else {
-      console.log('有行程', e);
       const [firstInx, secondInx] = e.detail.value
 
       const firstValue = valueList[firstInx]
@@ -127,7 +124,6 @@ export default (props) => {
 
       //行程内容
       const { id } = secondValue//天数
-      console.log("🚀 ~ file: index.jsx ~ line 102 ~ newTravelMine ~ secondValue", secondValue)
 
       saveTravel(travelId, { dayOrder: id, targetId: targetId, targetType: targetType }).then((res) => {
         Taro.showToast({
@@ -141,8 +137,6 @@ export default (props) => {
         // setGrowGrass(grassNO)
 
       })
-      // console.log('else');
-
     }
   }
 

src/hotel/components/HouseManage/houseManage.jsx

@@ -100,7 +100,6 @@ export default React.forwardRef((props, ref) => {
     getShareMessage: () => {
       const { shareImage, roomOrderId } = shareDataRef.current
       setShowCard(false)
-      console.log(`/pages/index/index?tab=1&roomId=${room.roomId}&roomOrderId=${roomOrderId}&fromType=hotel&recommender=${hotel.hotelId}`)
       return {
         title: `欢迎来到${room.roomName}`,
         path: `/pages/index/index?tab=1&roomId=${room.roomId}&roomOrderId=${roomOrderId}&fromType=hotel&recommender=${hotel.hotelId}`,

src/hotel/pages/landlord/addRoom/addRoom.jsx

@@ -33,7 +33,6 @@ export default withLayout((props) => {
 
   const onRoomMap = () => {
     Taro.chooseLocation().then((res) => {
-      console.log("🚀 ~ file: addRoom.jsx ~ line 36 ~ Taro.chooseLocation ~ res", res)
       setRoomModel({ ...roomModel, location: res.longitude + ',' + res.latitude, locName: res.name, address: res.address })
     })
   }

src/pages/RandomItinerary/ResultOver/index.jsx

@@ -58,11 +58,11 @@ export default withLayout((props) => {
                 </Text>
                 <View className='bottom-text'>》</View>
               </View>
+              {
+                traveContent?.isHidden === false && shareList.map((item) => <ShareCard det={item} editable='1' item={item} key={item.itemId} />
+                )
+              }
             </View>
-            {
-              traveContent?.isHidden === false && shareList.map((item) => <ShareCard det={item} item={item} key={item.itemId} />
-              )
-            }
             {
               traveContent?.isHidden &&
               <Button openType='share' className='content'><View className='shareImg'>分享并邀请好友点开查看完整命定行程</View></Button>

src/pages/RandomItinerary/ResultOver/style.less

@@ -30,14 +30,6 @@
       }
     }
   }
-  .shareImg {
-    height: 120px;
-    background: url("../../../assets/icons/GuideCheck/shareImage.png") no-repeat;
-    background-size: 100%;
-    font-size: 29px;
-    color: #1a3b83;
-    line-height: 120px;
-  }
   .content {
     background: transparent;
     padding: 0;
@@ -45,5 +37,13 @@
     &::after {
       border: none;
     }
+    .shareImg {
+      height: 120px;
+      background: url("../../../assets/icons/GuideCheck/shareImage.png") no-repeat;
+      background-size: 100%;
+      font-size: 29px;
+      color: #1a3b83;
+      line-height: 120px;
+    } 
   }
 }

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

@@ -3,7 +3,6 @@ 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'
@@ -23,12 +22,6 @@ export default (props) => {
     setUnfold(!unfold)
 
   }
-
-  const onDay = () => {
-    console.log("🚀 ~ file: index.jsx ~ line 17 ~ item", item)
-
-  }
-
   const onDelete = (e) => {
 
     const itemId = e

src/pages/Travel/Edit/index.jsx

@@ -2,10 +2,8 @@ import Taro from '@tarojs/taro'
 import { Image, Button, View, Text, Input } from '@tarojs/components'
 import SpinBox from "@/components/Spin/SpinBox";
 import CustomCard from '@/components/foodCards/CustomCard/index'
-
 import { useState, useEffect, useRef } 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'
@@ -14,24 +12,18 @@ import editImg from '@/assets/icons/Travel/editimg.png'
 import CustomNav from '@/components/CustomNav'
 import { deleteTravelItem, getTravelID, seaveTravelID } from '@/services/travel'
 
-import NewCustom from './NewCustom'
 import './style.less'
 
 export default withLayout((props) => {
   const { router, location } = props
   const { id, dayNum, travelId } = router.params
 
-
-
   const [loading, setLoading] = useState(false)
   const [bottomDayNum, setBottomDayNum] = useState(true)
 
-
-
   const [showCutover, setShowCutover] = useState([])
   const [travelCustom, setTravelCustom] = useState()
 
-
   const [showDialog, setShowDialog] = useState(false);
   const [inputChangle, setInputChangle] = useState();
 
@@ -42,67 +34,45 @@ export default withLayout((props) => {
       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(() => {
@@ -110,37 +80,28 @@ export default withLayout((props) => {
       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: '删除成功',
@@ -148,44 +109,27 @@ export default withLayout((props) => {
               duration: 1000
             })
             handleDelete()
-
           })
         } else if (res.cancel) {
-
-
         }
       }
     })
-
   }
 
-
   const [showFrame, setShowFrame] = useState(false)
-
-
-
-
-
   //行程推荐
   const setRecommend = () => {
-    console.log('弹窗触发了。');
-
-
     setShowFrame(!showFrame)
-
   }
   //修改行程名字
 
   const handelInput = (e) => {
-    console.log(e.detail.value);
-
     setInputChangle(e.detail.value)
   }
 
   //取消
   const ButtonCancel = () => {
     setShowDialog(false)
-
   }
   //确认
   const ButtonOK = () => {
@@ -197,13 +141,9 @@ export default withLayout((props) => {
       })
       setShowDialog(false)
       handelAddTravel()
-
     })
-
   }
 
-
-
   const handleModale = () => {
     setInputChangle(travelCustom?.title)
     setShowDialog(true)
@@ -238,53 +178,37 @@ export default withLayout((props) => {
           <CustomNav title='定制行程' />
         </View>
         <scroll-view scrollY style='height: calc(100% - 75px);margin-bottom: 40px;' >
-
           <View className='TravelTitle'>
             {travelCustom?.title}<Image src={editImg} className='edit' onClick={handleModale} ></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/details/NoteDetails/index.jsx

@@ -2,7 +2,6 @@ import CustomNav from '@/components/CustomNav'
 import ax from '@/assets/icons/housemantj/onlove.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'
@@ -158,6 +157,7 @@ export default withLayout((props) => {
       })
     }
   }, [id])
+
   // 分享
   useShareAppMessage(() => {
     return {

src/pages/index/tabs/Mine.jsx

@@ -43,7 +43,6 @@ export default (props) => {
       lang: 'zh_CN',
       desc: "获取你的昵称、头像、地区及性别",
       success: (res) => {
-        console.log("🚀 ~ file: Mine.jsx ~ line 53 ~ handleGetUserProfile ~ res", res)
         const data = {
           ...res,
           sessionKey,

src/pages/searchResult/searchResult.jsx

@@ -20,7 +20,6 @@ const listStyle = { height: '100%' }
 
 export default withLayout((props) => {
   const { router, person, location } = props
-  console.log("🚀 ~ file: searchResult.jsx ~ line 22 ~ withLayout ~ props", props)
   const { q, targetTypeValue } = props.router.params
 
   const [listData, setListData] = useState({ list: [], rfTimes: 0 })