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

src/assets/css/tripIndexNew.css

@@ -191,7 +191,9 @@
   margin-left: 21px;
 }
 .travelDaysTitlle-right-text{
-  padding: 25px 25px 25px 36px;
+  min-height: 124px;
+  /* padding: 25px 25px 25px 36px; */
+  padding: 0 25px 0 36px;
   border-radius: 100px 0px 0px 100px;
   -webkit-border-radius: 100px 0px 0px 100px;
   -moz-border-radius: 100px 0px 0px 100px;
@@ -204,6 +206,9 @@
   overflow: hidden;
 }
 .travelDaysMasterMap img{
+  left: 0;
+  top: 0;
+  right: 0;
   width: 100%;
   height: 100%;
 }
@@ -290,6 +295,19 @@
   padding: 0;
   margin: 0;
 }
+.LeaveGroupDownload-form .travelControlTrip .module-title {
+  text-align: center;
+  font-size: 18px;
+  color: #333;
+  padding-top: 30px;
+  padding-bottom: 30px;
+}
+.LeaveGroupDownload-form .expense{
+  padding: 0 20px;
+}
+.LeaveGroupDownload-form .expense .right {
+  margin-bottom: 20px;
+}
 .UpgradedVersion-box{
   width: 1123px;
   height: 1588px;

src/components/FinancialModule/invoicesManager.vue

@@ -138,6 +138,9 @@
                 <el-option :value="1" label="跟团游"></el-option>
                 <el-option :value="2" label="签证"></el-option>
                 <el-option :value="4" label="单机票"></el-option>
+                <el-option :value="5" label="车"></el-option>
+                <el-option :value="6" label="酒店"></el-option>
+                <el-option :value="7" label="门票"></el-option>
               </el-select>
             </el-form-item>
           </el-col>

src/components/LeaveGroupDownload/components/header.vue

@@ -6,7 +6,7 @@
     </div>
     <div class="UpgradedVersion-header-right">
       <div class="UpgradedVersion-header-title">
-        <span class="edit_div">{{LineShortName}}</span>
+        <span class="edit_div">{{orderMsg.lineName}}</span>
       </div>
     </div>
   </div>
@@ -18,7 +18,7 @@
     },
     props: [
       'TripColor',
-      'FeatureItem'
+      'orderMsg'
     ],
     data() {
       return {
@@ -41,7 +41,7 @@
         deep: false,
         immediate: true
       },
-      FeatureItem: {
+      orderMsg: {
         handler(val,oldVal) {
 
         },

src/components/LeaveGroupDownload/travelDays.vue

 <template>
-  <div>
+  <div v-if="vshowD">
     <div class="trip-box">
       <div>
         <div class="trip-block pdf_3_block" style="border: 0;">
@@ -9,14 +9,15 @@
         </div>
       </div>
     </div>
-    <div class="UpgradedVersion-box UpgradedVersion-homebj relative">
-      <Header :TripColor="TripColor"></Header>
+    <div class="UpgradedVersion-box UpgradedVersion-homebj relative"
+    v-for="(item,index) in tripList">
+      <Header :TripColor="dataAll.tripColor" :orderMsg="orderMsg"></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>
+                <span>{{item.dayNum>9?item.dayNum:'0'+item.dayNum}}</span>
               </div>
               <div class="travelDaysTitlle-left-textTwo">
                 <span>{{day}}</span>
@@ -24,56 +25,68 @@
             </div>
           </div>
           <div class="travelDaysTitlle-right">
-            <div class="travelDaysTitlle-right-text"
-            :style="{'background': TripColor,'font-size': getFontSize(title),'color':textColor}">
-              {{title}}
+            <div class="travelDaysTitlle-right-text row-aic"
+            :style="{'background': dataAll.tripColor,'font-size': getFontSize(item.title),'color':textColor}">
+              {{item.title}}
             </div>
           </div>
         </div>
 
-        <div class="travelDaysMasterMap relative"
-        :style="{'color':textColorOne}">
-          <div class="travelDaysMasterMap-one">
-            <div class="travelDaysMasterMap-oneImg bjF6" id="uploadImg">
-              <img src="https://imgfile.oytour.com/Static/NewTripFeature/homeBj.png">
+        <div class="travelDaysMasterMap relative">
+          <div class="travelDaysMasterMap-one" :style="{'color':getImgColor(item.details[0].img,'travelDaysImg_one'+index)}">
+            <div class="travelDaysMasterMap-oneImg bjF6" :id="'travelDaysImg_one'+index">
+              <img class="absolute" :src="item.details[0].img">
             </div>
-            <div class="travelDaysMasterMap-text absolute z-index2">塞维利亚西班牙广场</div>
+            <div class="travelDaysMasterMap-text absolute z-index2">{{item.details[0].title}}</div>
           </div>
           <div class="travelDaysMasterMap-two absolute z-index2">
-            <div class="travelDaysMasterMap-twoImg relative bjF6">
-              <img src="https://imgfile.oytour.com/Static/NewTripFeature/homeBj.png">
-              <div class="travelDaysMasterMap-text textTwo absolute z-index2">【米其林烤乳猪】</div>
+            <div class="travelDaysMasterMap-twoImg relative bjF6"
+            :style="{'color':getImgColor(item.details[0].img,'travelDaysImg_two'+index)}"
+            :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)">
+              <template v-if="item.details.length>1&&item.details[1].img">
+                <img :src="item.details[1].img">
+                <div class="travelDaysMasterMap-text textTwo absolute z-index2">
+                  【{{item.details[1].title}}】</div>
+              </template>
+
+              <template v-else>
+                <template v-for="(jiudian,j) in item.jiu2">
+                  <template v-if="jiudian.url&&j==0">
+                    <img v-if="jiudian.url" :src="jiudian.url">
+                    <div class="travelDaysMasterMap-text textTwo absolute z-index2">
+                      【{{jiudian.newTitle}}】</div>
+                  </template>
+                </template>
+              </template>
             </div>
-            <div class="travelDaysMasterMap-twoImg relative bjF6" style="margin-top: 47px;">
-              <img src="https://imgfile.oytour.com/Static/NewTripFeature/homeBj.png">
-              <div class="travelDaysMasterMap-text textTwo absolute z-index2">【米其林烤乳猪】</div>
+            <div class="travelDaysMasterMap-twoImg relative bjF6" style="margin-top: 47px;"
+            :style="{'color':getImgColor(item.details[0].img,'travelDaysImg_three'+index)}"
+            :id="'travelDaysImg_three'+index"
+            v-if="(item.details&&item.details.length>2&&item.details[2].img)||(item.jiu2&&item.jiu2.length>1&&item.jiu2[0].url)">
+            <template v-if="item.details.length>2&&item.details[2].img">
+              <img :src="item.details[2].img">
+              <div class="travelDaysMasterMap-text textTwo absolute z-index2">
+                【{{item.details[2].title}}】</div>
+            </template>
+
+            <template v-else>
+              <template v-for="(jiudian,j) in item.jiu2">
+                <template v-if="jiudian.url&&j==1">
+                  <img v-if="jiudian.url" :src="jiudian.url">
+                  <div class="travelDaysMasterMap-text textTwo absolute z-index2">
+                    【{{jiudian.name}}】</div>
+                </template>
+              </template>
+            </template>
             </div>
           </div>
         </div>
 
         <div class="travelDaysContent">
-          <div class="travelDaysContent-text">
-            <span>【塞维利亚斗牛场】</span>
-            （外观，约 20 分钟）西班牙历史最悠久的斗牛场。每年举行的“阿布利尔节”的场所
-          </div>
-          <div class="travelDaysContent-text">
-            <span>【圣十字区-旧犹太区】</span>
-            （约 30 分钟）是塞维利亚的老城区，具有典型的安达卢西亚风格
-          </div>
-          <div class="travelDaysContent-text">
-            <span>【塞维利亚王宫】</span>
-            （外观，约 20 分钟），这座欧洲最古老的皇家宫殿，在 1987 年就已经被选为世界文化遗产。
-            王宫中最大的亮点，就是由佩德罗一世建造的美轮美奂的佩德罗宫殿，在《权力的游戏》中，这里被称为“流水花园”（Water Gardens），混合了摩尔人阿拉伯式和欧洲哥特式两种建筑风格；
-          </div>
-          <div class="travelDaysContent-text">
-            <span>【西班牙广场】</span>
-            （约 20 分钟），它是摩尔复兴建筑的缩影，1929 年拉美博览会的场地之一，在广场上可以看到西班牙不同的建筑风格，包括哥特风格、摩尔风格以及银匠风格。
-          </div>
-          <div class="travelDaysContent-text">
-            <span>【特别体验】</span>
-            赠送：1、西班牙国粹-佛朗明哥舞 2、塞维利亚广场马车游（4 人一马车），感受这里历史的马
-            车，是这里最亮眼的风景线。一排排马车一字排开，历史的画面扑面而来，乘坐在马车上也将带着您一览塞维
-            利亚城市一角的风采。
+          <div class="travelDaysContent-text" v-for="(jindian,j) in item.details">
+            <span>【{{jindian.title}}】</span>
+            {{jindian.content}}
           </div>
         </div>
 
@@ -82,19 +95,19 @@
           :style="{'background':backgroundColor}">
             <div class="travelDaysdetails-text row">
               <span>早餐：</span>
-              <div><p>飞机上</p></div>
+              <div><p>{{item.can.breakfirst}}</p></div>
             </div>
             <div class="travelDaysdetails-text row">
               <span>午餐：</span>
-              <div><p>飞机上</p></div>
+              <div><p>{{item.can.lanuch}}</p></div>
             </div>
             <div class="travelDaysdetails-text row">
               <span>晚餐：</span>
-              <div><p>飞机上</p></div>
+              <div><p>{{item.can.dinner}}</p></div>
             </div>
             <div class="travelDaysdetails-text row">
               <span>住宿：</span>
-              <div><p>HOTEL EUROSTARS REY FERNANDO/HOTEL EUROSTARS BOSTON 或同级</p></div>
+              <div><p>{{item.jiu2[0].name}}</p></div>
             </div>
           </div>
         </div>
@@ -102,14 +115,14 @@
         <div>
           <div class="otherJourney-introduceFooter absolute z-index1 row-aic"
             :style="{'background':''}">
-              <div class="introduceFooterBJ introduceFooterOne" :style="{'background':TripColor}">&nbsp;</div>
-              <div class="introduceFooterBJ introduceFootertTwo" :style="{'background':TripColor}">&nbsp;</div>
+              <div class="introduceFooterBJ introduceFooterOne" :style="{'background':dataAll.tripColor}">&nbsp;</div>
+              <div class="introduceFooterBJ introduceFootertTwo" :style="{'background':dataAll.tripColor}">&nbsp;</div>
               <div class="introduceFooter-text row-aic">
                 <img src="http://imgfile.oytour.com/Static/NewTripFeature/footerLogo.png" />
-                <div class="edit_div">欧洲线</div>
+                <div class="edit_div">{{dataAll.lineShortName}}</div>
               </div>
-              <div class="introduceFooterBJ introduceFootertThree" :style="{'background':TripColor}">&nbsp;</div>
-              <div class="introduceFooterBJ introduceFootertFour" :style="{'background':TripColor}">&nbsp;</div>
+              <div class="introduceFooterBJ introduceFootertThree" :style="{'background':dataAll.tripColor}">&nbsp;</div>
+              <div class="introduceFooterBJ introduceFootertFour" :style="{'background':dataAll.tripColor}">&nbsp;</div>
           </div>
         </div>
 
@@ -125,7 +138,7 @@
     components: {
       Header
     },
-    props: ['TripColor'],
+    props: ['dataAll','tripList','orderMsg','orderTripdiff','vshowD','vshowK'],
     data() {
       return {
         title: '北京-马德里-塞戈维亚-萨拉曼卡-贝尼多姆/小镇-瓦伦西亚-巴塞罗那（约 253km，约 3h）北京-马德里-塞戈维亚-萨拉曼卡-贝尼多姆/小镇-瓦伦西亚-巴塞罗那（约 253km，约 3h）',
@@ -143,16 +156,29 @@
         }else{
           return '30px'
         }
+      },
+      getImgColor(img,id){
+        return "#fff"
+        return
+        this.canvasImgColor(img,id, (callback) => {
+          let rgb = callback
+          rgb = rgb.split(',')
+          let rgb0 = rgb[0].split('(')
+          let arrRgb = [rgb0[1],rgba[1],rgb[2]]
+          if(this.getRgbLevel(arrRgb)>50){
+            return "#333"
+          }else{
+            return "#fff"
+          }
+        })
       }
-
-
     },
     computed: {},
     watch: {
-      TripColor: {
+      dataAll: {
         handler(val, oldVal) {
-          this.backgroundColor = this.hexToRgb(val, 0.15)
-          let rgba = this.hexToRgb(val, 1)
+          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]]
@@ -162,31 +188,19 @@
             this.textColor = "#333"
           }
         },
-        deep: false,
+        deep: true,
+        immediate: true
+      },
+      tripList: {
+        handler(val, oldVal) {
+          console.log(val,'1111--------')
+        },
+        deep: true,
         immediate: true
       },
