行程下载调整样式

src/assets/css/tripIndexNew.css

 html, body{
   background: #fff;
 }
+.travelControlTrip 	.Passenger-table{width:960px; margin: 0 20px;  color: #666; background: #fff;}
+	.travelControlTrip  .Passenger-table td.thClass {height: 50px; background: #e2e2e2; font-size: 16px; font-weight: normal; padding: 0!important;}
+	.travelControlTrip  .Passenger-table td.thClass  img{margin-right:5px; margin-top: 2px;}
+	.travelControlTrip  .Passenger-table tr td{background: #f7f7f7; text-align: center; font-size: 14px; padding: 15px 10px; }
 .LeaveGroupDownload-form dl,
 .LeaveGroupDownload-form dt, .LeaveGroupDownload-form dd,
 .LeaveGroupDownload-form ul, .LeaveGroupDownload-form ol,
@@ -145,11 +149,28 @@ html, body{
     color: #000;
     font-weight: 700;
 }
-
+.UpgradedVersion2Line{
+  height: 0px;
+  border-bottom: 2px dashed red;
+  left: 0;
+  top: 1450px;
+  right: 0;
+}
+.UpgradedVersion2Line span{
+  background: #fff;
+  font-size: 20px;
+  padding: 5px 20px;
+  border: 2px dashed red;
+  border-radius: 15px;
+  -webkit-border-radius: 15px;
+  -moz-border-radius: 15px;
+  -ms-border-radius: 15px;
+  -o-border-radius: 15px;
+}
 .detail-box .hangban-info {
     width: 100%;
     background: unset;
-    paddong: 0px;
+    padding: 0px;
 }
 
 .detail-box .hangban-info {
@@ -170,8 +191,9 @@ html, body{
     border-collapse: collapse !important;
 }
 
-.travelControlTrip * {
-    page-break-inside: avoid;
+.travelControlTrip{
+    /* page-break-inside: avoid; */
+
 }
 
 .baseTable .essential-item.jianju {
@@ -301,8 +323,8 @@ html, body{
 .travelDaysMasterMap {
     margin-top: 14px;
     margin-bottom: 41px;
-    /*height: 632px;*/
-    flex:1;
+    height: 632px;
+    /* flex:1; */
     overflow: hidden;
 }
 
@@ -343,9 +365,9 @@ html, body{
 }
 
 .travelDaysMasterMap-twoImg {
-    max-width: 335px;
-    /* max-height: 189px; */
-    height: 44.5%;
+    width: 335px;
+    height: 189px;
+    /* height: 44.5%; */
     overflow: hidden;
     border: 2px solid #FFFFFF;
     border-radius: 18px;
@@ -356,11 +378,14 @@ html, body{
     font-family: PingFang SC;
     font-weight: 500;
     line-height: 34px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
 }
 
 .travelDaysContent {
-     min-height: 360px;
-     max-height:600px;
+     /* min-height: 360px;
+     max-height:600px; */
      overflow:hidden;
     line-height: 38px;
     padding: 0 36px;
@@ -373,7 +398,7 @@ html, body{
     color: #2A2A2A;
 }
 
-    .travelDaysContent-text span {
+  .textBold {
         font-size: 21px;
         line-height: 38px;
         font-weight: bold;
@@ -384,11 +409,22 @@ html, body{
     right: 0;
     bottom: 115px;
     margin: 44px 36px;
+    padding: 0 0 115px 0;
+}
+.travelDaysdetails-tsTextBox{
+  padding: 0 36px;
+  margin-top: 20px;
+}
+.travelDaysdetails-tsText{
+  padding: 15px;
+  border-radius: 14px;
+  -webkit-border-radius: 14px;
+  -moz-border-radius: 14px;
+  -ms-border-radius: 14px;
+  -o-border-radius: 14px;
 }
-
 .travelDaysdetailsBJ {
     border-radius: 100px;
-    flex-wrap: nowrap;
     padding: 20px 35px;
     -webkit-border-radius: 100px;
     -moz-border-radius: 100px;
@@ -396,20 +432,12 @@ html, body{
     -o-border-radius: 100px;
 }
 .travelDaysdetails-textBox{
-  flex: 1;
-}
-.travelDaysdetails-textBox:last-child .travelDaysdetails-text{
-  height: 105px;
-  word-break: break-all;
-  text-overflow: ellipsis;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 3;
-  overflow: hidden;
+  flex-wrap: wrap;
 }
 .travelDaysdetails-text {
     flex-wrap: wrap;
-    margin-right: 46px;
+    margin-right: 10px;
+    flex: 1;
 }
 
     .travelDaysdetails-text0 {
@@ -419,19 +447,26 @@ html, body{
         line-height: 34px;
         flex-shrink: 0;
     }
+    .travelDaysdetails-text div span{
+      width: 100%;
+      white-space: wrap;
+      overflow: hidden;
+    }
 
-    .travelDaysdetails-text {
-        font-size: 16px;
+    .travelDaysdetails-tsText,.travelDaysdetails-text {
+        font-size: 21px;
         font-weight: 100;
         color: #2A2A2A;
         line-height: 34px;
         white-space: wrap;
         display: inline-block;
-        padding: 0;
-        margin: 0;
     }
+    .travelDaysdetails-text {
+      padding: 0;
+      margin: 0;
+  }
     .travelDaysdetails-text1{
-      font-size: 16px !important;
+      /* font-size: 16px !important; */
       font-weight: 100 !important;
       color: #2A2A2A;
     }
@@ -527,21 +562,23 @@ html, body{
     font-family: FZCuSong-B09S !important;
     color: #2A2A2A;
 }
-
-.UpgradedVersion-box {
+.UpgradedVersion-box{
+  width: 1123px;
+  min-height: 1450px;
+  margin: auto;
+}
+.UpgradedVersion-box2 {
     width: 1123px;
-    height: 1478px;
-    overflow: hidden;
+    min-height: 1478px;
+    height: 100%;
 }
 
 .UpgradedVersion-homebj {
-    background: url('https://imgfile.oytour.com/Static/NewTripFeature/otherBjTwo.png')no-repeat center;
-    background-size: 100% 100%;
+  background: url('../img/trip/otherBjThree.jpg') repeat;
 }
 
 .UpgradedVersion-introduceBj {
-    background: url('https://imgfile.oytour.com/Static/NewTripFeature/otherBjTwo.png')no-repeat center;
-    background-size: 100% 100%;
+
 }
 
 .UpgradedVersion-otherBj {

src/components/LeaveGroupDownload/travelDays.vue

@@ -40,7 +40,7 @@
             </div>
             <div class="travelDaysMasterMap-text absolute z-index2">{{item.details[0].title}}</div>
           </div>
-          <div class="travelDaysMasterMap-two absolute z-index2">
+          <div class="travelDaysMasterMap-two absolute z-index2" style="display: none;">
             <div class="travelDaysMasterMap-twoImg relative bjF6" :style="{'color':'#fff'}"
               :id="'travelDaysImg_two'+index"
               v-if="(item.details&&item.details.length>1&&item.details[1].img)||(item.jiu2&&item.jiu2.length>0&&item.jiu2[0].url)">
@@ -90,42 +90,41 @@
             <span>暂无描述</span>
           </div>
         </div>
-
+        <template v-for="(t,i) in item.tips">
+          <div class="travelDaysdetails-tsTextBox">
+            <div class="travelDaysdetails-tsText row"
+            :style="{'background':backgroundColor2}">
+              <span class="travelDaysdetails-text0">温馨提示：</span>
+                <template v-if="t.content&&getHtmlPlainText(t.content).length>0">
+                  {{getHtmlPlainText(t.content)}}
+                </template>
+                <template v-else>暂无提示</template>
+            </div>
+          </div>
+        </template>
         <div class="travelDaysdetails">
-          <div class="travelDaysdetailsBJ row" :style="{'background':backgroundColor}">
-            <div class="travelDaysdetails-textBox column">
-              <div class="travelDaysdetails-text">
-                <span class="travelDaysdetails-text0">早餐：</span>
-                {{item.can.breakfirst}}
-              </div>
-              <div class="travelDaysdetails-text">
-                <span class="travelDaysdetails-text0">午餐：</span>
-                {{item.can.lanuch}}
-              </div>
-              <div class="travelDaysdetails-text">
-                <span class="travelDaysdetails-text0">晚餐：</span>
-                {{item.can.dinner}}
-              </div>
+          <div class="travelDaysdetailsBJ column"
+          :style="{'background':backgroundColor}">
+          <div class="travelDaysdetails-textBox row-sb">
+            <div class="travelDaysdetails-text">
+              <span class="travelDaysdetails-text0">早餐：</span>
+              {{item.can.breakfirst?item.can.breakfirst:'无'}}
             </div>
-            <div class="travelDaysdetails-textBox">
-              <div class="travelDaysdetails-text">
-                <span class="travelDaysdetails-text0">住宿：</span>
-                <template v-for="(j,i) in item.jiu2">{{j.name}} </template> 或同级
-              </div>
+            <div class="travelDaysdetails-text">
+              <span class="travelDaysdetails-text0">午餐：</span>
+              {{item.can.lanuch?item.can.lanuch:'无'}}
             </div>
-            <template v-for="(t,i) in item.tips">
-              <div class="travelDaysdetails-textBox"
-                :style="{'flex-grow':t.content&&getHtmlPlainText(t.content).length>20?'2':''}">
-                <div class="travelDaysdetails-text" style="margin-right: 0;">
-                  <span class="travelDaysdetails-text0">温馨提示：</span>
-                  <template v-if="getHtmlPlainText(t.content).length>0">
-                    {{getHtmlPlainText(t.content)}}
-                  </template>
-                  <!-- <div class="travelDaysdetails-text1" v-if="t.content!=''" v-html="t.content"></div> -->
-                  <p v-else>暂无提示</p>
-                </div>
-              </div>
-            </template>
+            <div class="travelDaysdetails-text">
+              <span class="travelDaysdetails-text0">晚餐：</span>
+              {{item.can.dinner?item.can.dinner:'无'}}
+            </div>
+          </div>
+          <div class="travelDaysdetails-textBox">
+            <div class="travelDaysdetails-text">
+              <span class="travelDaysdetails-text0">住宿：</span>
+              <template v-for="(j,i) in item.jiu2">{{j.name}} </template> 或同级
+            </div>
+          </div>
           </div>
         </div>
         <!-- otherJourney-footer -->
@@ -160,6 +159,7 @@
         title: '北京-马德里-塞戈维亚-萨拉曼卡-贝尼多姆/小镇-瓦伦西亚-巴塞罗那（约 253km，约 3h）北京-马德里-塞戈维亚-萨拉曼卡-贝尼多姆/小镇-瓦伦西亚-巴塞罗那（约 253km，约 3h）',
         day: 'DAY',
         backgroundColor: '',
+        backgroundColor2: '',
         textColor: '',
         textColorOne: '',
       };
@@ -261,6 +261,7 @@
 
           if (val && val.tripColor) {
             this.backgroundColor = this.hexToRgb(val.tripColor, 0.2)
+            this.backgroundColor2 = this.hexToRgb(val.tripColor, 0.1)
             let rgba = this.hexToRgb(val.tripColor, 1)
             rgba = rgba.split(',')
             let rgba0 = rgba[0].split('(')

src/components/confirmationOrderDownLoadNew.vue

@@ -915,8 +915,6 @@
   @import url('../assets/css/tripIndex.css');
   @import url("../assets/css/tripIndexNew.css");
   @import url('../assets/css/detail.css');
-  @import url('../assets/css/UpgradedVersion.css');
-
 
 
   .edit_form_box {

src/components/newTravelmanager/TravelTripPreview/noScenic.vue

@@ -95,6 +95,8 @@ export default {
       this.UploadSelfFileT(path, newArr, x => {
         this.trafficObj.trafficIntroduce.IntroduceImage =
           this.domainManager().ViittoFileUrl + x.data.FilePath;
+        this.trafficObj.trafficIntroduce.x = 0
+        this.trafficObj.trafficIntroduce.y = 0
       });
     },
     //关闭添加弹窗
@@ -107,16 +109,21 @@ export default {
       imgArr.forEach(imgItem => {
         this.trafficObj.trafficIntroduce.IntroduceImage =
           imgItem.Path ;
+        this.trafficObj.trafficIntroduce.x = 0
+        this.trafficObj.trafficIntroduce.y = 0
       });
     }
   },
   mounted() {
-    
+
   },
   watch: {
     "trafficObj.trafficIntroduce":{
       handler: function(newValue, oldValue) {
-       this.trafficObj.Introduce = JSON.stringify(this.trafficObj.trafficIntroduce);
+        this.trafficObj.trafficIntroduce.x = 0
+        this.trafficObj.trafficIntroduce.y = 0
+        this.trafficObj.Introduce = JSON.stringify(this.trafficObj.trafficIntroduce);
+
       },
       deep: true
     }