style

src/components/CompoentsOrder/complete/style.less

@@ -8,8 +8,7 @@
 }
 
 .complete-boxs {
-  margin: 20px auto;
-  padding: 0 30px;
+  padding: 20px 30px;
   .foot {
     font-size: 28px;
     color: #c0c8d3;

src/components/foodCards/ShopNoteCard/index.jsx

@@ -6,12 +6,10 @@ import CouponCard from '@/components/CouponCard'
 import { compressImage } from '@/utils'
 import SaveIcon from '@/components/SaveIcon'
 import Location from '@/components/Location'
-
 import grassOFF from '@/assets/icons/housemantj/grassOFF.png'
 import grassNO from '@/assets/icons/housemantj/grassNO.png'
 import Popup from '@/components/Popup'
 import { saveTravel, newTravelMine } from '@/services/travel'
-
 import './style.less'
 
 
@@ -21,24 +19,18 @@ 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([])
-
-  const [traveCoumun, setTraveCoumun] = useState()
+  const [traveCoumun, setTraveCoumun] = useState()  //第几天
 
   useEffect(() => {
-
     setValueList(travelMine?.records)
     setTraveCoumun(travelMine?.records[0].dayNum)
-
   }, [travelMine?.records, item])
 
   const onClose = () => {
@@ -48,8 +40,6 @@ export default (props) => {
     setScroll(true)
   }
 
-  //列改变
-
 
   const numberTrave = (new Array(traveCoumun).fill()).map((_, index) => ({ id: index + 1, title: `第 ${index + 1} 天` }))
 
@@ -57,89 +47,36 @@ export default (props) => {
 
 
   const handleColumn = e => {
-    console.log("🚀 ~ file: index.jsx ~ line 63 ~ e", e)
-    // console.log(e.detail.column);
     const { column, value } = e.detail
-
     if (column == 0) {
-
       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 hanleChange = (e) => {
-    console.log("🚀 ~ file: index.jsx ~ line 63 ~ e", e)
-
-    if (travelMine?.records == '') {
-
-
-      // newTravelMine({ title: `我的行程 ${y}-${m}-${d}` }).then(res => {
-      //   handelNoteList()
-      //   // 首先创建一个行程，然后才能拿到下面的这些数据
-
-      //   const [firstInx, secondInx] = e.detail?.value
-
-      //   const firstValue = valueList[firstInx] || ''
-
-      //   const secondValue = numberTrave[secondInx] || ''
-
-      //   const { travelId } = firstValue
-
-      //   //行程内容
-      //   const { id } = secondValue//天数
-      //   // saveTravel({})
-      //   saveTravel(res.travelId, { dayOrder: id, targetId: targetId, targetType: targetType }).then((val) => {
-      //     Taro.showToast({
-      //       title: '添加成功',
-      //       icon: 'none',
-      //       duration: 1000
-      //     })
-      //     resourceList(travelId)
-      //   })
-      // })
-
-      return;
-    } else {
+    if (travelMine?.records != '') {
       const [firstInx, secondInx] = e.detail.value
-
       const firstValue = valueList[firstInx]
-
       const secondValue = numberTrave[secondInx]
-
       const { travelId } = firstValue
-
-
       //行程内容
       const { id } = secondValue//天数
-
       saveTravel(travelId, { dayOrder: id, targetId: targetId, targetType: targetType }).then((res) => {
         Taro.showToast({
           title: '添加成功',
           icon: 'none',
-
           duration: 1000
         })
         resourceList(travelId)
-
-        // setGrowGrass(grassNO)
-
       })
     }
   }
 
-
   const handlePayClick = () => {
     if (travelMine?.records == '') {
       Taro.showToast({
@@ -152,10 +89,7 @@ export default (props) => {
         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'>
@@ -167,7 +101,6 @@ export default (props) => {
         onColumnChange={handleColumn}
         onChange={hanleChange}
         scrollType='link'
-      // value={}
       >
         <Action.Icon icon={item.isVisited < 1 ? grassOFF : grassNO} text={item.isVisited < 1 ? '种草' : '已种草'} onClick={handlePayClick} />
       </Picker>
@@ -175,7 +108,6 @@ export default (props) => {
     :
     <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' }}>
@@ -202,7 +134,6 @@ export default (props) => {
               </View>
               <View className='cpn-card-text' style={{ marginTop: '10rpx' }}>
                 <Text className='cpn-card-text_mn'>￥{`${(item.averagePrice == '' ? 0 / 100 : 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} />

src/pages/MineUserAll/MyTravel/index.jsx

@@ -1,21 +1,15 @@
 import Taro, { useDidShow } 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({
@@ -23,45 +17,34 @@ export default withLayout((props) => {
       content: '确定要删除吗',
       success: function (res) {
         if (res.confirm) {
-
           deleteTravel(e.travelId).then(r => {
             getList()
-
             Taro.showToast({
               title: '删除成功',
               icon: 'none',
               duration: 1000
             })
-
           })
-
         } else if (res.cancel) {
           getList()
-
-
         }
       }
     })
-
   }
   const handelEdit = (item) => {
-
-    Taro.navigateTo({ url: `/pages/Travel/Edit/index?id=${item.travelId}&dayNum=${item.dayNum}&travelId=${item.travelId}` })
+    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)
-
-
     })
   }
   useDidShow(() => getList())
 
   useEffect(() => {
     getList()
-
   }, [])
   return (
     <View className='page-index box-content'>
@@ -69,7 +52,6 @@ export default withLayout((props) => {
         <CustomNav title='我的行程' />
       </View>
       <View className='index-container'>
-        <SpinBox loading={loading}>
           <scroll-view
             scrollY
             style='height: 100%;'
@@ -77,7 +59,6 @@ export default withLayout((props) => {
             <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'>
@@ -90,14 +71,11 @@ export default withLayout((props) => {
                       </View>
                     </View>
                   </SlideView>
-
                 )
               }
-
               <View className='foot'>这是我的底线</View>
             </View>
           </scroll-view>
-        </SpinBox>
       </View>
     </View >
   )

src/pages/MineUserAll/MyTravel/style.less

@@ -2,7 +2,8 @@
   background-color: #F8F8F8;
   height: 100vh;
   .View-box {
-    margin: 30px 20px 0 20px;
+    margin:0 20px;
+    padding-top:30px;
     .myTravel{
       .slideview-content{
         margin:7.5px 0;

src/pages/MineUserAll/RefundMoney/CheckRefund/index.jsx

@@ -139,7 +139,7 @@ export default withLayout((props) => {
               </view>
             </view>
             {/* 商品信息结束 */}
-            <view>
+            <view style={{padding:'0 3px'}}>
               {(list || []).map((item) => {
                 return (
                   <OrderCard item={item} key={item.orderId} kkp='1' />

src/pages/Travel/Edit/index.jsx

@@ -16,7 +16,7 @@ import './style.less'
 
 export default withLayout((props) => {
   const { router, location } = props
-  const { id, dayNum, travelId } = router.params
+  const { id, dayNum} = router.params
 
   const [loading, setLoading] = useState(false)
   const [bottomDayNum, setBottomDayNum] = useState(true)
@@ -133,7 +133,7 @@ export default withLayout((props) => {
   }
   //确认
   const ButtonOK = () => {
-    seaveTravelID(id, { title: inputChangle, travelId: travelId }).then(val => {
+    seaveTravelID(id, { title: inputChangle}).then(val => {
       Taro.showToast({
         title: '修改成功',
         icon: 'none',