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

src/assets/css/tripIndexNew.css

-body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, form, fieldset, input, p, blockquote, table, th, td, iframe {
+.LeaveGroupDownload-form div, .LeaveGroupDownload-form dl,
+.LeaveGroupDownload-form dt, .LeaveGroupDownload-form dd,
+.LeaveGroupDownload-form ul, .LeaveGroupDownload-form ol,
+.LeaveGroupDownload-form li, .LeaveGroupDownload-form h1,
+.LeaveGroupDownload-form h2, .LeaveGroupDownload-form h3,
+.LeaveGroupDownload-form h4, .LeaveGroupDownload-form h5,
+.LeaveGroupDownload-form h6, .LeaveGroupDownload-form pre,
+.LeaveGroupDownload-form form, .LeaveGroupDownload-form fieldset,
+.LeaveGroupDownload-form input,
+.LeaveGroupDownload-form p, .LeaveGroupDownload-form blockquote,
+.LeaveGroupDownload-form table, .LeaveGroupDownload-form th,
+.LeaveGroupDownload-form td, .LeaveGroupDownload-form iframe {
   font-family: Microsoft JhengHei, sans-serif !important;
 }
 .bjE6{
@@ -175,7 +186,7 @@ body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, form, fieldset,
 }
 .travelDaysTitlle-left-textOne{
   font-size: 79px;
-  font-family: FZCuSong-B09S;
+  font-family: FZCuSong-B09S !important;
   font-weight: 400;
   color: #2A2A2A;
   line-height: 55px;
@@ -183,7 +194,7 @@ body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, form, fieldset,
 }
 .travelDaysTitlle-left-textTwo{
   font-size: 47px;
-  font-family: PingFang SC;
+  font-family: PingFang SC !important;
   font-weight: 800;
   color: #2A2A2A;
   line-height: 55px;
@@ -253,7 +264,8 @@ body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, form, fieldset,
 .travelDaysContent{
   max-height: 468px;
   line-height: 38px;
-  padding: 41px 44px 47px 44px;
+  padding: 0 44px 0 44px;
+  margin: 41px 0 47px 0;
   overflow: hidden;
 }
 .travelDaysContent-text{

src/components/LeaveGroupDownload/ItineraryFeatures.vue

@@ -27,13 +27,13 @@
     },
     computed: {},
     watch: {
-      // FeatureData: {
-      //   handler(val, oldVal) {
+      feature: {
+        handler(val, oldVal) {
 
-      //   },
-      //   deep: true,
-      //   immediate: true
-      // },
+        },
+        deep: true,
+        immediate: true
+      },
     },
     mounted() {
 

src/components/LeaveGroupDownload/travelDays.vue

 <template>
   <div v-if="vshowD">
-    <div class="trip-box">
+    <!-- <div class="trip-box">
       <div>
         <div class="trip-block pdf_3_block" style="border: 0;">
           <div class="module-title" id="pdf_3_header" style="font-size:36px;font-weight:bolder;margin-top:20px;border-bottom:1px solid #000; text-align:center;">
@@ -8,7 +8,7 @@
           </div>
         </div>
       </div>
-    </div>
+    </div> -->
     <div class="UpgradedVersion-box UpgradedVersion-homebj relative"
     v-for="(item,index) in tripList">
       <Header :TripColor="dataAll.tripColor" :orderMsg="orderMsg"></Header>
@@ -238,26 +238,28 @@
     watch: {
       dataAll: {
         handler(val, oldVal) {
-          this.backgroundColor = this.hexToRgb(val.tripColor, 0.2)
-          let rgba = this.hexToRgb(val.tripColor, 1)
-          rgba = rgba.split(',')
-          let rgba0 = rgba[0].split('(')
-          let arr = [rgba0[1],rgba[1],rgba[2]]
-          if(this.getRgbLevel(arr)>50){
-            this.textColor = "#fff"
-          }else{
-            this.textColor = "#333"
+          if(val&&val.tripColor){
+            this.backgroundColor = this.hexToRgb(val.tripColor, 0.2)
+            let rgba = this.hexToRgb(val.tripColor, 1)
+            rgba = rgba.split(',')
+            let rgba0 = rgba[0].split('(')
+            let arr = [rgba0[1],rgba[1],rgba[2]]
+            if(this.getRgbLevel(arr)>50){
+              this.textColor = "#fff"
+            }else{
+              this.textColor = "#333"
+            }
           }
         },
         deep: true,
-        immediate: false
+        immediate: true
       },
       tripList: {
         handler(val, oldVal) {
-          console.log(val,'1111--------')
+
         },
         deep: true,
-        immediate: false
+        immediate: true
       },
     },
     mounted() {

src/components/confirmationOrderDownLoadNew.vue

@@ -76,7 +76,7 @@
         <!--&&isopOperation HK 注释 可以让销售修改基本信息-->
         <input type="button" v-if="orderId>0" class="travelControlTripBtn" value="修改信息" @click="editMsgShow=true" />
       </el-col>
-      <el-col :span="10">
+      <el-col :span="10" style="display: none;">
         <span style="font-size:14px">行程补充说明:</span>
         <el-select filterable size="small" v-model="Typevalue" placeholder="请选择">
           <el-option label="日本寻秋意赏枫季" :value="-1"></el-option>