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

src/assets/css/tripIndexNew2.css

@@ -161,7 +161,7 @@ html, body{
   height: 0px;
   border-bottom: 2px dashed red;
   left: 0;
-  top: 1345px;
+  top: 1375px;
   right: 0;
 }
 .UpgradedVersion2Line span{

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

@@ -732,10 +732,10 @@
         </div>
       </div>
       <div class="UpgradedVersion2Line absolute z-index3 row-ajc">
-        <span>{{pageHeight>1345?'超出内容分割到下一页':'底线'}}</span>
+        <span>{{pageHeight>1375?'超出内容分割到下一页':'底线'}}</span>
       </div>
-      <div class="UpgradedVersion2Line absolute z-index3 row-ajc"
-      :style="{'top': pageHeight>1345&&pageHeight<2690?pageHeight+'px':'2690px'}">
+      <div v-if="pageHeight>(1375+20)" class="UpgradedVersion2Line absolute z-index3 row-ajc"
+      :style="{'top': pageHeight>1375&&pageHeight<2750?pageHeight+'px':'2750px'}">
         <span>底线</span>
       </div>
     </div>
@@ -821,7 +821,8 @@
           }
           this.RenderingOk = true;
           setTimeout(()=>{
-            this.pageHeight = document.querySelector(`#LineOfTravel${this.item * 4}_0${this.index}`).offsetHeight
+            this.pageHeight = document.querySelector(`#LineOfTravel${this.item * 4}_0${this.index}`).offsetHeight;
+            console.log("dayTrip"+(this.index+1),this.pageHeight);
           },500)
           this.$forceUpdate()
       },