页面修改

src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue

@@ -122,8 +122,6 @@
 </template>
 <script>
   import Travelslider from "../../../assets/img/Travelslider.png";
-  import TravelNinegrid from "../../../assets/img/TravelNinegrid.png";
-  import userDefined from "../../../assets/img/userDefined.png";
 
   import MyEdit from "../../EditTemplate.vue";
   import travelHotel1 from "./TravelTemp/TravelHotel1";

src/components/newTravelmanager/TravelGroupControl/TravelNotice.vue

@@ -211,7 +211,6 @@
       "subArray",
       "NoticeData",
       "PostConfig",
-
       "CountryID" //国家编号
     ],
     data() {
@@ -311,9 +310,9 @@
       //获取相似的行程特色列表
       GetSameFeatureList() {
         var msg = {
-          ID: this.subArray.ConfigId,
-          LineId: this.subArray.LineID,
-          LineteamId: this.subArray.LineteamId
+          ID: this.PostConfig.ID,
+          LineId: this.PostConfig.LineId,
+          LineteamId: this.PostConfig.LineteamId
         };
         this.apipost(
           "travel_get_GetTopTenSameFeatureList",
@@ -345,6 +344,9 @@
                 if (x.ShopRemark != null) {
                   this.ShopRemarkArr.push(x.ShopRemark);
                 }
+                if (x.VisaRemark && x.VisaRemark != '') {
+                  this.VisaRemarkArr.push(x.VisaRemark);
+                }
               });
             }
           },
