Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/assets/css/UpgradedVersion.css

@@ -609,7 +609,7 @@ img {
     font-weight: bold;
     /* font-family: FZCuSong-B09S !important; */
     left: 0;
-    top: -21px;
+    top: -20px;
   }
 
   .UpgradedVersionDetails-Img-two {

src/assets/css/tripIndexNew.css

@@ -386,7 +386,6 @@ html, body{
 .travelDaysContent {
      /* min-height: 360px;
      max-height:600px; */
-     overflow:hidden;
     line-height: 38px;
     padding: 0 36px;
     /* margin: 41px 0 47px 0; */
@@ -435,12 +434,6 @@ html, body{
 .travelDaysdetails-textBox{
   flex-wrap: wrap;
 }
-.travelDaysdetails-text {
-    flex-wrap: wrap;
-    margin-right: 10px;
-    flex: 1;
-}
-
     .travelDaysdetails-text0 {
         font-family: PingFang SC;
         font-weight: 800;
@@ -453,18 +446,21 @@ html, body{
       white-space: wrap;
       overflow: hidden;
     }
-
+    .travelDaysdetails-tsText{
+      display: inline-block;
+      white-space: wrap;
+    }
     .travelDaysdetails-tsText,.travelDaysdetails-text {
         font-size: 21px;
         font-weight: 100;
         color: #2A2A2A;
         line-height: 34px;
-        white-space: wrap;
-        display: inline-block;
     }
     .travelDaysdetails-text {
+      flex-wrap: nowrap;
       padding: 0;
       margin: 0;
+      margin-right: 46px;
   }
     .travelDaysdetails-text1{
       /* font-size: 16px !important; */
@@ -563,7 +559,7 @@ html, body{
     font-family: FZCuSong-B09S !important;
     color: #2A2A2A;
 }
-.UpgradedVersion-box{
+.UpgradedVersion-boxHeight{
   width: 1123px;
   min-height: 1450px;
   margin: auto;

src/components/LeaveGroupDownload/index.vue

@@ -197,7 +197,19 @@
           </template>
         </div>
 
-        <div style="width: 100%;height:40px;"></div>
+        <!-- otherJourney-footer -->
+        <div>
+          <div class="otherJourney-introduceFooter absolute z-index1 row-aic" :style="{'background':''}">
+            <div class="introduceFooterBJ introduceFooterOne" :style="{'background':dataAll.tripColor}">&nbsp;</div>
+            <div class="introduceFooterBJ introduceFootertTwo" :style="{'background':dataAll.tripColor}">&nbsp;</div>
+            <div class="introduceFooter-text row-aic">
+              <img src="http://imgfile.oytour.com/Static/NewTripFeature/footerLogo.png" />
+              <div class="edit_div">{{dataAll.lineShortName}}</div>
+            </div>
+            <div class="introduceFooterBJ introduceFootertThree" :style="{'background':dataAll.tripColor}">&nbsp;</div>
+            <div class="introduceFooterBJ introduceFootertFour" :style="{'background':dataAll.tripColor}">&nbsp;</div>
+          </div>
+        </div>
       </div>
     </div>
 

src/components/LeaveGroupDownload/travelDays.vue

 <template>
-  <div v-if="vshowD">
+  <div id="pdf_3" v-if="vshowD">
     <!-- <div class="trip-box">
       <div>
         <div class="trip-block pdf_3_block"  style="padding-top:0px !important;border-bottom:none;padding-bottom:0px !important;">
@@ -9,8 +9,8 @@
         </div>
       </div>
     </div> -->
-    <div class="UpgradedVersion-box UpgradedVersion-homebj relative" v-for="(item,index) in tripList">
-      <div class="absolute z-index1 column" style="left: 0;right: 0; top: 0;bottom: 0;">
+    <div class="UpgradedVersion-boxHeight height UpgradedVersion-homebj relative" v-for="(item,index) in tripList">
+      <div class="z-index1">
         <Header :TripColor="dataAll.tripColor" :orderMsg="orderMsg"></Header>
         <div class="travelDaysTitlle row-aic">
           <div class="travelDaysTitlle-left">
@@ -105,18 +105,18 @@
         <div class="travelDaysdetails">
           <div class="travelDaysdetailsBJ column"
           :style="{'background':backgroundColor}">
-          <div class="travelDaysdetails-textBox row-sb">
-            <div class="travelDaysdetails-text">
+          <div class="travelDaysdetails-textBox row">
+            <div class="travelDaysdetails-text row">
               <span class="travelDaysdetails-text0">早餐：</span>
-              {{item.can.breakfirst?item.can.breakfirst:'无'}}
+              <div>{{item.can.breakfirst?item.can.breakfirst:'无'}}</div>
             </div>
-            <div class="travelDaysdetails-text">
+            <div class="travelDaysdetails-text row">
               <span class="travelDaysdetails-text0">午餐：</span>
-              {{item.can.lanuch?item.can.lanuch:'无'}}
+              <div>{{item.can.lanuch?item.can.lanuch:'无'}}</div>
             </div>
-            <div class="travelDaysdetails-text">
+            <div class="travelDaysdetails-text row">
               <span class="travelDaysdetails-text0">晚餐：</span>
-              {{item.can.dinner?item.can.dinner:'无'}}
+              <div>{{item.can.dinner?item.can.dinner:'无'}}</div>
             </div>
           </div>
           <div class="travelDaysdetails-textBox">

src/components/confirmationOrderDownLoadNew.vue

@@ -914,6 +914,7 @@
 </script>
 <style>
   @import url('../assets/css/tripIndex.css');
+  @import url("../assets/css/UpgradedVersion.css");
   @import url("../assets/css/tripIndexNew.css");
   @import url('../assets/css/detail.css');
 

src/router/config.js

@@ -2264,7 +2264,7 @@ export default {
             {
               path: '/TravelManager', //团控配置
               name: 'TravelManager',
-              component: resolve => require(['@/components/TravelManager/TravelGroupControl/TravelManager'], resolve),
+              component: resolve => require(['@/components/newTravelManager/TravelGroupControl/TravelManagerThree'], resolve),
               meta: {
                 title: '团控配置'
               },