From 6d5f5c6dc317038662f38f1926d71d69126adf30 Mon Sep 17 00:00:00 2001
From: huaguohao <810913476@qq.com>
Date: Fri, 22 Feb 2019 17:26:31 +0800
Subject: [PATCH] =?UTF-8?q?=E2=80=98=E8=A1=8C=E7=A8=8B=E7=89=B9=E8=89=B2@?=
 =?UTF-8?q?=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/feture2.css                    |   9 ++
 src/components/confirmationOrderDownLoad.vue  |   2 +
 .../TravelGroupControl/TravelFeature.vue      |  29 +++--
 .../TravelTemp/travelFeature3.vue             | 114 +++++++++++-------
 4 files changed, 105 insertions(+), 49 deletions(-)

diff --git a/src/assets/css/feture2.css b/src/assets/css/feture2.css
index 4f04fda02..03d2b1b64 100644
--- a/src/assets/css/feture2.css
+++ b/src/assets/css/feture2.css
@@ -1983,3 +1983,12 @@ div{
 .__flower_J{
   left: -135px;
 }
+.template_bg_1{
+  background-color: #f6dc61 !important
+}
+.template_bg_2{
+  background-color: pink !important
+}
+.template_bg_3{
+  background-color: skyblue !important
+}
\ No newline at end of file
diff --git a/src/components/confirmationOrderDownLoad.vue b/src/components/confirmationOrderDownLoad.vue
index 6cdb4279f..3990a85e9 100644
--- a/src/components/confirmationOrderDownLoad.vue
+++ b/src/components/confirmationOrderDownLoad.vue
@@ -942,6 +942,8 @@
           isShowVisa:this.vshowH?1:0,
           //isPc是否PC下载
           isPc: isPc,
+          //模板参数
+          templateId: this.showType,
         };
         this.GetLocalFile("DownLoadTripWord", msg,title+ ".doc", res=>{
            this.pdfLoading = false
diff --git a/src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue b/src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
index af7f123a6..87a1af29a 100644
--- a/src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
+++ b/src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
@@ -155,7 +155,7 @@
             </div> -->
             <new-feature ref='newFeature' :data='FeatureData'></new-feature>
           </div>
-          <div v-if="FeatureData.FeatureType===FeatureTypeState.travelSpecial2 && FeatureDataFlag">
+          <div v-if="(FeatureData.FeatureType===FeatureTypeState.travelSpecial2 || FeatureData.FeatureType===6 || FeatureData.FeatureType===7) && FeatureDataFlag">
             <!--<newFeature2 ref='newFeature2' :data='FeatureData'></newFeature2>-->
             <newFeature2 ref='newFeature2' :FeatureData='FeatureData'></newFeature2>
           </div>
@@ -222,7 +222,7 @@
           nineGrid: 2,
           userDefined: 3,
           travelSpecial: 4,
-          travelSpecial2: 5
+          travelSpecial2: 5,
         },
         TypeArray: [{
           ckTitle: "自定义",
@@ -249,27 +249,40 @@
             TypeState: 4
           },
           {
-            ckTitle: "行程特色2",
+            ckTitle: "行程特色-黄",
             isShow: false,
             imgUrl: Travelslider,
             TypeState: 5
-          }
+          },
+          // {
+          //   ckTitle: "行程特色-粉",
+          //   isShow: false,
+          //   imgUrl: Travelslider,
+          //   TypeState: 6
+          // },
+          // {
+          //   ckTitle: "行程特色-蓝",
+          //   isShow: false,
+          //   imgUrl: Travelslider,
+          //   TypeState: 7
+          // }
+          
         ], //tab数组
         templateColorArray:[
           {
             id: 1,
             color: 'yellow',
-            text: '黄色'
+            text: '土黄黄'
           },
           {
             id: 2,
             color: 'pink',
-            text: '粉色'
+            text: '樱桃粉'
           },
           {
             id: 3,
             color: 'blue',
-            text: '蓝色'
+            text: '水蓝蓝'
           },
         ],
         travelsList: [],
