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

src/assets/css/tripIndexNew2.css

@@ -159,7 +159,7 @@ html, body{
   height: 0px;
   border-bottom: 2px dashed red;
   left: 0;
-  top: 1379px;
+  top: 1345px;
   right: 0;
 }
 .UpgradedVersion2Line span{
@@ -339,7 +339,7 @@ html, body{
 
 .travelDaysMasterMap {
     margin-top: 45px;
-    margin-bottom: 41px;
+    /* margin-bottom: 41px; */
     height: 632px;
     /* flex:1; */
     overflow: hidden;
@@ -444,6 +444,7 @@ html, body{
   -moz-border-radius: 18px;
   -ms-border-radius: 18px;
   -o-border-radius: 18px;
+  line-height: 30px;
 }
 .travelDaysdetails-tsText p{
   padding: 0;
@@ -459,6 +460,7 @@ html, body{
 }
 .travelDaysdetails-textBox{
   flex-wrap: wrap;
+  padding: 0 5px;
 }
     .travelDaysdetails-text0 {
         font-size: 21px;
@@ -489,9 +491,15 @@ html, body{
       flex-wrap: nowrap;
       padding: 0;
       margin: 0;
-      margin-right: 46px;
+      margin-right: 10px;
       font-family: 'Microsoft JhengHei UI';
   }
+  .travelDaysdetails-textC{
+    font-size: 21px;
+    font-weight: 800;
+    line-height: 34px;
+    font-family: 'Microsoft JhengHei UI';
+  }
   .travelDaysdetails-text.right0{
     margin-right: 0;
   }
@@ -779,11 +787,15 @@ html, body{
   -ms-border-radius: 18px;
   -o-border-radius: 18px;
 }
+.card-title{
+  line-height: 20px;
+}
 .travelDaysMasterMap2-box{
-  padding: 45px 32px 0 32px;
+  padding: 45px 32px;
+  padding-bottom: 35px;
 }
 .travelDaysMasterMap2{
-  height: 538px;
+  height: 583px;
 }
 .travelDaysMasterMap2_2{
   width: 524px;

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

@@ -3,11 +3,12 @@
     <div class="UpgradedVersion-box2 UpgradedVersion-homebj relative" style="zoom: 0.44;"
     >
       <div class=" z-index1" style="left: 0;right: 0; top: 0;bottom: 0;">
+        <div style="padding: 10px 0;"></div>
         <div :id="'LineOfTravel'+(item*4)+'_0'+index">
           <!-- <Header :TripColor="dataAll.TripColor" :orderMsg="dataAll"></Header> -->
-          <div style="padding: 10px 0;"></div>
           <!-- dataAll.TripColor -->
-          <div class="travelDaysTitlle row-aic" :style="{'background': backgroundColor}">
+
+          <div class="travelDaysTitlle row-aic" style="min-height: 124px;" :style="{'background': backgroundColor}">
             <div class="travelDaysTitlle-left">
               <div class="relative">
                 <div class="travelDaysTitlle-left-text column-ajc absolute">
@@ -27,12 +28,13 @@
               </div>
             </div>
           </div>
+          <div style="min-height:1000px">
           <!-- 一张图 1-单张图，2-多张图-->
           <template v-if="
           (item.TitleObj.ShowTripType==2&&(item.ScenicArray.length==1||item.ScenicArray.length==0))
           ||((item.TitleObj.ShowTripType==1||item.TitleObj.ShowTripType==0)&&
           (item.ScenicArray.length>0||item.ScenicArray.length==0))">
-            <div class="column travelDaysMasterMap2-box" style="padding: 45px 32px 0 32px;">
+            <div class="column travelDaysMasterMap2-box" style="padding: 45px 32px 41px 32px;">
             <div :id="'viewSpotBox_'+(item*4)+'_0'+index" class="travelDaysMasterMap relative borderRadius18 hidden" style="margin-top: 0;">
               <div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
                 <div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
@@ -87,6 +89,7 @@
             </div>
           </template>
           <template  v-if="item.TitleObj.ShowTripType==2&&item.ScenicArray.length>1">
+            <div style="display: none;"></div>
             <div class="column travelDaysMasterMap2-box">
               <!-- 2张 -->
               <div v-if="item.ScenicArray.length==2">
@@ -127,7 +130,7 @@
                     </div>
                   </div>
                 </div>
-                <div class="row MB35" v-if="ScenicArrayList.length>1">
+                <div class="row" v-if="ScenicArrayList.length>1">
                     <div class="flexS">
                       <div :id="'viewSpotBox_'+(item*4)+'_1'+index" class="travelDaysMasterMap2_2 hidden relative borderRadius18">
                         <div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
@@ -661,7 +664,7 @@
             </div>
             </div>
           </template>
-
+          </div>
 
 
           <div class="travelDaysdetails-tsTextBox"
@@ -673,42 +676,42 @@
           </div>
           <div class="travelDaysdetails">
             <div class="travelDaysdetailsBJ column" :style="{'background':backgroundColor}">
-              <div class="travelDaysdetails-textBox row">
-                <div class="travelDaysdetails-text row-aic">
+              <div class="travelDaysdetails-textBox row-sb">
+                <div class="travelDaysdetails-text row">
                   <span class="travelDaysdetails-text0">早餐：</span>
-                  <div>
+                  <div class="travelDaysdetails-textC">
                     <template v-if="item&&item.DinnerArray&&item.DinnerArray.length>0">
                       {{item.DinnerArray[0].DinnerName?item.DinnerArray[0].DinnerName:'无'}}
                     </template>
                   </div>
                 </div>
-                <div class="travelDaysdetails-text row-aic">
+                <div class="travelDaysdetails-text row">
                   <span class="travelDaysdetails-text0">午餐：</span>
-                  <div>
+                  <div class="travelDaysdetails-textC">
                     <template v-if="item&&item.DinnerArray&&item.DinnerArray.length>1">
                       {{item.DinnerArray[1].DinnerName?item.DinnerArray[1].DinnerName:'无'}}
                     </template>
                   </div>
                 </div>
-                <div class="travelDaysdetails-text row-aic">
+                <div class="travelDaysdetails-text row">
                   <span class="travelDaysdetails-text0">晚餐：</span>
-                  <div> <template v-if="item&&item.DinnerArray&&item.DinnerArray.length>2">
+                  <div class="travelDaysdetails-textC"> <template v-if="item&&item.DinnerArray&&item.DinnerArray.length>2">
                       {{item.DinnerArray[2].DinnerName?item.DinnerArray[2].DinnerName:'无'}}
                     </template>
                   </div>
                 </div>
               </div>
               <div class="travelDaysdetails-textBox">
-                <div class="travelDaysdetails-text right0 row-aic">
+                <div class="travelDaysdetails-text right0 row">
                   <span class="travelDaysdetails-text0">住宿：</span>
-                  <template v-if="item.HotelArray">
+                  <div class="travelDaysdetails-textC" v-if="item.HotelArray">
                     <template v-if="item.HotelArray.length==1">
                       {{item.HotelArray[0].HotelName!='温馨的家'?item.HotelArray[0].HotelName+"/或同级":"温馨的家"}}
                     </template>
                     <template v-else>
                       <template v-for="(j) in item.HotelArray">{{j.HotelName}}、</template> /或同级
                     </template>
-                  </template>
+                  </div>
                 </div>
               </div>
             </div>
@@ -730,10 +733,10 @@
         </div>
       </div>
       <div class="UpgradedVersion2Line absolute z-index3 row-ajc">
-        <span>{{pageHeight>1379?'超出内容分割到下一页':'底线'}}</span>
+        <span>{{pageHeight>1345?'超出内容分割到下一页':'底线'}}</span>
       </div>
       <div class="UpgradedVersion2Line absolute z-index3 row-ajc"
-      :style="{'top': pageHeight>1379&&pageHeight<2762?pageHeight+'px':'2762px'}">
+      :style="{'top': pageHeight>1345&&pageHeight<2690?pageHeight+'px':'2690px'}">
         <span>底线</span>
       </div>
     </div>