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

src/pages/MineUserAll/MyTravel/index.jsx

@@ -1,5 +1,51 @@
+import Taro from '@tarojs/taro'
+import { Image, Button, View } from '@tarojs/components'
+import SpinBox from "@/components/Spin/SpinBox";
+import { useState, useEffect } from "react";
+import SlideView from '@/components/SlideView';
+import editImg from '@/assets/icons/Travel/editimg.png'
+import CustomNav from '@/components/CustomNav'
+import './style.less'
+
 export default (props) => {
-return (
-  <view>我的行程</view>
-)
+
+  const [loading, setLoading] = useState(false)
+
+  const handelDelete = () => {
+
+  }
+  const handelEdit=()=>{
+    Taro.navigateTo({ url: '/pages/Travel/Edit/index' })
+  }
+  return (
+    <View className='page-index box-content'>
+      <View className='index-navbar'>
+        <CustomNav title='我的行程' />
+      </View>
+      <View className='index-container'>
+        <SpinBox loading={loading}>
+          <scroll-view
+            scrollY
+            style='height: 100%;'
+          >
+            <View className='View-box'>
+              <SlideView del onDelete={() => handelDelete(item)} className='myTravel'>
+                <View className='View-box-Card'>
+                <View className='bottom'>
+                  <View className='travelName'>定制行程1</View>
+                  <Image src={editImg} className='edit' onClick={handelEdit}></Image>
+                  </View>
+                  <View className='bottom'>
+                    <View className='travelDay'>行程时间：1天</View>
+                    <View className='travelDate'>创建时间：2021年10月31日</View>
+                  </View>
+                </View>
+              </SlideView>
+              <View className='foot'>这是我的底线</View>
+            </View>
+          </scroll-view>
+        </SpinBox>
+      </View>
+    </View >
+  )
 }

src/pages/MineUserAll/MyTravel/style.less

@@ -0,0 +1,51 @@
+.box-content {
+  background-color: #F8F8F8;
+  height: 100vh;
+  .View-box {
+    margin: 30px 20px 0 20px;
+    .myTravel{
+      .slideview-content{
+        margin:7.5px 0;
+      }
+    }
+    .View-box-Card{
+      background: #FFF;
+      box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
+      border-radius: 12px;
+      padding: 40px 34px 40px 26px;
+      line-height: 31.5px;
+      font-weight: bold;
+      color: #666;
+      margin: 15px 10px;
+      .travelName{
+        font-size: 34px;
+        color: #333;
+      }
+      .edit{
+        width: 40px;
+        height: 40px;
+      }
+      .bottom{   
+        display: flex;
+        justify-content: space-between;  
+        .travelDay{
+          margin-top: 40px;
+          font-size: 28px;
+        }
+        .travelDate{
+          margin-top: 40px;
+          font-size: 24px;
+          font-weight: 400;
+        }
+      }
+    }
+
+    .foot {
+      font-size: 28px;
+      color: #c0c8d3;
+      margin: 40px 0;
+      text-align: center;
+    }
+  }
+}
+

src/pages/Travel/Edit/components/RecommendModel/index.jsx

@@ -0,0 +1,11 @@
+
+import './style.less'
+
+export default (props) => {
+  const { showCutover ,onClose} = props
+  return (
+    <mp-dialog buttons={[]} show={showCutover} mask maskClosable={showCutover} onClose={onClose}>
+      {props.children}
+    </mp-dialog>
+  )
+}

src/pages/Travel/Edit/index.config.js

@@ -0,0 +1,10 @@
+export default {
+  navigationBarTitleText: '定制行程',
+  navigationStyle: 'custom',
+  styleIsolation: 'shared',
+  enableShareAppMessage: true,
+  disableScroll: true,
+  usingComponents: {
+    "mp-dialog": "weui-miniprogram/dialog/dialog"
+  }
+}

src/pages/Travel/Edit/index.jsx