@@ -473,7 +486,7 @@
       //切换tab事件
       clickFeature(item) {
           let state = this.FeatureData.FeatureType
-          if (state === 4 && item.TypeState === 5) {
+          if ((state === 4 && item.TypeState === 5) || (state === 4 && item.TypeState === 6) || (state === 4 && item.TypeState === 7)) {
             this.$confirm('尊敬的用户，行程特色“1”切换为行程特色“2”将会清空行程特色“1”里面的所有内容，您确定切换吗？', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
diff --git a/src/components/newTravelmanager/TravelGroupControl/TravelTemp/travelFeature3.vue b/src/components/newTravelmanager/TravelGroupControl/TravelTemp/travelFeature3.vue
index d868ee7d2..a88900279 100644
--- a/src/components/newTravelmanager/TravelGroupControl/TravelTemp/travelFeature3.vue
+++ b/src/components/newTravelmanager/TravelGroupControl/TravelTemp/travelFeature3.vue
@@ -6,16 +6,16 @@
       <!-- 酒店1 -->
       <div class="travel_hotel_1" v-if="item === 0 && hotelObj.list!=null && hotelObj.list.length>0">
         <div class="hotel_1_header">
-          <img class="hotel_1_header_bg" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/top-1.jpg">
-          <img class="hotel_1_header_bg2" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/title-1.png">
+          <img class="hotel_1_header_bg" :src="`${domainManager().ViittoFileUrl}/FeatureDefault/template_top_${templateType}.jpg`">
+          <img class="hotel_1_header_bg2" :src="`${domainManager().ViittoFileUrl}/FeatureDefault/template_title1_${templateType}.jpg`">
           <div class="hotel_1_header_title">
             <div>
               <vEditDiv :canEdit='canEdit' v-model="hotelObj.title.first"></vEditDiv>
             </div>
             <div>
-              <img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-5.png">
+              <img :src="`${domainManager().ViittoFileUrl}/FeatureDefault/template_icon_5.jpg`">
               <vEditDiv :canEdit='canEdit' v-model="hotelObj.title.second"></vEditDiv>
-              <img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-4.png">
+              <img :src="`${domainManager().ViittoFileUrl}/FeatureDefault/template_icon_4.jpg`">
             </div>
           </div>
         </div>
@@ -93,13 +93,13 @@
             </div>
           </div>
           <div class="hotel_1_info_1_info">
-            <img class="__flower" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/bg1.png">
+            <img class="__flower" :src="`${domainManager().ViittoFileUrl}/FeatureDefault/template_bg_${templateType}.jpg`">
             <div class="hotel_1_info_1_info_left">
-              <img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-1.png">
-              <div></div>
+              <img :src="`${domainManager().ViittoFileUrl}/FeatureDefault/template_icon_1.jpg`">
+              <div :class="`template_bg_${templateType}`"></div>
             </div>
             <div class="hotel_1_info_1_info_right">
-              <div><vEditDiv :canEdit='canEdit' v-model="hotelObj.list[item*2].name"></vEditDiv></div>
+              <div :class="`template_bg_${templateType}`"><vEditDiv :canEdit='canEdit' v-model="hotelObj.list[item*2].name"></vEditDiv></div>
               <div class="hotel_1_info_1_info_right_Ename"><vEditDiv :canEdit='canEdit' v-model="hotelObj.list[item*2].Ename"></vEditDiv></div>
               <div><vEditDiv :canEdit='canEdit' v-model="hotelObj.list[item*2].description"></vEditDiv></div>
             </div>
@@ -206,11 +206,11 @@
               </div>
             </div>
             <div class="hotel_1_info_2_bottom_left">
-              <img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-1.png">
-              <div></div>
+              <img :src="`${domainManager().ViittoFileUrl}/FeatureDefault/template_icon_1.jpg`">
+              <div :class="`template_bg_${templateType}`"></div>
             </div>
             <div class="hotel_1_info_2_bottom_right">
-              <div><vEditDiv :canEdit='canEdit' v-model="hotelObj.list[item*2+1].name"></vEditDiv></div>
+              <div :class="`template_bg_${templateType}`"><vEditDiv :canEdit='canEdit' v-model="hotelObj.list[item*2+1].name"></vEditDiv></div>
               <div class="hotel_1_info_1_info_right_Ename"><vEditDiv :canEdit='canEdit' v-model="hotelObj.list[item*2+1].Ename"></vEditDiv></div>
               <div><vEditDiv :canEdit='canEdit' v-model="hotelObj.list[item*2+1].description"></vEditDiv></div>
             </div>
@@ -238,7 +238,7 @@
               @toDelete="bolckToDelete">
             </vToolBar>
           </div>
-          <img class="hotel_2_info_1_bg" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/top-2.jpg">
+          <img class="hotel_2_info_1_bg" :src="`${domainManager().ViittoFileUrl}/FeatureDefault/template_top2_${templateType}.jpg`">
           <div class="hotel_2_info_1_content">
             <div><vEditDiv :canEdit='canEdit' v-model="hotelObj.list[item*2].name"></vEditDiv></div>
             <div class="hotel_1_info_1_info_right_Ename"><vEditDiv :canEdit='canEdit' v-model="hotelObj.list[item*2].Ename"></vEditDiv></div>
@@ -374,7 +374,7 @@
               </div>
             </div>
             <div class="hotel_2_info_2_top_left">
-              <img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-1.png">
+              <img :src="`${domainManager().ViittoFileUrl}/FeatureDefault/template_icon_1.jpg`">
               <div></div>
             </div>
             <div class="hotel_2_info_2_top_right">
@@ -445,8 +445,8 @@
       <!-- 景点1 -->
       <div class="travel_viewSpot_1" v-if="item === 0">
         <div class="viewSpot_1_header">
-          <img class="viewSpot_1_header_bg" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/top-1.jpg">
-          <img class="viewSpot_1_header_bg2" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/title-3.jpg">
+          <img class="viewSpot_1_header_bg" :src="`${domainManager().ViittoFileUrl}/FeatureDefault/template_top_${templateType}.jpg`">
+          <img class="viewSpot_1_header_bg2" :src="`${domainManager().ViittoFileUrl}/FeatureDefault/template_title2_${templateType}.jpg`">
           <div class="viewSpot_1_header_title">
             <div>
               <div>看见</div>
@@ -454,9 +454,9 @@
               <div>之美</div>
             </div>
             <div>
-              <img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-5.png">
+              <img :src="`${domainManager().ViittoFileUrl}/FeatureDefault/template_icon_5.jpg`">
               <div>放慢旅途步伐·畅游自在假期</div>
-              <img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-4.png">
+              <img :src="`${domainManager().ViittoFileUrl}/FeatureDefault/template_icon_4.jpg`">
             </div>
           </div>
         </div>
@@ -506,13 +506,13 @@
             </div>
           </div>
           <div class="viewSpot_1_info_1_info">
-            <img class="__flower __flower_J" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/bg1.png">
+            <img class="__flower __flower_J" :src="`${domainManager().ViittoFileUrl}/FeatureDefault/template_bg_${templateType}.jpg`">
             <div class="viewSpot_1_info_1_info_left">
-              <img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-3.png">
-              <div></div>
+              <img :src="`${domainManager().ViittoFileUrl}/FeatureDefault/template_icon_3.jpg`">
+              <div :class="`template_bg_${templateType}`"></div>
             </div>
             <div class="viewSpot_1_info_1_info_right">
-              <div><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4].name"></vEditDiv></div>
+              <div :class="`template_bg_${templateType}`"><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4].name"></vEditDiv></div>
               <div><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4].description"></vEditDiv></div>
             </div>
           </div>
@@ -597,11 +597,11 @@
               </div>
             </div>
             <div class="viewSpot_1_info_2_bottom_left">
-              <img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-3.png">
-              <div></div>
+              <img :src="`${domainManager().ViittoFileUrl}/FeatureDefault/template_icon_3.jpg`">
+              <div :class="`template_bg_${templateType}`"></div>
             </div>
             <div class="viewSpot_1_info_2_bottom_right">
-              <div><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4+1].name"></vEditDiv></div>
+              <div :class="`template_bg_${templateType}`"><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4+1].name"></vEditDiv></div>
               <div class="hotel_1_info_1_info_right_Ename"><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4+1].Ename"></vEditDiv></div>
               <div><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4+1].description"></vEditDiv></div>
             </div>