-      // FeatureData: {
-      //   handler(val, oldVal) {
-
-      //   },
-      //   deep: true,
-      //   immediate: true
-      // },
     },
     mounted() {
-      let bj = 'https://imgfile.oytour.com/Static/NewTripFeature/homeBj.png'
-      this.canvasImgColor(bj, (callback) => {
-        this.textColor = callback
-        let rgba = callback
-        rgba = rgba.split(',')
-        let rgba0 = rgba[0].split('(')
-        let arr = [rgba0[1],rgba[1],rgba[2]]
-        if(this.getRgbLevel(arr)>50){
-          this.textColorOne = "#fff"
-        }else{
-          this.textColorOne = "#333"
-        }
-      })
+
     }
   };
 

src/components/confirmationOrderDownLoadNew.vue

@@ -202,6 +202,7 @@
     <div id="pdfNode" class="LeaveGroupDownload-form">
       <div id="pdfDom" style="padding:0 20px;">
         <!-- 首页 -->
+        <!--
         <LeaveGroupDownload
         :vshowJ="vshowJ"
         :vshowL="vshowL"
@@ -210,10 +211,27 @@
         :orderTripdiff="orderTripdiff"
         :vshowLLR="vshowLLR"
         :vshowB="vshowB"
-        :lineId="lineId"></LeaveGroupDownload>
+        :lineId="lineId"></LeaveGroupDownload> -->
+
         <!-- 行程特色 -->