@@ -0,0 +1,110 @@
+import Taro from '@tarojs/taro'
+import { Image, Button, View,Text } from '@tarojs/components'
+import SpinBox from "@/components/Spin/SpinBox";
+import { useState, useEffect } from "react";
+import NoData from '@/components/NoData'
+import MyCollect from '@/components/CollectList/MyCollect'
+import Travel from '@/assets/icons/Travel/travel.png'
+import editImg from '@/assets/icons/Travel/editimg.png'
+import CustomNav from '@/components/CustomNav'
+import RecommendModel from './components/RecommendModel'
+import './style.less'
+
+export default (props) => {
+
+  const [loading, setLoading] = useState(false)
+  const a = {
+    actualPrice: 0,
+    areaName: "建邺区",
+    areaPName: "南京市",
+    averagePrice: 2900,
+    cashback: 0,
+    cityId: "320105",
+    distance: 11131,
+    environmentScore: 0,
+    lat: "32.052602",
+    likeNum: 3,
+    lng: "118.846892",
+    poster: "http://yz-shigongli.oss-accelerate.aliyuncs.com/2021-09/1631772797192-1631772717(1).jpg",
+    pvNum: 325,
+    resourceNo: 128,
+    saveDate: "2021-09-26T15:42:58",
+    saveId: 512,
+    serviceScore: 0,
+    shopId: null,
+    standardPrice: 0,
+    status: 1,
+    sweetScore: 0,
+    targetId: "45c1fb5116bb429b22b68175481d7726",
+    targetName: "颐和路——一条颐和路，半部民国史",
+    targetType: "tourist",
+    title: "山川过雨晓光浮，初看江南第一州",
+    uvNum: 33,
+    weight: 3
+  }
+  const b = [a];
+
+
+  const [showCutover, setShowCutover] = useState(false)
+
+  const handelDelete = () => {
+
+  }
+  const onClose = () => {
+    setShowCutover(false)
+  }
+  const handelEdit = () => {
+    //测试用的可以删
+    Taro.redirectTo({url:'/pages/Travel/customizedTravel/index'})
+  }
+  const setRecommend=()=>{
+    setShowCutover(true)
+
+  }
+  const handelCancel=()=>{
+    Taro.redirectTo({url:'/pages/MineUserAll/MyTravel/index'})
+  }
+  const sumbit=()=>{
+    // 新增修改
+  }
+  return (
+    <View className='page-index box-content'>
+      <View className='index-navbar'>
+        <CustomNav title='定制行程' />
+      </View>
+      <View className='TravelTitle'>
+        定制行程2<Image src={editImg} className='edit' onClick={handelEdit}></Image>
+      </View>
+        <RecommendModel showCutover={showCutover} onClose={onClose}>1111</RecommendModel>
+      <View className='index-container'>
+        <SpinBox loading={loading}>
+          <scroll-view
+            scrollY
+            style='height: 100%;'
+          >
+            <View className='View-box'>
+              {
+                b.length == 0 ?
+                  <NoData /> :
+                  <view className='waterfall'>
+                    {
+                      b.map((item, index) => { return <MyCollect key={(index)} item={item} /> })
+                    }
+                  </view>
+              }
+              <View className='tuijian' onClick={setRecommend}>
+                <Image src={Travel}></Image>
+                <Text>查看行程推荐</Text>
+              </View>
+            </View>
+          </scroll-view>
+        </SpinBox>
+      </View>
+      <View className='bottom'>
+        <Button className='cancel' onClick={handelCancel}>取消</Button>
+        <Button className='btnok' onClick={sumbit}>确定</Button>
+      </View>
+
+    </View >
+  )
+}

src/pages/Travel/Edit/style.less

@@ -0,0 +1,58 @@
+.box-content {
+  height: 100vh;
+  .TravelTitle{
+    font-weight: bold;
+    color: #333;
+    line-height: 44px;
+    margin: 63px 30px 15px;
+    display: flex;
+    .edit{
+      width: 40px;
+      height: 40px;
+      margin: 0 30px;
+    }
+  }
+  .View-box {
+    margin: 30px 20px 0 20px;
+  }
+  .tuijian{
+    font-size: 28px;
+    font-weight: bold;
+    text-decoration: underline;
+    color: #274291;
+    line-height: 30px;
+    text-align: center;
+    image{
+      width: 42px;
+      height: 41px;
+      position: relative;
+      top: 8px;
+      right: 6px;
+    }
+  }
+  .bottom{
+    flex: none; 
+    margin: 60px 100px;
+    letter-spacing: 5px;
+    height: 78px;
+    .cancel{
+      width: 236px;
+      font-size: 30px;
+      border: 2px solid #274190;
+      border-radius: 12px;
+      font-weight: bold;
+      color: #274290;
+      float: left;
+    }
+
+    .btnok{
+      width: 236px;
+      background: #274291;
+      border-radius: 12px;
+      font-size: 30px;
+      font-weight: bold;
+      color: #FFF;
+      float: right;
+    }
+  }
+}

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