@@ -631,11 +631,11 @@
           </div>
           <div class="viewSpot_2_info_1_info">
             <div class="viewSpot_2_info_1_info_left">
-              <img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-3.png">
-              <div></div>
+              <img :src="`${domainManager().ViittoFileUrl}/FeatureDefault/template_icon_3.jpg`">
+              <div :class="`template_bg_${templateType}`"></div>
             </div>
             <div class="viewSpot_2_info_1_info_right">
-              <div><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4-2].name"></vEditDiv></div>
+              <div :class="`template_bg_${templateType}`"><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4-2].name"></vEditDiv></div>
               <div><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4-2].description"></vEditDiv></div>
             </div>
           </div>
@@ -722,15 +722,15 @@
         </div>
         <div class="viewSpot_2_info_2">
           <div class="viewSpot_2_info_2_info_1" v-if="viewSpotObj.list[item*4-1]">
-            <div><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4-1].name"></vEditDiv></div>
+            <div :class="`template_bg_${templateType}`"><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4-1].name"></vEditDiv></div>
             <div><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4-1].description"></vEditDiv></div>
           </div>
           <div class="viewSpot_2_info_2_info_2" v-if="viewSpotObj.list[item*4]">
-            <div><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4].name"></vEditDiv></div>
+            <div :class="`template_bg_${templateType}`"><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4].name"></vEditDiv></div>
             <div><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4].description"></vEditDiv></div>
           </div>
           <div class="viewSpot_2_info_2_info_3" v-if="viewSpotObj.list[item*4+1]">
