feat

src/components/BottomMoadl/index.jsx

@@ -60,14 +60,6 @@ export default (props) => {
 
     e.stopPropagation()
 
-    // getRecommendList({ location: location, pageNum: textNextSum, pageSize: 3 }).then(e => {
-    //   setRecommendContent(e.records)
-    //   setLoading(false)
-
-    // }).catch(s => {
-    //   setLoading(false)
-
-    // })
 
   }
 

src/components/MasonryLayout/index.jsx

@@ -18,7 +18,6 @@ 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

src/pages/MineUserAll/MyTravel/index.jsx

@@ -43,7 +43,8 @@ export default withLayout((props) => {
 
   }
   const handelEdit = (item) => {
-    Taro.navigateTo({ url: `/pages/Travel/Edit/index?id=${item.travelId}&dayNum=${item.dayNum}` })
+    console.log("🚀 ~ file: index.jsx ~ line 46 ~ handelEdit ~ item", item)
+    Taro.navigateTo({ url: `/pages/Travel/Edit/index?id=${item.travelId}&dayNum=${item.dayNum}&travelId=${item.travelId}` })
   }
 
   const [travelMine, setTravelMine] = useState([])

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

@@ -12,7 +12,7 @@ import './style.less'
 
 
 export default (props) => {
-  const { ico, textNext, onSelected } = props
+  const { ico, textNext, onSelected, nextQuestio } = props
   const [netxIma, setNetxIma] = useState(false)
 
   const Ari = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/ConstelPhoto/Ari.png'
@@ -130,6 +130,10 @@ export default (props) => {
   //第一组
   const handleFilter = (e) => {
     onSelected()
+    setTimeout(() => {
+      nextQuestio()
+
+    }, 500);
     const res = filterImage.map((item, inx) => {
       if (item.title == e.title) {
 
@@ -150,7 +154,11 @@ export default (props) => {
 
   //第二组
   const handleTwoFilter = (e) => {
-    onSelected()
+    nextQuestio()
+    setTimeout(() => {
+      nextQuestio()
+
+    }, 500);
 
     const res = twoImage.map((item, inx) => {
 

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

@@ -13,7 +13,7 @@ const nose = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/RandomIIc
 const mouth = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/RandomIIcon/mouth.png'
 
 export default (props) => {
-  const { ico, textNext, onSelected } = props
+  const { ico, textNext, onSelected, nextQuestio } = props
 
 
   const [netxIma, setNetxIma] = useState(false)
@@ -63,7 +63,10 @@ export default (props) => {
 
     })
     setOneImage(res)
+    setTimeout(() => {
+      nextQuestio()
 
+    }, 500);
 
   }
 

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

@@ -9,7 +9,7 @@ import './style.less'
 
 
 export default (props) => {
-  const { ico, textNext, onSelected } = props
+  const { ico, textNext, onSelected, nextQuestio } = 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'
@@ -21,6 +21,11 @@ export default (props) => {
     setImageOne(true)
     setImageTow(false)
     onSelected()
+    setTimeout(() => {
+      nextQuestio()
+
+    }, 500);
+
   }
 
 
@@ -28,6 +33,11 @@ export default (props) => {
     setImageOne(false)
     setImageTow(true)
     onSelected()//未选择不给到下一题
+    setTimeout(() => {
+      nextQuestio()
+
+    }, 500);
+
   }
 
 

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

@@ -10,7 +10,7 @@ import './style.less'
 
 
 export default (props) => {
-  const { ico, onSelected } = props
+  const { ico, onSelected, nextQuestio } = 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'
 
@@ -21,6 +21,10 @@ export default (props) => {
     setImageOne(true)
     setImageTow(false)
     onSelected()
+    setTimeout(() => {
+      nextQuestio()
+
+    }, 500);
   }
 
 
@@ -28,6 +32,10 @@ export default (props) => {
     setImageOne(false)
     setImageTow(true)
     onSelected()
+    setTimeout(() => {
+      nextQuestio()
+
+    }, 500);
   }
 
 

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

@@ -11,7 +11,7 @@ import './style.less'
 
 
 export default (props) => {
-  const { ico, onSelected } = props
+  const { ico, onSelected, handleGoTo } = props
   const [netxIma, setNetxIma] = useState(false)
 
   const MaJiang = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/RandomIIcon/MaJiang.png'
@@ -74,6 +74,10 @@ export default (props) => {
 
     })
     setUfoImage(res)
+    setTimeout(() => {
+      handleGoTo()
+
+    }, 500);
 
 
   }

src/pages/RandomItinerary/index.jsx

@@ -66,6 +66,10 @@ export default withLayout((props) => {
     }
 
   }
+  //选择题目即下一题
+  const nextQuestio = () => setShow(show + 1)
+
+
 
 
   return (
@@ -77,25 +81,25 @@ export default withLayout((props) => {
 
         <View className='index-container'>
           {
-            show === 1 && <ConstellationCard ico={ChangeNext} textNext='换一批' onSelected={onSelected} />
+            show === 1 && <ConstellationCard ico={ChangeNext} textNext='换一批' onSelected={onSelected} nextQuestio={nextQuestio} />
           }
           {
-            show === 2 && <GirlFriend onSelected={onSelected} />
+            show === 2 && <GirlFriend onSelected={onSelected} nextQuestio={nextQuestio} />
           }
           {
-            show === 3 && <Hand onSelected={onSelected} />
+            show === 3 && <Hand onSelected={onSelected} nextQuestio={nextQuestio} />
           }
           {
-            show === 4 && <FiveSenses onSelected={onSelected} />
+            show === 4 && <FiveSenses onSelected={onSelected} nextQuestio={nextQuestio} />
           }
           {
-            show === 5 && <UFO onSelected={onSelected} />
+            show === 5 && <UFO onSelected={onSelected} handleGoTo={handleGoTo} />
           }
 
         </View>
 
 
-
+        {/* 
         {
 
           btn === true && <View className='btn-bottom' onClick={handleGoTo}>
@@ -105,7 +109,7 @@ export default withLayout((props) => {
               }
             </text>
           </View>
-        }
+        } */}
 
 
 

src/pages/Travel/Edit/index.jsx

@@ -1,25 +1,25 @@
 import Taro from '@tarojs/taro'
-import { Image, Button, View, Text } from '@tarojs/components'
+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 } from "react";
+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'
-
+import Popup from '@/components/Popup';
 import editImg from '@/assets/icons/Travel/editimg.png'
 import CustomNav from '@/components/CustomNav'
-import { deleteTravelItem, getTravelID, getRecommendList } from '@/services/travel'
+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 } = router.params
+  const { id, dayNum, travelId } = router.params
 
 
 
@@ -32,6 +32,9 @@ export default withLayout((props) => {
   const [travelCustom, setTravelCustom] = useState()
 
 
+  const [showDialog, setShowDialog] = useState(false);
+  const [inputChangle, setInputChangle] = useState();
+
   const handleDelete = (res) => {
     setLoading(true)
     getTravelID(id).then(e => {
@@ -171,13 +174,56 @@ export default withLayout((props) => {
     setShowFrame(!showFrame)
 
   }
+  //修改行程名字
+
+  const handelInput = (e) => {
+    console.log(e.detail.value);
+
+    setInputChangle(e.detail.value)
+  }
+
+  //取消
+  const ButtonCancel = () => {
+    setShowDialog(false)
+
+  }
+  //确认
+  const ButtonOK = () => {
+    seaveTravelID(id, { title: inputChangle, travelId: travelId }).then(val => {
+      Taro.showToast({
+        title: '修改成功',
+        icon: 'none',
+        duration: 1000
+      })
+      setShowDialog(false)
+      handelAddTravel()
+
+    })
+
+  }
+
+
 
-  const handelCancel = () => {
-    Taro.redirectTo({ url: '/pages/MineUserAll/MyTravel/index' })
+  const handleModale = () => {
+    setShowDialog(true)
   }
 
   return (
     <view className='page-index'>
+      <Popup show={showDialog} maskClosable={false}>
+
+        <view className='travel-box-info-ROOM'>
+          <view className='travel-bi-name-ROOM' >
+            <view className='travel-bin-title-ROOM'>修改行程名称：</view>
+            <Input className='travel-bint-nameInfo-ROOM' value={inputChangle} onInput={handelInput} />
+          </view>
+        </view>
+
+        <view className='travel-button-box' >
+          <button className='travelButton-Cancel' onClick={ButtonCancel} >取消</button>
+          <button className='travelButton-OK' onClick={ButtonOK} >确定</button>
+        </view>
+      </Popup>
       {/* 
       frameTitle 标题
       flag 弹窗显示 true false
@@ -193,7 +239,7 @@ export default withLayout((props) => {
         <scroll-view scrollY style='height: calc(100% - 75px);margin-bottom: 40px;' >
 
           <View className='TravelTitle'>
-            {travelCustom?.title}<Image src={editImg} className='edit' ></Image>
+            {travelCustom?.title}<Image src={editImg} className='edit' onClick={handleModale} ></Image>
           </View>
           <View className='index-container'>
 

src/pages/Travel/Edit/style.less

@@ -1,3 +1,54 @@
+.travel-box-info-ROOM {
+  display: flex;
+  padding: 10px;
+  .travel-bi-name-ROOM {
+    width: 100%;
+
+    .travel-bin-title-ROOM {
+      margin: 3vw 3vw;
+      color: rgb(125, 125, 125);
+    }
+    .travel-bint-nameInfo-ROOM {
+      font-weight: 800;
+      display: block;
+      -webkit-border-radius: 4em;
+      -moz-border-radius: 4em;
+      border-radius: 40px 40px 40px 40px;
+      // border-radius: 2em;
+      font-size: 28px;
+      padding: 1em 3vw;
+      box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
+    }
+  }
+}
+
+.travel-button-box {
+  width: 100%;
+  margin-top: 53px;
+
+  .travelButton-Cancel {
+    display: inline-block;
+    width: 236px;
+    height: 78px;
+    border: 2px solid #274291;
+    font-size: 30px;
+    font-weight: bold;
+    color: #274291;
+    border-radius: 12px;
+    margin-right: 80px;
+  }
+  .travelButton-OK {
+    display: inline-block;
+    width: 236px;
+    height: 78px;
+    background: #274291;
+    border-radius: 12px;
+    font-size: 30px;
+    font-weight: bold;
+    color: #ffffff;
+  }
+}
+
 .box-content {
   height: 100vh;
   .TravelTitle {

src/pages/details/NoteDetails/index.jsx

@@ -59,7 +59,6 @@ export default withLayout((props) => {
   const [guidance, setGuidance] = useState('shareOff')
 
   useEffect(() => {
-
     Taro.nextTick(() => {
       // 在当前同步流程结束后，下一个时间片执行
       //绑定video 标签，拿到他实际的宽度，然后和 取到的高度，计算，才能得到正确的数值
@@ -135,11 +134,11 @@ export default withLayout((props) => {
 
   useEffect(() => {
     //获取我的行程。
+    handelNoteList()
+    // getTravelMine({ pageNum: 1, pageSize: 99, simple: true }).then(e => {
+    //   setTravelMine(e)
 
-    getTravelMine({ pageNum: 1, pageSize: 99, simple: true }).then(e => {
-      setTravelMine(e)
-
-    })
+    // })
 
     if (id) {
       setLoading(true)
@@ -173,7 +172,7 @@ export default withLayout((props) => {
 
 
   return (
-    <view className='page-index'>
+    <view className='page-index' >
       {
         guidance === 'shareOn' ? <view className='index-navbar'>
           <add-tipsFood logo={logo} custom duration={-1} />
@@ -185,7 +184,7 @@ export default withLayout((props) => {
       }
 
 
-      <SpinBox loading={loading} className='index-container' style={{ padding: '0 30rpx', background: '#F8F8F8' }}>
+      <SpinBox loading={loading} className='index-container' style={{ padding: '0 30rpx', background: 'while' }}>
         <scroll-view scrollY style={{ height: '100%' }}>
           <view className='storeDetails'>
             <View className='huadong'>
@@ -218,7 +217,7 @@ export default withLayout((props) => {
             </view>
           </view>
           <view class='adContainer'>
-            <Ad unit-id='adunit-a0f97bb7ec8ec7bb' ad-intervals='30' />
+            {/* <Ad unit-id='adunit-a0f97bb7ec8ec7bb' ad-intervals='30' /> */}
           </view>
           <view style={{ position: 'relative', display: extend == '' ? 'none' : '' }}>
             <view className='title'>

src/pages/details/NoteDetails/index.less

@@ -129,5 +129,5 @@
   line-height: 34px;
   text-align: center;
   padding: 40px 0;
-  background-color: #f8f8f8;
+  background-color: white;
 }

src/pages/details/foodDetails/foodDetails.jsx

@@ -219,7 +219,7 @@ export default withLayout((props) => {
                   ))}
                 </view>
                 <view class='adContainer'>
-                  <Ad unit-id='adunit-a0f97bb7ec8ec7bb' ad-intervals='30' />
+                  {/* <Ad unit-id='adunit-a0f97bb7ec8ec7bb' ad-intervals='30' /> */}
                 </view>
                 <view
                   style={{

src/pages/details/mjDetails/sceneryDetails.jsx

@@ -136,7 +136,7 @@ export default withLayout((props) => {
             </view>
           </view>
           <view class='adContainer'>
-            <Ad unit-id='adunit-a0f97bb7ec8ec7bb' ad-intervals='30' />
+            {/* <Ad unit-id='adunit-a0f97bb7ec8ec7bb' ad-intervals='30' /> */}
           </view>
           <view style={{ position: 'relative', display: extend == '' ? 'none' : '' }}>
             <view className='title'>

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

@@ -24,7 +24,7 @@ export default (props) => {
   }
   return (
 
-    <view className={uqClass} style={{ overflow: 'hidden' }}>
+    <view className={uqClass} style={{ overflow: 'hidden', backgroundColor: 'while' }}>
       <view className='contentCard' style={style}>
         <view className='cardTop'>
           <image mode='widthFix' src={compressImage(item.poster)} className='cCardimg' />

src/pages/index/tabs/Recommend.jsx

@@ -19,7 +19,7 @@ const listStyle = { height: '100%' }
 export default (props) => {
   const { router, person, location } = props
   const listClass = useMemo(() => random('f'), [])
-  const [activeTab, setActiveTab] = useState(0)
+  const [activeTab, setActiveTab] = useState(1)
   const listRef = useRef()
 
   const [queryParams, setQueryParams] = useState({ location, pageNum: 1, pageSize: 10, typeId: '' })

src/pages/index/tabs/RecommendNote/index.jsx

@@ -67,7 +67,7 @@ export default (props) => {
 
 
   return (
-    <view style={{ height: '100%', overflow: 'hidden', display: 'flex', flexDirection: 'column' }}>
+    <view style={{ height: '100%', overflow: 'hidden', display: 'flex', flexDirection: 'column', backgroundColor: 'white' }}>
 
       <List
         ref={listRef}

src/services/travel.js

@@ -22,6 +22,14 @@ export const getTravelMine = (params) => request(`/travel/mine`, { params })
 
 export const getTravelID = (id, params) => request(`/travel/${id}`, { params })
 
+/**
+ * 更新我的行程
+ * @param {*} 
+ * @returns 
+ */
+
+export const seaveTravelID = (id, data) => request(`/travel/${id}`, { method: 'put', data })
+
 
 /**
  * 新建保存行程

src/utils/request.js

@@ -34,7 +34,6 @@ export default (url, options) => {
           resolve(data)
 
         } else {
-          console.error(res)
           logger.error(nwUrl)
           logger.error(options)
           logger.error(res)