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

src/components/newTravelmanager/travelLineTrip/components/travelDays.vue

@@ -6,7 +6,8 @@
         <div :id="'LineOfTravel'+(item*4)+'_0'+index">
           <!-- <Header :TripColor="dataAll.TripColor" :orderMsg="dataAll"></Header> -->
           <div style="padding: 10px 0;"></div>
-          <div class="travelDaysTitlle row-aic" :style="{'background':backgroundColor}">
+          <!-- dataAll.TripColor -->
+          <div class="travelDaysTitlle row-aic" :style="{'background': backgroundColor}">
             <div class="travelDaysTitlle-left">
               <div class="relative">
                 <div class="travelDaysTitlle-left-text column-ajc absolute">
@@ -729,7 +730,7 @@
         <span>{{pageHeight>1337?'超出内容分割到下一页':'底线'}}</span>
       </div>
       <div class="UpgradedVersion2Line absolute z-index3 row-ajc"
-      :style="{'top': pageHeight>1337&&pageHeight<2674?pageHeight+'px':'2674px'}">
+      :style="{'top': pageHeight>1337&&pageHeight<2676?pageHeight+'px':'2676px'}">
         <span>底线</span>
       </div>
     </div>