@@ -0,0 +1,36 @@
+import React, { useState } from 'react'
+import Taro from '@tarojs/taro'
+import { Input, Button, View,  Label } from '@tarojs/components'
+import Popup from '@/components/Popup'
+import './style.less'
+
+
+export default (props) => {
+  const { showCutover, onClose, onFinish } = props
+  const [roomNum, setRoomNum] = useState('')
+  const [loading, setLoading] = useState(false)
+  const handelShare = () => {
+    Taro.navigateTo({url:'/pages/Travel/Edit/index'})
+  }
+  const handelClose=()=>{
+    setRoomNum()
+    onClose()
+  }
+  return (
+    <Popup show={showCutover} maskClosable={showCutover} onClose={handelClose}>
+      <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) => setRoomNum(e.detail.value)} value={roomNum} type='number' placeholder='请输入出行天数' />
+        </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/CustomDay/style.less

@@ -0,0 +1,61 @@
+.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;
+  }
+  .srleft{
+    text-align: left;
+    Input{
+      height: 92px;
+      font-size: 28px;
+      color: #999;
+      background: #FEFEFE;
+      box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, 0.08);
+      margin-bottom: 40px;
+    }
+    .picker{
+      font-size: 28px;
+      color: #999;
+      line-height: 92px;
+      height: 92px;
+      background: #FEFEFE;
+      margin-bottom: 40px;
+      box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, 0.08);
+    }
+  }  
+  .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

