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

src/assets/css/UpgradedVersion.css

@@ -44,6 +44,12 @@
   display:flex;
   flex-direction: column;
 }
+.column-ajc{
+  display:flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
 .marginL20{
   margin-left: 20px;
 }

src/assets/css/tripIndexNew.css

@@ -85,3 +85,138 @@
   vertical-align: middle;
   background: #ffffff;
 }
+.travelDays-form{
+  top: 112px;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.travelDaysTitlle-left{
+  flex-shrink: 0;
+}
+.travelDaysTitlle-left-text{
+  width: 173px;
+  height: 173px;
+  background: url('http://192.168.10.214:8130/Upload/NewTripFeature/Shape.png')no-repeat center;
+  background-size: 100% 100%;
+}
+.travelDaysTitlle-left-textOne{
+  font-size: 79px;
+  font-family: FZCuSong-B09S;
+  font-weight: 400;
+  color: #2A2A2A;
+  line-height: 55px;
+  margin-top: 15px;
+}
+.travelDaysTitlle-left-textTwo{
+  font-size: 47px;
+  font-family: PingFang SC;
+  font-weight: 800;
+  color: #2A2A2A;
+  line-height: 55px;
+  margin-top: 10px;
+}
+.travelDaysTitlle-right{
+  flex-grow: 1;
+  margin-left: 21px;
+}
+.travelDaysTitlle-right-text{
+  padding: 25px 25px 25px 36px;
+  border-radius: 100px 0px 0px 100px;
+  -webkit-border-radius: 100px 0px 0px 100px;
+  -moz-border-radius: 100px 0px 0px 100px;
+  -ms-border-radius: 100px 0px 0px 100px;
+  -o-border-radius: 100px 0px 0px 100px;
+}
+.travelDaysMasterMap{
+  height: 632px;
+  margin-top: 14px;
+  overflow: hidden;
+}
+.travelDaysMasterMap img{
+  width: 100%;
+  height: 100%;
+}
+.travelDaysMasterMap-one{
+
+}
+.travelDaysMasterMap-oneImg{
+  width: 100%;
+}
+.travelDaysMasterMap-text{
+  left: 15px;
+  right: 15px;
+  bottom: 19px;
+  overflow: hidden;
+  font-size: 26px;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #FEFEFE;
+  line-height: 34px;
+  text-align: center;
+}
+.travelDaysMasterMap-two{
+  top: 54px;
+  right: 50px;
+}
+.travelDaysMasterMap-twoImg{
+  width: 335px;
+  height: 189px;
+  overflow: hidden;
+  background: #2A2A2A;
+  border: 2px solid #FFFFFF;
+  border-radius: 18px;
+}
+.travelDaysMasterMap-text.textTwo{
+  font-size: 26px;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #FEFEFE;
+  line-height: 34px;
+}
+.travelDaysContent{
+  line-height: 38px;
+  padding: 41px 44px 47px 44px;
+}
+.travelDaysContent-text{
+  font-size: 21px;
+  font-weight: 10;
+  color: #2A2A2A;
+}
+.travelDaysContent-text span{
+  font-size: 21px;
+  line-height: 38px;
+  font-weight: bold;
+}
+.travelDaysdetails{
+  padding: 0 36px 115px 36px;
+}
+.travelDaysdetailsBJ{
+  border-radius: 45px;
+  flex-wrap: wrap;
+  padding: 20px 35px;
+  -webkit-border-radius: 45px;
+  -moz-border-radius: 45px;
+  -ms-border-radius: 45px;
+  -o-border-radius: 45px;
+}
+.travelDaysdetails-text{
+  flex-wrap: nowrap;
+  margin-right: 46px;
+}
+.travelDaysdetails-text span{
+  font-size: 21px;
+  font-family: PingFang SC;
+  font-weight: 800;
+  color: #2A2A2A;
+  line-height: 34px;
+}
+.travelDaysdetails-text div p{
+  font-size: 21px;
+  font-weight: 100;
+  color: #2A2A2A;
+  line-height: 34px;
+  white-space: wrap;
+  padding: 0;
+  margin: 0;
+}

src/components/LeaveGroupDownload/components/VEditDiv.vue

-<template>
-  <div class="edit_div" :contenteditable="canEdit" v-html="innerText" @focus="isLocked = true" @blur="isLocked = false"
-    @input="changeText">
-  </div>
-</template>
-<script>
-  export default {
-    props: ["value", "canEdit", "textLength"],
-    data() {
-      return {
-        innerText: this.value,
-        isLocked: false
-      };
-    },
-    watch: {
-      value() {
-        if (!this.isLocked || !this.innerText) {
-          this.$el.innerText = this.value;
-        }
-      }
-    },
-    methods: {
-      changeText: function () {
-        let sel = window.getSelection();
-        let offset = sel.anchorOffset;
-        if (this.textLength&&this.$el.innerText.length > this.textLength) {
-          this.$el.innerText = this.$el.innerText.slice(0, this.textLength);
-        }
-        this.$emit("input", this.$el.innerText);
-        setTimeout(() => {
-          var range = sel.getRangeAt(0);
-          var textNode = range.startContainer;
-          range.setStart(textNode, offset);
-          sel.removeAllRanges();
-          sel.addRange(range);
-        }, 0);
-      }
-    }
-  };
-
-</script>
-
-<style>
-  .edit_div {}
-
-</style>

src/components/LeaveGroupDownload/components/header.vue

 <template>
-  <div class="UpgradedVersion-header absolute row-sb z-index1" v-if="FeatureItem">
+  <div class="UpgradedVersion-header absolute row-sb z-index1">
     <div class="UpgradedVersion-header-left relative row-aic" :style="{'background':TripColor}">
       <img class="header-leftBj absolute z-index2" :src="backgroundImgBj2" />
       <img class="header-leftImg" src="http://192.168.10.214:8130/Upload/NewTripFeature/headerLogoTwo.png" />
     </div>
-
     <div class="UpgradedVersion-header-right">
       <div class="UpgradedVersion-header-title">
-        <VEditDivLeave :canEdit='canEdit' v-model="LineShortName"></VEditDivLeave>
+        <span class="edit_div">{{LineShortName}}</span>
       </div>
     </div>
   </div>
 </template>
 <script>
-  import vEditDiv from "./VEditDiv";
   export default {
     components: {
-      vEditDiv
+
     },
     props: [
       'TripColor',

src/components/LeaveGroupDownload/travelDays.vue

 <template>
-  <div class="travelDays-form">
-  --------
+  <div>
+    <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;">
+            每日详细行程
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="UpgradedVersion-box UpgradedVersion-homebj relative">
+      <Header :TripColor="TripColor"></Header>
+      <div class="travelDays-form absolute column z-index1">
+        <div class="travelDaysTitlle row-aic">
+          <div class="travelDaysTitlle-left">
+            <div class="travelDaysTitlle-left-text column-ajc">
+              <div class="travelDaysTitlle-left-textOne">
+                <span>02</span>
+              </div>
+              <div class="travelDaysTitlle-left-textTwo">
+                <span>{{day}}</span>
+              </div>
+            </div>
+          </div>
+          <div class="travelDaysTitlle-right">
+            <div class="travelDaysTitlle-right-text"
+            :style="{'background': TripColor,'font-size':'30px'}">
+              北京-马德里-塞戈维亚-萨拉曼卡-贝尼多姆/小镇-瓦伦西亚-巴
+              塞罗那（约 253km，约 3h）
+            </div>
+          </div>
+        </div>
+
+        <div class="travelDaysMasterMap relative">
+          <div class="travelDaysMasterMap-one">
+            <div class="travelDaysMasterMap-oneImg">
+              <img src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png">
+            </div>
+            <div class="travelDaysMasterMap-text absolute z-index2">塞维利亚西班牙广场</div>
+          </div>
+          <div class="travelDaysMasterMap-two absolute z-index2">
+            <div class="travelDaysMasterMap-twoImg relative">
+              <img src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png">
+              <div class="travelDaysMasterMap-text textTwo absolute z-index2">【米其林烤乳猪】</div>
+            </div>
+            <div class="travelDaysMasterMap-twoImg relative" style="margin-top: 47px;">
+              <img src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png">
+              <div class="travelDaysMasterMap-text textTwo absolute z-index2">【米其林烤乳猪】</div>
+            </div>
+          </div>
+        </div>
+
+        <div class="travelDaysContent">
+          <div class="travelDaysContent-text">
+            <span>【塞维利亚斗牛场】</span>
+            （外观，约 20 分钟）西班牙历史最悠久的斗牛场。每年举行的“阿布利尔节”的场所
+          </div>
+        </div>
+
+        <div class="travelDaysdetails">
+          <div class="travelDaysdetailsBJ row"
+          :style="{'background':backgroundColor}">
+            <div class="travelDaysdetails-text row">
+              <span>早餐：</span>
+              <div><p>飞机上</p></div>
+            </div>
+            <div class="travelDaysdetails-text row">
+              <span>午餐：</span>
+              <div><p>飞机上</p></div>
+            </div>
+            <div class="travelDaysdetails-text row">
+              <span>晚餐：</span>
+              <div><p>飞机上</p></div>
+            </div>
+            <div class="travelDaysdetails-text row">
+              <span>住宿：</span>
+              <div><p>HOTEL EUROSTARS REY FERNANDO/HOTEL EUROSTARS BOSTON 或同级</p></div>
+            </div>
+          </div>
+        </div>
+
+      </div>
+    </div>
   </div>
+
 </template>
 
 <script>
@@ -10,12 +92,11 @@
     components: {
       Header
     },
-    props: [
-
-    ],
+    props: ['TripColor'],
     data() {
       return {
-
+        day: 'DAY',
+        backgroundColor: ''
       };
     },
 
@@ -105,6 +186,13 @@
     },
     computed: {},
     watch: {
+      TripColor: {
+        handler(val, oldVal) {
+          this.backgroundColor = this.hexToRgb(val, 0.15)
+        },
+        deep: false,
+        immediate: true
+      },
       // FeatureData: {
       //   handler(val, oldVal) {
 
@@ -121,13 +209,7 @@
 </script>
 
 <style>
-.travelDays-box{
-  position: absolute;
-  left: 0;
-  top: 112px;
-  right: 0;
-  bottom: 115px;
-  border: 1px solid #ddd;
-}
+@import url("../../assets/css/UpgradedVersion.css");
+
 
 </style>

src/components/TravelManager/TravelGroupControl/TravelNotice.vue

@@ -20,7 +20,7 @@
                  v-bind:toolbarShow="toolbar" v-bind:referenceList="FeeNonIncludeArr"></my-edit>
 
         <div class="TNtitle NotContain">
-          自费安排
+          自费安排==
         </div>
         <table class="TFTable TNtable">
           <thead>

src/components/confirmationOrderDownLoadNew.vue

@@ -198,9 +198,11 @@
         <button class="normalBtn" type="primary" @click="backForm()">还原</button> &nbsp;
       </div>
     </el-dialog>
-    <!-- 首页 -->
+
     <div id="pdfNode" class="LeaveGroupDownload-form">
       <div id="pdfDom" style="padding:0 20px;">
+        <!-- 首页 -->
+        <!--
         <LeaveGroupDownload
         :vshowJ="vshowJ"
         :vshowL="vshowL"
@@ -209,9 +211,10 @@
         :orderTripdiff="orderTripdiff"
         :vshowLLR="vshowLLR"
         :vshowB="vshowB"
-        :lineId="lineId"></LeaveGroupDownload>
-        <ItineraryFeatures :feature="feature"></ItineraryFeatures>
-        <travelDays></travelDays>
+        :lineId="lineId"></LeaveGroupDownload> -->
+        <!-- 行程特色 -->
+        <!-- <ItineraryFeatures :feature="feature"></ItineraryFeatures> -->
+        <travelDays :TripColor="TripColor"></travelDays>
       </div>
     </div>
 
@@ -247,6 +250,7 @@
     },
     data() {
       return {
+        TripColor: '#CC0066',
         isShowTime: true,
         CurrentUserInfo: {}, //当前用户信息
         Typevalue: -1,