-            <div><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4+1].name"></vEditDiv></div>
+            <div :class="`template_bg_${templateType}`"><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4+1].name"></vEditDiv></div>
             <div><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4+1].description"></vEditDiv></div>
           </div>
           <div class="viewSpot_2_info_2_img" v-if="viewSpotObj.list[item*4-1]">
@@ -883,8 +883,8 @@
     <div class="travle_page" v-for="(item, index) in restaurantObj.pageList" :key="'restaurant'+index"  v-if="restaurantObj.list.length>0">
       <div class="travel_restaurant_1">
         <div class="restaurant_1_header"  v-if="item === 0">
-          <img class="restaurant_1_header_bg" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/top-1.jpg">
-          <img class="restaurant_1_header_bg2" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/title-3.jpg">
+          <img class="restaurant_1_header_bg" :src="`${domainManager().ViittoFileUrl}/FeatureDefault/template_top_${templateType}.jpg`">
+          <img class="restaurant_1_header_bg2" :src="`${domainManager().ViittoFileUrl}/FeatureDefault/template_title2_${templateType}.jpg`">
           <div class="restaurant_1_header_title">
             <div>
               <div>品尝</div>
@@ -892,9 +892,9 @@
               <div>之味</div>
             </div>
             <div>
-              <img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-5.png">
+              <img :src="`${domainManager().ViittoFileUrl}/FeatureDefault/template_icon_5.jpg`">
               <div>特色美味，征服你的味蕾</div>
