。

src/pages/Travel/customizedTravel/components/CustomDay/index.jsx

@@ -8,7 +8,7 @@ import './style.less'
 
 
 export default (props) => {
-  const { showCutover, onClose, onFinish } = props
+  const { showCutover, onClose } = props
   const [datNum, setDayNum] = useState('')
   const [loading, setLoading] = useState(false)
 
@@ -19,42 +19,28 @@ export default (props) => {
   const d = day.getDate();
 
   const handelShare = (e) => {
-    onClose()
-
+    setLoading(true)
     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}` })
-
+      setLoading(false)
+      onClose()
     })
-
-
-    // Taro.navigateTo({url:'/pages/Travel/Edit/index'})
   }
-  const handelClose = (e) => {
-
-    onClose()
-  }
-
   const handelChangle = (e) => {
     setDayNum(e)
-
   }
   return (
-    <Popup show={showCutover} maskClosable={showCutover} onClose={handelClose}>
+    <Popup show={showCutover} maskClosable={showCutover} onClose={onClose}>
       <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='请输入出行天数' />
+          <Input onInput={(e) => handelChangle(e.detail.value)} value={datNum} type='number' maxlength='1' min='1' placeholder='请输入出行天数' />
         </View>
         <View>
-          <Button className='cancel' onClick={handelClose}>取消</Button>
+          <Button className='cancel' onClick={onClose}>取消</Button>
           <Button className='btn' onClick={handelShare} loading={loading} disabled={loading}>确定</Button>
         </View>
       </View>

src/pages/Travel/customizedTravel/components/ThreeModel/index.jsx

@@ -1,57 +0,0 @@
-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

@@ -1,73 +0,0 @@
-.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

@@ -1,57 +0,0 @@
-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

@@ -1,73 +0,0 @@
-.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

@@ -7,37 +7,25 @@ import './style.less'
 
 
 export default (props) => {
-  const { showCutover, onClose, onFinish } = props
-  const [roomNum, setRoomNum] = useState('')
+  const { showCutover, onClose,dayNum1,dayNum2 } = props
   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
-      })
+    setLoading(true)
+    newTravelMine({ title: `我的行程${dayNum1}日游 ${y}-${m}-${d}`, dayNum: dayNum2 }).then(res => {      
       Taro.navigateTo({ url: `/pages/Travel/Edit/index?id=${res.travelId}&dayNum=${res.dayNum}` })
-
+      setLoading(false)
+      onClose()
     })
-
-
-  }
-  const handelClose = () => {
-    setRoomNum()
-    onClose()
   }
   const goIndex = () => {
     Taro.navigateTo({ url: '/pages/index/index' })
   }
   return (
-    <Popup show={showCutover} maskClosable={showCutover} onClose={handelClose}>
+    <Popup show={showCutover} maskClosable={showCutover} onClose={onClose}>
       <View className='from-room srl'>
         <View>
           <View className='rzline' /><Label className='srl mg'>温馨提示</Label><View className='rzline' />
@@ -48,7 +36,7 @@ export default (props) => {
             <View className='arrow'><View className='v1'></View><View className='v2'></View></View></View>
         </View>
         <View>
-          <Button className='cancel' onClick={handelClose}>取消</Button>
+          <Button className='cancel' onClick={onClose}>取消</Button>
           <Button className='btn' onClick={handelShare} loading={loading} disabled={loading}>确定</Button>
         </View>
       </View>

src/pages/Travel/customizedTravel/index.jsx

@@ -1,5 +1,5 @@
 import Taro from '@tarojs/taro'
-import { Image, Button, View, Text } from '@tarojs/components'
+import { Image, View } from '@tarojs/components'
 import React, { useState } from 'react'
 import CustomNav from '@/components/CustomNav'
 import oneDay from '@/assets/icons/Travel/oneDay.png'
@@ -7,66 +7,53 @@ 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 [dayNum1,setDayNum1]=useState()
+  //数字天数
+  const [dayNum2,setDayNum2]=useState()
+
   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)
-  }
+    setDayNum1('一')
+    setDayNum2(1)
+    setShowCutoverTwo(true)
+  }  
   const handelTowDay = () => {
     //打开二日游
+    setDayNum1('二')
+    setDayNum2(2)
     setShowCutoverTwo(true)
   }
-  // ------------------
-
-  const onCloseThree = () => {
-    //关闭三日游
-    setShowCutoverThree(false)
-  }
   const handelThreeDay = () => {
     //打开三日游
-    setShowCutoverThree(true)
+    setDayNum1('三')
+    setDayNum2(3)
+    setShowCutoverTwo(true)
+  }
+  const onCloseTwo = () => {    
+    setShowCutoverTwo(false)
   }
   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} />
-
+      <CustomDay showCutover={showCutover} onClose={onClose} />
+      <TwoModel showCutover={showCutoverTwo} onClose={onCloseTwo} dayNum2={dayNum2} dayNum1={dayNum1}/>
       <View className='index-container custom'>
         <View className='selectbtn'>
           <Image src={oneDay} className='img' onClick={handelDay}></Image>