@@ -0,0 +1,40 @@
+import React, { useState } from 'react'
+import Taro from '@tarojs/taro'
+import { Input, Button, View, Label } from '@tarojs/components'
+import Popup from '@/components/Popup'
+import './style.less'
+
+
+export default (props) => {
+  const { showCutover, onClose, onFinish } = props
+  const [roomNum, setRoomNum] = useState('')
+  const [loading, setLoading] = useState(false)
+  const handelShare = () => {
+    Taro.navigateTo({ url: '/pages/Travel/Edit/index' })
+  }
+  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

@@ -0,0 +1,73 @@
+.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/index.config.js

@@ -0,0 +1,10 @@
+export default {
+  navigationBarTitleText: '定制行程',
+  navigationStyle: 'custom',
+  styleIsolation: 'shared',
+  enableShareAppMessage: true,
+  disableScroll: true,
+  usingComponents: {
+    "mp-dialog": "weui-miniprogram/dialog/dialog"
+  }
+}

src/pages/Travel/customizedTravel/index.jsx

@@ -0,0 +1,52 @@
+import Taro from '@tarojs/taro'
+import { Image, Button, View, Text } from '@tarojs/components'
+import React, { useState } from 'react'
+import CustomNav from '@/components/CustomNav'
+import oneDay from '@/assets/icons/Travel/oneDay.png'
+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 './style.less'
+
+export default (props) => {
+  const [showCutover, setShowCutover] = useState(false)
+  const [showCutoverTip, setShowCutoverTip] = useState(false)
+  const onClose = () => {
+    setShowCutover(false)
+  }
+  const handleFinish = (val) => {
+   
+  }
+  const onClose2 = () => {
+    setShowCutoverTip(false)
+  }
+  const handleFinish2 = (val) => {
+   
+  }
+  const handelCustom=()=>{
+    setShowCutover(true)
+  }
+  const handelDay=()=>{
+    setShowCutoverTip(true)
+  }
+  return (
+    <View className='page-index'>
+      <View className='index-navbar'>
+        <CustomNav title='定制行程' />
+      </View>
+      <CustomDay showCutover={showCutover} onClose={onClose} onFinish={handleFinish} />
+      <TipModel showCutover={showCutoverTip} onClose={onClose2} onFinish={handleFinish2} />
+
+      <View className='index-container custom'>
+        <View className='selectbtn'>
+          <Image src={oneDay} className='img' onClick={handelDay}></Image>
+          <Image src={twoDay} className='img'></Image>
+          <Image src={threeDay} className='img'></Image>
+          <Image src={custom} className='img' onClick={handelCustom}></Image>
+        </View>
+      </View>
+    </View>
+  )
+}

src/pages/Travel/customizedTravel/style.less

@@ -0,0 +1,15 @@
+.custom{
+  background-image: url('https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20211101150410.png');
+  background-size: 100% 100%;
+  .selectbtn{
+    display: flex;
+    flex-direction: column;
+    margin: 16.89vh 10.35% 0 10.35%;
+    height: 46.75vh;
+    .img{
+      width: 30vw;
+      height: 8vw;
+      margin: 4.7vw auto;
+    }
+  }
+}

src/pages/index/index.config.js

@@ -1,7 +1,6 @@
 export default {
   navigationBarTitleText: '十公里',
   navigationStyle: 'custom',
-
   styleIsolation: 'shared',
   enableShareAppMessage: true,
   disableScroll: true,

src/pages/index/tabs/Mine.jsx

@@ -9,6 +9,7 @@ import AllOrder from '@/assets/icons/UserCenter/AllOrder.png'
 import Refund from '@/assets/icons/UserCenter/Refund.png'
 import ToShop from '@/assets/icons/UserCenter/ToShop.png'
 import HomeLogo from '@/assets/icons/UserCenter/HomeLogo.png'
+import MyTravel from '@/assets/icons/UserCenter/MyTravel.png'
 import ContactMe from '@/assets/icons/UserCenter/ContactMe.png'
 import collect from '@/assets/icons/UserCenter/collect.png'
 import Rules from '@/assets/icons/UserCenter/Rules.png'
@@ -144,7 +145,7 @@ export default (props) => {
               <text className='Badge-list-gt'>&gt;</text>
             </view>
             <view className='Badge-list' onClick={handleTravel}>
-              <image className='Badge-list-logo' src={HomeLogo} />
+              <image className='Badge-list-logo' src={MyTravel} />
               <text className='Badge-list-titme'> 我的行程</text>
               <text className='Badge-list-gt'>&gt;</text>
             </view>
@@ -158,11 +159,6 @@ export default (props) => {
               <text className='Badge-list-titme'> 联系我们</text>
               <text className='Badge-list-gt'>&gt;</text>
             </view>
-            <view className='Badge-list' onClick={handleContactMe}>
-              <image className='Badge-list-logo' src={ContactMe} />
-              <text className='Badge-list-titme'> 联系我们</text>
-              <text className='Badge-list-gt'>&gt;</text>
-            </view>
             <view className='Badge-list' onClick={handleRules}>
               <image className='Badge-list-logo' src={Rules} />
               <text className='Badge-list-titme'> 协议声明</text>

src/pages/index/tabs/Recommend.jsx

@@ -117,17 +117,8 @@ export default (props) => {
             </List>
             :
             <RecommendNote />
-
-
-
-
-
-
         }
-
       </view>
-
-
     </view>
   )
 }

src/pages/index/tabs/less/Recommend.less

@@ -38,7 +38,6 @@
 .index-tabs {
   padding-left: 95px;
   position: relative;
-  // flex: none;
   .position{
     position: absolute;
     left: 36px;

src/routes.js

@@ -59,6 +59,14 @@ const mainPages = [
     title: '我的行程',
     page: 'pages/MineUserAll/MyTravel/index',
   },
+  {
+    title: '定制行程编辑页',
+    page: 'pages/Travel/Edit/index',
+  },
+  {
+    title: '定制行程选择页',
+    page: 'pages/Travel/customizedTravel/index',
+  },
   {
     title: '套餐核销',
     page: 'pages/TobeShop/index',