-              <img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-4.png">
+              <img :src="`${domainManager().ViittoFileUrl}/FeatureDefault/template_icon_4.jpg`">
             </div>
           </div>
         </div>
@@ -944,13 +944,13 @@
             </div>
           </div>
           <div class="restaurant_1_info_1_info">
-            <img class="__flower __flower_J" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/bg1.png">
+            <img class="__flower __flower_J" :src="`${domainManager().ViittoFileUrl}/FeatureDefault/template_bg_${templateType}.jpg`">
             <div class="restaurant_1_info_1_info_left">
-              <img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-2.png">
-              <div></div>
+              <img :src="`${domainManager().ViittoFileUrl}/FeatureDefault/template_icon_2.jpg`">
+              <div :class="`template_bg_${templateType}`"></div>
             </div>
             <div class="restaurant_1_info_1_info_right">
-              <div><vEditDiv :canEdit='canEdit' v-model="restaurantObj.list[item*2].name"></vEditDiv></div>
+              <div :class="`template_bg_${templateType}`"><vEditDiv :canEdit='canEdit' v-model="restaurantObj.list[item*2].name"></vEditDiv></div>
               <div><vEditDiv :canEdit='canEdit' v-model="restaurantObj.list[item*2].description"></vEditDiv></div>
             </div>
           </div>
@@ -1059,11 +1059,11 @@
             </div>
             <div class="restaurant_1_info_2_right_bottom">
               <div class="restaurant_1_info_2_right_bottom_left">
-                <img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-2.png">
-                <div></div>
+                <img :src="`${domainManager().ViittoFileUrl}/FeatureDefault/template_icon_2.jpg`">
+                <div :class="`template_bg_${templateType}`"></div>
               </div>
               <div class="restaurant_1_info_2_right_bottom_right">
-                <div><vEditDiv :canEdit='canEdit' v-model="restaurantObj.list[item*2+1].name"></vEditDiv></div>
+                <div :class="`template_bg_${templateType}`"><vEditDiv :canEdit='canEdit' v-model="restaurantObj.list[item*2+1].name"></vEditDiv></div>
                 <div class="hotel_1_info_1_info_right_Ename"><vEditDiv :canEdit='canEdit' v-model="restaurantObj.list[item*2+1].Ename"></vEditDiv></div>
                 <div><vEditDiv :canEdit='canEdit' v-model="restaurantObj.list[item*2+1].description"></vEditDiv></div>
               </div>
@@ -1157,6 +1157,7 @@
         ReadOnly: false,
         jsonTravelFeature2:null,
         theFirstTime: true,
+        templateType: "1"
       }
     },
     methods: {
@@ -1873,6 +1874,19 @@
       canEditChange: function (val) {
         this.canEdit = val;
         this.$forceUpdate()
+      },
+      setTemplateType: function () {
+        switch (this.FeatureData.FeatureType) {
+          case 5: 
+            this.templateType = "1"; 
+            break;
+          case 6: 
+            this.templateType = "2"; 
+            break;
+          case 7: 
+            this.templateType = "3"; 
+            break;
+        }
       }
     },
     computed: {
@@ -1897,9 +1911,27 @@
           }
         },
         deep: true
+      },
+      "FeatureData.FeatureType":{
+        handler: function (val, oldVal) {
+          if (val !== oldVal)
+            this.setTemplateType()
+        },
+        deep: true
       }
     },
     mounted: function () {
+      switch (this.FeatureData.FeatureType) {
+        case 5: 
+          this.templateType = "1"; 
+          break;
+        case 6: 
+          this.templateType = "2"; 
+          break;
+        case 7: 
+          this.templateType = "3"; 
+          break;
+      }
       this.MsgBus.$on('saveTravel', (val)=> {
         this.ReadOnly = val;
         this.theFirstTime = true;
-- 
2.18.1