@@ -352,15 +354,15 @@
         );
       },
       getVisaDescribe() {
-        this.apipost(
-          "dmc_get_visa_GetAllVisaDescribe", {},
-          res => {
-            if (res.data.resultCode == 1) {
-              this.VisaRemarkArr = res.data.data;
-            }
-          },
-          err => {}
-        );
+        // this.apipost(
+        //   "dmc_get_visa_GetAllVisaDescribe", {},
+        //   res => {
+        //     if (res.data.resultCode == 1) {
+        //       this.VisaRemarkArr = res.data.data;
+        //     }
+        //   },
+        //   err => {}
+        // );
       },
       //获取购物店下拉框
       getShopItemList() {

src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/UpgradedVersionDetails.vue

@@ -86,7 +86,8 @@
       'index',
       'TripColor',
       'FeatureData',
-      'canEdit'
+      'canEdit',
+       'DataArray'
     ],
     data() {
       return {

src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/MasterMapList.vue

@@ -8,7 +8,7 @@
           <FeatureControls v-if="FeatureData&&pageType!=2"  :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1"
             :isUploadImg="pageType==2?false:true" :isSelectImg="pageType==2?false:true"
             :isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)"
-            @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" :x="1019" :y="577" />
+            @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" :x="1019" :y="577" :isShowSelect="true" :DataArray="DataArray" />
         </div>
         <VueDraggableResizable v-if="FeatureData.ImgList.length==1"
           :w="1019" :h="577"
@@ -867,7 +867,8 @@
     props: [
       'index',
       'FeatureData',
-      'pageType'
+      'pageType',
+      'DataArray'
     ],
     data() {
       return {

src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/featureControls.vue

@@ -27,13 +27,20 @@
       <el-tooltip class="item" effect="dark" content="设置字体大小(默认34px)，最小值30，最大值40" placement="top" v-if="isFontSize">
         <p class="row-aic">
           <span class="fz14" style="flex-shrink: 0;margin-right: 3px;">字体大小</span>
-          <el-input-number :min="30" :max="40" v-model="FeatureData.dataObj.ShadowFontSize2" controls-position="right"></el-input-number>
-          <!-- <el-input class="ShadowFontSize" type="number" size="mini" v-model="FeatureData.dataObj.ShadowFontSize2" style="width: 80px;height: 34px;"></el-input> -->
+          <el-input-number :min="30" :max="40" v-model="FeatureData.dataObj.ShadowFontSize2" controls-position="right">
+          </el-input-number>
           <span class="cursorInitial fz14" style="flex-shrink: 0;margin-left: 5px;">
             <span class="relative" style="top: -3px;">px</span>
           </span>
         </p>
       </el-tooltip>
+      <el-tooltip class="item" effect="dark" content="切换" placement="top" v-if="isShowSelect">
+        <p class="row-aic">
+          <el-select v-model="changeIndex" @change="changeData" filterable>
+            <el-option v-for="(item,index) in DataArray" :key="index" :label="item.MainName" :value="index"></el-option>
+          </el-select>
+        </p>
+      </el-tooltip>
     </div>
     <div class="column featureControls-bottom featureControls-bottomTwo" v-else>
       <template v-if="!isImg&&!isTemplate">
@@ -42,7 +49,6 @@
             <i class="el-icon-plus"></i>
           </div>
         </el-tooltip>
-
         <el-tooltip class="item" effect="dark" content="删除页面" placement="top">
           <div @click="toDeletePages" v-if="isDeletePage">
             <i class="el-icon-delete"></i>
@@ -85,8 +91,9 @@
     components: {
 
     },
-    props: ['index', 'FeatureData', 'ControlsType','isImg', 'pagesType', 'isDeletePage',
-      'isUploadImg', 'isSelectImg', 'isAddImg', 'isDeleteImg', 'isTemplate', 'Template','x','y','isFontSize'
+    props: ['index', 'FeatureData', 'ControlsType', 'isImg', 'pagesType', 'isDeletePage',
+      'isUploadImg', 'isSelectImg', 'isAddImg', 'isDeleteImg', 'isTemplate', 'Template', 'x', 'y', 'isFontSize',
+      'DataArray', 'isShowSelect'
     ],
     data() {
       return {
@@ -103,10 +110,31 @@
             url: 'http://imgfile.oytour.com/Static/NewTripFeature/featureTemplateThree.png',
             id: 3,
           }
-        ]
+        ],
+        changeIndex: 0,
+
       };
     },
     methods: {
+      changeData() {
+        if (this.DataArray && this.DataArray.length > 0 && this.changeIndex <= this.DataArray.length - 1) {
+          var dataObj = this.DataArray[this.changeIndex];
+          console.log(" this.FeatureData.dataObj", this.FeatureData);
+          if (dataObj) {
+            if (this.FeatureData) {
+              if (this.FeatureData.dataObj) {
+                this.FeatureData.dataObj.DetailsName = dataObj.MainName;
+                this.FeatureData.dataObj.MainDesc = dataObj.MainDesc;
+                this.FeatureData.dataObj.ImgList = dataObj.ImgList;
+              } else {
+                this.FeatureData.MainName = dataObj.MainName;
+                this.FeatureData.MainDesc = dataObj.MainDesc;
+                this.FeatureData.ImgList = dataObj.ImgList;
+              }
+            }
+          }
+        }
+      },
       setTemplate(item) {
         this.TemplateType = item.id
         this.$emit('setTemplate', this.TemplateType)
@@ -156,4 +184,5 @@
 </script>
 <style>
   @import url("../../../../../assets/css/UpgradedVersion.css");
+
 </style>

src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/featureHome.vue

@@ -17,7 +17,7 @@
       <div class="featureHome-vToolBar-one absolute z-index3">
         <FeatureControls :index="index" :FeatureData="FeatureItem" :ControlsType="'row'" :isTemplate="false"
           :isUploadImg="true" :isSelectImg="true" :isAddImg="false" :isDeleteImg="false" @toUploadImg="UploadImg"
-          @toSelectImg="SelectImg" @toAddImg="AddImg" @toDeleteImg="DeleteImg" :x="697" :y="930"></FeatureControls>
+          @toSelectImg="SelectImg" @toAddImg="AddImg" @toDeleteImg="DeleteImg" :x="697" :y="930" :isShowSelect="true" :DataArray="DataArray"></FeatureControls>
         <input type="file" style="display:none" :id="'homefile_'+(FeatureItem * 2 + 1) + '_'+index" @change="uploadpic">
       </div>
       <div class="featureHome-vToolBar-two absolute z-index3">
@@ -25,7 +25,6 @@
           :isDeletePage="FeatureItem.isDeletePage" :pagesType="1" @toAddPages="toAddPages"
           @toDeletePages="toDeletePages">
         </FeatureControls>
-
       </div>
       <div class="featureHome-left-one bjF6 absolute z-index2"
         :id="'viewSpotBox_' + (FeatureItem * 4 + 1) + '_' +index">
@@ -36,9 +35,12 @@
           <img :src="FeatureItem.dataObj.ImgList[0].url" :id="'viewSpotImg_' + (FeatureItem * 4 + 1) + '_'+index" />
         </VueDraggableResizable>
       </div>
+ 
       <div class="featureHome-left-two absolute z-index1" :style="{'background':TripColor}">
+
         <vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.DetailsName"></vEditDiv>
       </div>
+
       <div class="featureHome-Markers Markers absolute z-index1" :style="{'background':TripColor}"></div>
       <div class="featureHome-left-three absolute z-index2">
         <vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.MainDesc"></vEditDiv>
@@ -46,15 +48,18 @@
     </div>
     <div class="featureHome-right">
       <div class="UpgradedVersion-Hover" style="display: none;">
-        <div class="featureHome-vToolBar-three absolute z-index3" v-if="FeatureItem.dataObj.SubShadowName||FeatureItem.dataObj.ShadowName">
+        <div class="featureHome-vToolBar-three absolute z-index3"
+          v-if="FeatureItem.dataObj.SubShadowName||FeatureItem.dataObj.ShadowName">
           <FeatureControls :index="index" :FeatureData="FeatureItem" :ControlsType="'row'" :isTemplate="false"
             :isFontSize="true"></FeatureControls>
         </div>
         <div class="featureHome-right-text featureHome-right-one absolute z-index1">
-          <vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.SubShadowName" :fontSize="FeatureItem.dataObj.ShadowFontSize"></vEditDiv>
+          <vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.SubShadowName"
+            :fontSize="FeatureItem.dataObj.ShadowFontSize"></vEditDiv>
         </div>
         <div class="featureHome-right-text featureHome-right-two absolute z-index1">
-          <vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.ShadowName" :fontSize="FeatureItem.dataObj.ShadowFontSize"></vEditDiv>
+          <vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.ShadowName"
+            :fontSize="FeatureItem.dataObj.ShadowFontSize"></vEditDiv>
         </div>
       </div>
       <div class="UpgradedVersion-Hover">
@@ -67,16 +72,19 @@
           :style="{'max-height':FeatureItem.dataObj.ShadowFontSize2>0?'1000px':'',}">
           <div>
             <div class="featureHomeBjH1 featureHomeBj1"
-            :class="[FeatureItem.dataObj.ShadowFontSize>0||FeatureItem.dataObj.ShadowFontSize2>0?'active absolute':'relative']" :style="{'background':TripColor}">&nbsp;</div>
+              :class="[FeatureItem.dataObj.ShadowFontSize>0||FeatureItem.dataObj.ShadowFontSize2>0?'active absolute':'relative']"
+              :style="{'background':TripColor}">&nbsp;</div>
             <div class="featureHomeBjW1 featureHomeBj2"
-            :class="[FeatureItem.dataObj.ShadowFontSize>0||FeatureItem.dataObj.ShadowFontSize2>0?'active absolute':'relative']" :style="{'background':TripColor}">&nbsp;</div>
+              :class="[FeatureItem.dataObj.ShadowFontSize>0||FeatureItem.dataObj.ShadowFontSize2>0?'active absolute':'relative']"
+              :style="{'background':TripColor}">&nbsp;</div>
             <div class="featureHomeBjH1 featureHomeBj3 relative"
-            :class="[FeatureItem.dataObj.ShadowFontSize>0||FeatureItem.dataObj.ShadowFontSize2>0?'active absolute':'relative']" :style="{'background':TripColor}">&nbsp;</div>
+              :class="[FeatureItem.dataObj.ShadowFontSize>0||FeatureItem.dataObj.ShadowFontSize2>0?'active absolute':'relative']"
+              :style="{'background':TripColor}">&nbsp;</div>
             <div class="featureHomeBjW1 featureHomeBj4 relative"
-            :class="[FeatureItem.dataObj.ShadowFontSize>0||FeatureItem.dataObj.ShadowFontSize2>0?'active absolute':'relative']" :style="{'background':TripColor}">&nbsp;</div>
+              :class="[FeatureItem.dataObj.ShadowFontSize>0||FeatureItem.dataObj.ShadowFontSize2>0?'active absolute':'relative']"
+              :style="{'background':TripColor}">&nbsp;</div>
           </div>
-          <div
-          :class="[FeatureItem.dataObj.ShadowFontSize>0||FeatureItem.dataObj.ShadowFontSize2>0?'row':'']"
+          <div :class="[FeatureItem.dataObj.ShadowFontSize>0||FeatureItem.dataObj.ShadowFontSize2>0?'row':'']"
             :style="{'padding':FeatureItem.dataObj.ShadowFontSize2>0?'0 17px':'',}">
             <div class="featureHome-three-text featureHome-three-textOne"
               :class="[FeatureItem.dataObj.ShadowFontSize>0||FeatureItem.dataObj.ShadowFontSize2>0?'active row-ajc':'absolute']"
@@ -103,17 +111,20 @@
           </div>
           <div>
             <div class="featureHomeBjH2 featureHomeBj5"
-            :class="[FeatureItem.dataObj.ShadowFontSize>0||FeatureItem.dataObj.ShadowFontSize2>0?'active absolute':'relative']" :style="{'background':TripColor}">&nbsp;</div>
+              :class="[FeatureItem.dataObj.ShadowFontSize>0||FeatureItem.dataObj.ShadowFontSize2>0?'active absolute':'relative']"
+              :style="{'background':TripColor}">&nbsp;</div>
             <div class="featureHomeBjW2 featureHomeBj6"
-            :class="[FeatureItem.dataObj.ShadowFontSize>0||FeatureItem.dataObj.ShadowFontSize2>0?'active absolute':'relative']" :style="{'background':TripColor}">&nbsp;</div>
+              :class="[FeatureItem.dataObj.ShadowFontSize>0||FeatureItem.dataObj.ShadowFontSize2>0?'active absolute':'relative']"
+              :style="{'background':TripColor}">&nbsp;</div>
             <div class="featureHomeBjH2 featureHomeBj7"
-            :class="[FeatureItem.dataObj.ShadowFontSize>0||FeatureItem.dataObj.ShadowFontSize2>0?'active absolute':'relative']" :style="{'background':TripColor}">&nbsp;</div>
+              :class="[FeatureItem.dataObj.ShadowFontSize>0||FeatureItem.dataObj.ShadowFontSize2>0?'active absolute':'relative']"
+              :style="{'background':TripColor}">&nbsp;</div>
             <div class="featureHomeBjW2 featureHomeBj8"
-            :class="[FeatureItem.dataObj.ShadowFontSize>0||FeatureItem.dataObj.ShadowFontSize2>0?'active absolute':'relative']" :style="{'background':TripColor}">&nbsp;</div>
+              :class="[FeatureItem.dataObj.ShadowFontSize>0||FeatureItem.dataObj.ShadowFontSize2>0?'active absolute':'relative']"
+              :style="{'background':TripColor}">&nbsp;</div>
           </div>
         </div>
       </div>
-
     </div>
     <el-dialog custom-class="resourceImgAdd" :title="$t('sm.chooseImg')" center :visible.sync="isShowScenicImg">
       <!--imgType:1-酒店,2-餐厅,3-景点,4-票务,5-车辆,6-领队,7-购物店,isCheckmore:是否多选图片-->
@@ -141,6 +152,7 @@
       'index',
       'FeatureItem',
       'canEdit',
+      'DataArray'
     ],
     data() {
       return {
@@ -154,7 +166,7 @@
         },
         borderBox: '',
         currentIndex: null,
-        imgIndex: null
+        imgIndex: null,
       };
     },
     methods: {
@@ -261,7 +273,9 @@
 
 <style>
   @import url("../../../../assets/css/UpgradedVersion.css");
-/deep/.featureHome-vToolBar-three .el-input .el-input__inner{
+
+  /deep/.featureHome-vToolBar-three .el-input .el-input__inner {
     height: 28px;
-}
+  }
+
 </style>

src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/index.vue

@@ -7,17 +7,17 @@
       <Header :TripColor="TripColor" :canEdit="canEdit" :FeatureItem="item"></Header>
       <!-- 首页 -->
       <featureHome v-if="item.pageType==1" :canEdit="canEdit" :index="index" :FeatureItem="item" :TripColor="TripColor"
-        @UploadImg="UploadImg" @toAddPages="AddPages" @toDeletePages="DeletePages"></featureHome>
+        @UploadImg="UploadImg" @toAddPages="AddPages" @toDeletePages="DeletePages" :DataArray="DataArray"></featureHome>
       <!-- 其余页 -->
       <div v-else>
         <headerTitle :FeatureItem="item" :TripColor="TripColor" :canEdit="canEdit"></headerTitle>
         <!-- 介绍、宿食景页 -->
         <otherJourney :index="index" :FeatureItem="item" :canEdit="canEdit" :TripColor="TripColor"
-          @toAddPages="AddPages" @toDeletePages="DeletePages" v-if="item.pageType!=1&&item.pageType!=3">
+          @toAddPages="AddPages" @toDeletePages="DeletePages" v-if="item.pageType!=1&&item.pageType!=3" :DataArray="DataArray">
         </otherJourney>
         <!-- 食详情页 -->
         <UpgradedVersionDetails :index="index" :canEdit="canEdit" :FeatureData="item" :TripColor="TripColor"
-          @toAddPages="AddPages" @toDeletePages="DeletePages" v-if="item.pageType==3"></UpgradedVersionDetails>
+          @toAddPages="AddPages" @toDeletePages="DeletePages" v-if="item.pageType==3" :DataArray="DataArray"></UpgradedVersionDetails>
         <!-- otherJourney-footer 食景 食详情 -->
         <div v-if="item.pageType!=1"
           :class="{'otherJourney-footer':item.pageType==5||item.pageType==6||item.pageType==3}">
@@ -119,6 +119,7 @@
         dinner3: "http://imgfile.oytour.com/Static/NewTripFeature/dinner3.jpg",
         dinner4: "https://imgfile.oytour.com/Static/NewTripFeature/dinner4.jpg",
         RenderingOk: false,
+        DataArray: [], //房、餐、景点数组
       };
     },
     methods: {
@@ -199,6 +200,11 @@
         return detailsObj;
       },
       initFeature(isReload) {
+        var tripObj = this.getTripData();
+        if (tripObj && tripObj.allArray) {
+          this.DataArray = tripObj.allArray;
+        }
+        console.log("this.DataArray", this.DataArray);
         if (this.FeatureData && this.FeatureData.FeatureHtmlJson && typeof (this.FeatureData.FeatureHtmlJson) ==
           Array) {
           this.FeatureData.FeatureHtmlJson.forEach(x => {
@@ -221,7 +227,7 @@
           this.RenderingOk = true;
 
         } else {
-          var tripObj = this.getTripData();
+
           this.pageList.forEach(pItem => {
             var newObj = this.getDetailsObj();
             newObj.LineName = this.FeatureData.LineName;
@@ -601,6 +607,7 @@
         var scenicArray = [];
         var hotelArray = [];
         var dinnerArray = [];
+        var allArray = [];
         if (this.FeatureData && this.FeatureData.DayList && this.FeatureData.DayList.length > 0) {
           this.FeatureData.DayList.forEach(dItem => {
             //城市
@@ -637,7 +644,8 @@
                 }
                 var temoScenic = scenicArray.find(x => x.MainName == sObj.MainName)
                 if (!temoScenic) {
-                  scenicArray.push(sObj)
+                  scenicArray.push(sObj);
+                  allArray.push(sObj);
                 }
               });
             }
@@ -665,6 +673,7 @@
                   var tempHotel = hotelArray.find(x => x.MainName == hObj.MainName)
                   if (!tempHotel) {
                     hotelArray.push(hObj);
+                    allArray.push(hObj);
                   }
                 }
               });
@@ -694,7 +703,8 @@
                   };
                   var tempDinner = dinnerArray.find(x => x.MainName == dObj.MainName)
                   if (!tempDinner) {
-                    dinnerArray.push(dObj)
+                    dinnerArray.push(dObj);
+                    allArray.push(dObj);
                   }
                 }
               });
@@ -722,6 +732,7 @@
           hotelArray,
           scenicArray,
           dinnerArray,
+          allArray,
         }
       },
       //设置编辑状态

src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/otherJourney.vue

@@ -23,7 +23,7 @@
     <!-- 上传主图文件 -->
     <input type="file" style="display:none" :id="'MasterMapfile_'+(FeatureItem * 2 + 1)+'_'+index" @change="uploadpic">
     <MasterMapList :index="index" :FeatureData="FeatureItem.dataObj" :pageType="FeatureItem.pageType"
-      @toUploadImg="UploadImg" @toSelectImg="SelectImg" @toAddImg="AddImg" @toDeleteImg="DeleteImg"></MasterMapList>
+      @toUploadImg="UploadImg" @toSelectImg="SelectImg" @toAddImg="AddImg" @toDeleteImg="DeleteImg" :DataArray="DataArray" ></MasterMapList>
     <!-- 副标题 -->
 
     <subheading :Template="FeatureItem.pageTemplate" :index="index" :FeatureData="FeatureItem" :TripColor="TripColor"
@@ -63,7 +63,8 @@
       'TripColor',
       'index',
       'FeatureItem',
-      'canEdit'
+      'canEdit',
+      'DataArray'
     ],
     data() {
       return {