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

src/assets/css/tripIndexNew2.css

@@ -121,6 +121,42 @@ html, body{
 .flex1{
   flex: 1;
 }
+.MT5{
+  margin-top: 5px;
+}
+.MT6{
+  margin-top: 6px;
+}
+.MT21{
+  margin-top: 21px;
+}
+.ML30{
+  margin-left: 30px;
+}
+.ML32{
+  margin-left: 32px;
+}
+.MR32{
+  margin-right: 32px;
+}
+.MB32{
+  margin-bottom: 32px;
+}
+.MB35{
+  margin-bottom: 35px;
+}
+.MT18{
+  margin-top: 18px;
+}
+.MT19{
+  margin-top: 19px;
+}
+.MT20{
+  margin-top: 20px;
+}
+.ML41{
+  margin-left: 41px;
+}
 .marginL20 {
     margin-left: 20px;
 }
@@ -348,7 +384,7 @@ html, body{
     -moz-border-radius: 100px 0px 0px 100px;
     -ms-border-radius: 100px 0px 0px 100px;
     -o-border-radius: 100px 0px 0px 100px;
-    font-family: 'Microsoft JhengHei UI Ligh';
+    font-family: 'Microsoft JhengHei UI Light';
 }
 
 .travelDaysMasterMap {
@@ -432,7 +468,7 @@ html, body{
         line-height: 54px;
         font-weight: 800;
         color: #2A2A2A;
-        font-family: 'Microsoft JhengHei UI Ligh';
+        font-family: 'Microsoft JhengHei UI Light';
     }
 
 .travelDaysdetails {
@@ -447,13 +483,13 @@ html, body{
 }
 .travelDaysdetails-tsText{
   width: 100%;
-  padding: 38px 47px 28px 47px;
+  padding: 28px 47px;
   border-radius: 20px;
   -webkit-border-radius: 20px;
   -moz-border-radius: 20px;
   -ms-border-radius: 20px;
   -o-border-radius: 20px;
-  line-height: 30px;
+  line-height: 42px;
 }
 .travelDaysdetails-tsText p{
   padding: 0;
@@ -474,7 +510,7 @@ html, body{
 }
     .travelDaysdetails-text0 {
         font-size: 23px;
-        font-family: 'Microsoft JhengHei UI Ligh';
+        font-family: 'Microsoft JhengHei UI Light';
         font-weight: 800;
         color: #2A2A2A;
         flex-shrink: 0;
@@ -489,7 +525,6 @@ html, body{
       white-space: wrap;
       font-size: 21px;
       font-family: 'Microsoft JhengHei UI';
-      line-height: 22px;
     }
     .travelDaysdetails-tsText,.travelDaysdetails-text {
         font-weight: 100;
@@ -508,13 +543,16 @@ html, body{
     font-size: 23px;
     font-weight: 500;
     line-height: 38px;
-    font-family: 'Microsoft JhengHei UI Ligh';
+    font-family: 'Microsoft JhengHei UI Light';
   }
   .travelDaysdetails-text.right0{
     margin-right: 0;
   }
   .travelDaysdetails-text0-r{
-    margin-top: -16px;
+    margin-top: -8px;
+  }
+  .travelDaysdetails-text0-r>p{
+    line-height: 42px;
   }
   .travelDaysdetails-text0-r>p:first-child,
   .travelDaysdetails-text0-r>span:first-child,
@@ -714,11 +752,14 @@ html, body{
   color: #444444;
 }
 .fz18{
-  font-size: 23px;
+  font-size: 18px;
 }
 .fz21{
   font-size: 29px;
 }
+.fz23{
+  font-size: 23px;
+}
 .fz26{
   font-size: 26px;
 }
@@ -727,12 +768,15 @@ html, body{
   font-weight: bold;
 }
 .fontFamilyLigh{
-  font-family: 'Microsoft JhengHei UI Ligh';
+  font-family: 'Microsoft JhengHei UI Light';
 }
 .fontFamilyUI{
   font-family: 'Microsoft JhengHei UI';
 }
 .lineHeight25{
+  line-height: 25px;
+}
+.lineHeight42{
   line-height: 42px;
 }
 .lineHeight38{
@@ -747,6 +791,9 @@ html, body{
 .MT19{
   margin-top: 19px;
 }
+.MT25{
+  margin-top: 25px;
+}
 .MT28{
   margin-top: 28px;
 }
@@ -774,7 +821,7 @@ html, body{
 .MB31{
   margin-bottom: 31px;
 }
-.MB32{
+.MB45{
   margin-bottom: 45px;
 }
 .MB35{
@@ -813,8 +860,7 @@ html, body{
   line-height: 54px;
 }
 .travelDaysMasterMap2-box{
-  padding: 45px 32px;
-  padding-bottom: 40px;
+  padding: 50px 35px 39px 35px;
 }
 .travelDaysMasterMap2{
   height: 643px;
@@ -840,5 +886,5 @@ html, body{
 } */
 .travelDaysMasterMap5_1{
   width: 571px;
-  height: 291px;
+  height: 322px;
 }

src/assets/css/tripIndexNewHV.css

@@ -5,8 +5,11 @@
   background: none !important;
 }
 .pdfDomHV{
-  background: url('http://imgfile.oytour.com/Static/bjHV2.png') repeat #efebe1;
-  background-size: 1754px 1240px;
+  /* background: url('http://imgfile.oytour.com/Static/bjHV2.png') repeat #efebe1; */
+  background: url('../img/trip/bjHV2.png') repeat;
+}
+.pdfDomHVIndex{
+  background: url('../img/trip/bjHV3.png') repeat;
 }
 .LeaveGroupDownload-form.LeaveGroupDownload-formHV{
 
@@ -97,7 +100,7 @@
   border-radius: 50%;
   background: #D6CEC1;
   text-align: center;
-  line-height: 34px;
+  line-height: 36px;
   margin-right: 30px;
 }
 .trtravelDaysHVdetails-textC{
@@ -127,7 +130,7 @@
 .travelDaysHVdetails-textBox{
   width: 100%;
   height: 2px;
-  background:#E8E8E8;
+  background:#e1dfdf;
   margin: 14px 0;
 }
 .travelDaysHVContent-text .textBold{
@@ -147,7 +150,7 @@
   margin-bottom: 40px;
 }
 .travelDaysHVdetailsBJ{
-  background: rgba(255,255,255, 0.8);
+  background: #E7E7E7;
   padding: 16px 55px;
   border-radius: 20px;
 }
@@ -179,8 +182,8 @@
 }
 .travelDaysHVMasterMap2-box{
   height: 1050px;
-  background: url('http://imgfile.oytour.com/Static/bjHV.png')no-repeat;
-  background-size: 100% 100%;
+  /* background: url('http://imgfile.oytour.com/Static/bjHV.png')no-repeat; */
+  /* background-size: 100% 100%; */
 }
 .travelDaysHVContentOne{
   z-index: 99;
@@ -262,5 +265,6 @@ margin-left: 61px;
 }
 .UpgradedVersionHV-box2{
 width: 1754px;
-background: #fff;
+background: url('../img/trip/bjHV3.png') repeat;
+background-size: 1754px 1240px;
 }

src/components/confirmationOrderDownLoadNew.vue

@@ -54,7 +54,7 @@
     <div id="pdfNode" class="LeaveGroupDownload-form LeaveGroupDownload-formHV">
       <div id="pdfDom" :class="[dataAll&&dataAll.featurePageType==1?'pdfDomHV':'']">
         <!-- 首页 -->
-        <LeaveGroupDownload :dataAll="dataAll" :vshowJ="vshowJ" :vshowL="vshowL" :WeiXinShareImgSrc="WeiXinShareImgSrc"
+        <LeaveGroupDownload :class="[dataAll&&dataAll.featurePageType==1?'pdfDomHVIndex':'']" :dataAll="dataAll" :vshowJ="vshowJ" :vshowL="vshowL" :WeiXinShareImgSrc="WeiXinShareImgSrc"
           :orderMsg="orderMsg" :orderTripdiff="orderTripdiff" :vshowLLR="vshowLLR" :vshowB="vshowB" :lineId="lineId"
           :priceList="priceList">
         </LeaveGroupDownload>