-        <ItineraryFeatures :feature="feature"></ItineraryFeatures>
-        <travelDays :TripColor="TripColor"></travelDays>
+        <!-- <ItineraryFeatures :feature="feature"></ItineraryFeatures> -->
+
+        <!-- 行程天数 -->
+        <!-- <travelDays
+        :dataAll="dataAll"
+        :orderMsg="orderMsg"
+        :orderTripdiff="orderTripdiff"
+        :tripList="tripList"
+        :vshowD="vshowD"
+        :vshowK="vshowK"
+        ></travelDays> -->
+
+        <!-- 团队说明 -->
+        <!-- <TourFareDescription
+        :vshowE="vshowE"
+        :vshowF="vshowF"
+        :dataList="dataList"
+        :feature="feature"></TourFareDescription> -->
       </div>
     </div>
 
@@ -230,6 +248,7 @@
   import LeaveGroupDownload from './LeaveGroupDownload/index'
   import ItineraryFeatures from './LeaveGroupDownload/ItineraryFeatures'
   import travelDays from './LeaveGroupDownload/travelDays'
+  import TourFareDescription from './LeaveGroupDownload/TourFareDescription'
   import {
     setTimeout
   } from 'timers';
@@ -245,11 +264,12 @@
       fiveday,
       LeaveGroupDownload,
       ItineraryFeatures,
-      travelDays
+      travelDays,
+      TourFareDescription
     },
     data() {
       return {
-        TripColor: '#CC0066',
+        dataAll: null,
         isShowTime: true,
         CurrentUserInfo: {}, //当前用户信息
         Typevalue: -1,
@@ -961,9 +981,12 @@
         }, res => {
           if (res.data.resultCode == 1) {
             let data = (res.data.data);
+            this.dataAll = data
             this.orderTripdiff = data.orderTripdiff;
             this.lineId = data.lineId;
             this.orderMsg = data.orderMsg;
+            console.log(this.orderTripdiff)
+            console.log(this.orderMsg,'------')
             if (this.orderTripdiff && this.orderTripdiff.flightInfoJson) {
               this.orderTripdiff.travelOrderFlightList = JSON.parse(this.orderTripdiff.flightInfoJson);
               if (this.orderMsg.outNotice == 1) {