行程特色新增上移、下移

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

@@ -5,11 +5,11 @@
         <div class="UpgradedVersionDetails-formBox1 absolute">
           <FeatureControls :index="index" :FeatureData="FeatureData" :ControlsType="'column'"
             :isDeletePage="FeatureData.isDeletePage" :pagesType="3" @toAddPages="toAddPages"
-            @toDeletePages="toDeletePages">
+            @toDeletePages="toDeletePages" @toMovePages="toMovePages">
           </FeatureControls>
         </div>
       </div>
-   
+
       <div class="UpgradedVersionDetails-box column" v-for="(item,i) in FeatureData.dataObj.SubList">
         <div class="UpgradedVersionDetails-imgbox row-aic UpgradedVersion-Hover">
           <div class="UpgradedVersionDetails-img relative">
@@ -87,7 +87,7 @@
       'TripColor',
       'FeatureData',
       'canEdit',
-       'DataArray'
+      'DataArray'
     ],
     data() {
       return {
@@ -219,6 +219,9 @@
       toDeletePages() {
         this.$emit('toDeletePages', this.index)
       },
+      toMovePages(opType) {
+        this.$emit('toMovePages', opType, this.index);
+      },
       closeDMCchooseImg() {
         this.isShowScenicImg = false
       },

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

@@ -44,6 +44,11 @@
     </div>
     <div class="column featureControls-bottom featureControls-bottomTwo" v-else>
       <template v-if="!isImg&&!isTemplate">
+        <el-tooltip class="item" effect="dark" content="上移" placement="top">
+          <div @click="movePages(1)" v-if="isDeletePage">
+            <i class="iconfont icon-shangyi"></i>
+          </div>
+        </el-tooltip>
         <el-tooltip class="item" effect="dark" content="添加页面" placement="top">
           <div @click="toAddPages">
             <i class="el-icon-plus"></i>
@@ -54,6 +59,11 @@
             <i class="el-icon-delete"></i>
           </div>
         </el-tooltip>
+        <el-tooltip class="item" effect="dark" content="下移" placement="top">
+          <div @click="movePages(2)" v-if="isDeletePage">
+            <i class="iconfont icon-xiayi1"></i>
+          </div>
+        </el-tooltip>
       </template>
       <template v-else>
         <el-tooltip class="item" effect="dark" content="上传图" placement="top">
@@ -71,7 +81,8 @@
         <el-tooltip class="item" effect="dark" content="选模版" placement="top">
           <el-popover trigger="hover" placement="right">
             <div class="featureControls-Template">
-              <div class="Template-img relative" v-for="(item,index) in TemplateList" @click="setTemplate(item)">
+              <div class="Template-img relative" v-for="(item,index) in TemplateList" @click="setTemplate(item)"
+                :key="index">
                 <img :src="item.url" />
                 <div v-if="item.id==TemplateType" class="Template-imgSelect absolute row-ajc el-icon-success"></div>
               </div>
@@ -88,9 +99,7 @@
 
 <script>
   export default {
-    components: 
-    {
-    },
+    components: {},
     props: ['index', 'FeatureData', 'ControlsType', 'isImg', 'pagesType', 'isDeletePage',
       'isUploadImg', 'isSelectImg', 'isAddImg', 'isDeleteImg', 'isTemplate', 'Template', 'x', 'y', 'isFontSize',
       'DataArray', 'isShowSelect'
@@ -161,6 +170,10 @@
       toDeletePages() {
         this.$emit('toDeletePages')
       },
+      //上移、下移
+      movePages(opType) {
+        this.$emit('toMovePages', opType);
+      }
     },
     computed: {},
     watch: {

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

@@ -17,13 +17,14 @@
       <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" :isShowSelect="true" :DataArray="DataArray"></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">
         <FeatureControls :index="index" :FeatureData="FeatureItem" :ControlsType="'column'"
           :isDeletePage="FeatureItem.isDeletePage" :pagesType="1" @toAddPages="toAddPages"
-          @toDeletePages="toDeletePages">
+          @toDeletePages="toDeletePages" @toMovePages="toMovePages">
         </FeatureControls>
       </div>
       <div class="featureHome-left-one bjF6 absolute z-index2"
@@ -35,7 +36,7 @@
           <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>
@@ -244,6 +245,9 @@
       toDeletePages() {
         this.$emit('toDeletePages', this.index)
       },
+      toMovePages(opType) {
+        this.$emit('toMovePages', opType, this.index);
+      },
       closeDMCchooseImg() {
         this.isShowScenicImg = false;
       },

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

@@ -7,17 +7,20 @@
       <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" :DataArray="DataArray"></featureHome>
+        @UploadImg="UploadImg" @toAddPages="AddPages" @toDeletePages="DeletePages" @toMovePages="MovePages"
+        :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" :DataArray="DataArray">
+          @toAddPages="AddPages" @toDeletePages="DeletePages" @toMovePages="MovePages"
+          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" :DataArray="DataArray"></UpgradedVersionDetails>
+          @toAddPages="AddPages" @toDeletePages="DeletePages" @toMovePages="MovePages" 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}">
@@ -180,6 +183,27 @@
         pageData.dataObj = newObj;
         this.pageList.splice(index, 0, pageData);
       },
+      //上移、下移
+      MovePages(opType, index) {
+        var currentItem = this.pageList[index];
+        //上移
+        if (opType == 1) {
+          if (index > 0) {
+            var upItem = this.pageList[index - 1];
+            this.$set(this.pageList, index - 1, currentItem);
+            this.$set(this.pageList, index, upItem);
+          }
+        }
+        //下移
+        else {
+          if (index != this.pageList.length - 1) {
+            var downItem = this.pageList[index + 1];
+            this.$set(this.pageList, index + 1, currentItem);
+            this.$set(this.pageList, index, downItem);
+          }
+        }
+
+      },
       //删除页面
       DeletePages(index) {
         this.pageList.splice(index, 1);

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

@@ -8,14 +8,16 @@
       &&FeatureItem.dataObj.ImgList.length!=9)||FeatureItem.pageType==2">
         <FeatureControls :index="index" :FeatureData="FeatureItem" :ControlsType="'row'"
           :isUploadImg="FeatureItem.pageType==2?true:false" :isSelectImg="FeatureItem.pageType==2?true:false" :isAddImg="FeatureItem.pageType==2?false:
-          FeatureItem.pageType!=2?true:false" :isDeleteImg="false" @toUploadImg="UploadImg"
-          @toSelectImg="SelectImg" @toAddImg="AddImg" @toDeleteImg="DeleteImg" :x="FeatureItem.pageType==2?1019:''" :y="FeatureItem.pageType==2?577:''"></FeatureControls>
-        <input type="file" style="display:none" :id="'introducefile_'+(FeatureItem * 2 + 1) + '_'+index" @change="uploadpic">
+          FeatureItem.pageType!=2?true:false" :isDeleteImg="false" @toUploadImg="UploadImg" @toSelectImg="SelectImg"
+          @toAddImg="AddImg" @toDeleteImg="DeleteImg" :x="FeatureItem.pageType==2?1019:''"
+          :y="FeatureItem.pageType==2?577:''"></FeatureControls>
+        <input type="file" style="display:none" :id="'introducefile_'+(FeatureItem * 2 + 1) + '_'+index"
+          @change="uploadpic">
       </div>
       <div class="MasterMapList-box-two absolute z-index3">
         <FeatureControls :index="index" :FeatureData="FeatureItem" :ControlsType="'column'"
           :isDeletePage="FeatureItem.isDeletePage" :pagesType="1" @toAddPages="toAddPages"
-          @toDeletePages="toDeletePages">
+          @toDeletePages="toDeletePages" @toMovePages="toMovePages">
         </FeatureControls>
 
       </div>
@@ -23,7 +25,8 @@
     <!-- 上传主图文件 -->
     <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" :DataArray="DataArray" ></MasterMapList>
+      @toUploadImg="UploadImg" @toSelectImg="SelectImg" @toAddImg="AddImg" @toDeleteImg="DeleteImg"
+      :DataArray="DataArray"></MasterMapList>
     <!-- 副标题 -->
 
     <subheading :Template="FeatureItem.pageTemplate" :index="index" :FeatureData="FeatureItem" :TripColor="TripColor"
@@ -74,7 +77,7 @@
           queryName: '',
           queryId: 0,
         },
-        msg:{
+        msg: {
           pageSize: 50,
           pageIndex: 1,
           currentPage: 1,
@@ -113,7 +116,7 @@
             newArr.push(blob);
             var fileName = `${that.uuid(10, 10)}.png`;
             var path = `/newFeature`;
-            that.uploadSelfBlob(path, newArr,'', x => {
+            that.uploadSelfBlob(path, newArr, '', x => {
               let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath;
               let i = e.target.id.split("_")[2];
               if (that.StencilDrawing) {
@@ -140,14 +143,15 @@
       },
       AddImg() {
         let obj = {
-          url: this.FeatureItem.pageType==4?this.homeBg3:this.FeatureItem.pageType==5?this.dinner2:this.homeBg1,
+          url: this.FeatureItem.pageType == 4 ? this.homeBg3 : this.FeatureItem.pageType == 5 ? this.dinner2 : this
+            .homeBg1,
           x: 0,
           y: 0,
         }
         this.FeatureItem.dataObj.ImgList.push(obj)
         this.FeatureItem.dataObj.ImgList.forEach(x => {
           x.x = 0
-          x.y =0
+          x.y = 0
         });
       },
       DeleteImg(index, type) {
@@ -156,14 +160,14 @@
         if (this.StencilDrawing) {
           this.FeatureItem.dataObj.SubList.splice(index, 1)
           this.FeatureItem.dataObj.SubList.forEach(x => {
-          x.x = 0
-          x.y =0
-        });
+            x.x = 0
+            x.y = 0
+          });
         } else {
           this.FeatureItem.dataObj.ImgList.splice(index, 1)
           this.FeatureItem.dataObj.ImgList.forEach(x => {
             x.x = 0
-            x.y =0
+            x.y = 0
           });
         }
       },
@@ -173,6 +177,9 @@
       toDeletePages() {
         this.$emit('toDeletePages', this.index, this.FeatureItem)
       },
+      toMovePages(opType) {
+        this.$emit('toMovePages', opType, this.index);
+      },
       setTemplate(TemplateType) {
         this.FeatureItem.pageTemplate = TemplateType
       },