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

src/pages/MineUserAll/MyTravel/index.config.js

@@ -0,0 +1,5 @@
+export default {
+  navigationBarTitleText: '我的行程',
+  navigationStyle: 'custom',
+  disableScroll: true,
+}

src/pages/MineUserAll/MyTravel/index.jsx

@@ -0,0 +1,5 @@
+export default (props) => {
+return (
+  <view>我的行程</view>
+)
+}

src/pages/index/tabs/Mine.jsx

@@ -87,6 +87,10 @@ export default (props) => {
   const handleContactMe = () => {
     Taro.navigateTo({ url: '/pages/MineUserAll/ContactMe/index' })
   }
+  //我的行程
+  const handleTravel = () => {
+    Taro.navigateTo({ url: '/pages/MineUserAll/MyTravel/index' })
+  }
 
   //条款
   const handleRules = () => {
@@ -139,6 +143,11 @@ export default (props) => {
               <text className='Badge-list-titme'> 入住指引</text>
               <text className='Badge-list-gt'>&gt;</text>
             </view>
+            <view className='Badge-list' onClick={handleTravel}>
+              <image className='Badge-list-logo' src={HomeLogo} />
+              <text className='Badge-list-titme'> 我的行程</text>
+              <text className='Badge-list-gt'>&gt;</text>
+            </view>
             <view className='Badge-list' onClick={handleCollect}>
               <image className='Badge-list-logo' src={collect} />
               <text className='Badge-list-titme'> 我的收藏</text>
@@ -149,6 +158,11 @@ 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/routes.js

@@ -55,6 +55,10 @@ const mainPages = [
     title: '我的订单',
     page: 'pages/MineUserAll/AllOrder/index',
   },
+  {
+    title: '我的行程',
+    page: 'pages/MineUserAll/MyTravel/index',
+  },
   {
     title: '套餐核销',
     page: 'pages/TobeShop/index',