‘行程特色@’

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

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

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: '取消',