添加页面及img操作位置

src/assets/css/UpgradedVersion.css

@@ -531,7 +531,8 @@ img {
   }
 
   .UpgradedVersionDetails-formBox1 {
-    top: 12px;
+    top: 139px;
+    left: -31px;
   }
 
   .UpgradedVersionDetails-imgbox {}
@@ -916,7 +917,7 @@ img {
 
   .subIdeImgForm2Box3 {
     left: 0px;
-    top: 0;
+    top: 1px;
   }
 
   .UpgradedVersion-intTitle {

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

@@ -3,7 +3,7 @@
     <div class="UpgradedVersionDetails-form absolute row-sb z-index1" :style="{'background':backgroundColor}">
       <div class="UpgradedVersionDetails-form-Box absolute UpgradedVersion-Hover">
         <div class="UpgradedVersionDetails-formBox1 absolute">
-          <FeatureControls :index="index" :FeatureData="FeatureData" :ControlsType="'row'"
+          <FeatureControls :index="index" :FeatureData="FeatureData" :ControlsType="'column'"
             :isDeletePage="FeatureData.isDeletePage" :pagesType="3" @toAddPages="toAddPages"
             @toDeletePages="toDeletePages">
           </FeatureControls>
@@ -14,7 +14,7 @@
         <div class="UpgradedVersionDetails-imgbox row-aic UpgradedVersion-Hover">
           <div class="UpgradedVersionDetails-img relative">
             <div class="UpgradedVersionDetails1 absolute z-index1">
-              <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
+              <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'column'" isImg="1" :isUploadImg="true"
                 :isSelectImg="true" @toUploadImg="UploadImg(i)" @toSelectImg="SelectImg(i)" @toAddImg="AddImg"
                 @toDeleteImg="DeleteImg(i)" />
             </div>

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

 <template>
   <div class="featureControls">
     <div class="row-aic featureControls-bottom featureControls-bottomOne" v-if="ControlsType=='row'">
+
+      <el-tooltip class="item" effect="dark" content="上传图" placement="top">
+        <div @click="toUploadImg" v-if="isUploadImg">
+          <i class="el-icon-upload2"></i>
+        </div>
+      </el-tooltip>
+      <el-tooltip class="item" effect="dark" content="选图" placement="top">
+        <div @click="toSelectImg" v-if="isSelectImg">
+          <i class="el-icon-search"></i>
+        </div>
+      </el-tooltip>
+      <el-tooltip class="item" effect="dark" content="添加图" placement="top">
+        <div @click="toAddImg" v-if="isAddImg">
+          <i class="el-icon-plus"></i>
+        </div>
+      </el-tooltip>
+      <el-tooltip class="item" effect="dark" content="删除图" placement="top">
+        <div @click="toDeleteImg" v-if="isDeleteImg">
+          <i class="el-icon-delete"></i>
+        </div>
+      </el-tooltip>
+    </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="toAddPages">
           <i class="el-icon-plus"></i>
@@ -11,8 +35,19 @@
           <i class="el-icon-delete"></i>
         </div>
       </el-tooltip>
-    </div>
-    <div class="column featureControls-bottom featureControls-bottomTwo" v-else>
+     </template>
+     <template v-else>
+      <el-tooltip class="item" effect="dark" content="上传图" placement="top">
+        <div @click="toUploadImg" v-if="isUploadImg">
+          <i class="el-icon-upload2"></i>
+        </div>
+      </el-tooltip>
+      <el-tooltip class="item" effect="dark" content="选图" placement="top">
+        <div @click="toSelectImg" v-if="isSelectImg">
+          <i class="el-icon-search"></i>
+        </div>
+      </el-tooltip>
+     </template>
       <div v-if="isTemplate">
         <el-tooltip class="item" effect="dark" content="选模版" placement="top">
           <el-popover trigger="hover" placement="right">
@@ -28,26 +63,6 @@
           </el-popover>
         </el-tooltip>
       </div>
-      <el-tooltip class="item" effect="dark" content="上传图" placement="top">
-        <div @click="toUploadImg" v-if="isUploadImg">
-          <i class="el-icon-upload2"></i>
-        </div>
-      </el-tooltip>
-      <el-tooltip class="item" effect="dark" content="选图" placement="top">
-        <div @click="toSelectImg" v-if="isSelectImg">
-          <i class="el-icon-search"></i>
-        </div>
-      </el-tooltip>
-      <el-tooltip class="item" effect="dark" content="添加图" placement="top">
-        <div @click="toAddImg" v-if="isAddImg">
-          <i class="el-icon-plus"></i>
-        </div>
-      </el-tooltip>
-      <el-tooltip class="item" effect="dark" content="删除图" placement="top">
-        <div @click="toDeleteImg" v-if="isDeleteImg">
-          <i class="el-icon-delete"></i>
-        </div>
-      </el-tooltip>
     </div>
   </div>
 </template>
@@ -57,7 +72,7 @@
     components: {
 
     },
-    props: ['index', 'FeatureData', 'ControlsType', 'pagesType', 'isDeletePage',
+    props: ['index', 'FeatureData', 'ControlsType','isImg', 'pagesType', 'isDeletePage',
       'isUploadImg', 'isSelectImg', 'isAddImg', 'isDeleteImg', 'isTemplate', 'Template'
     ],
     data() {

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

@@ -61,7 +61,7 @@
           <div class="subIdeImg1 bjE6 UpgradedVersion-Hover">
             <div class="subIdeImg1relative relative UpgradedVersion-Hover">
               <div class="subIdeImgForm1Box absolute">
-                <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
+                <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isImg="1" :isUploadImg="true"
                   :isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)"
                   @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" />
               </div>
@@ -77,7 +77,7 @@
           <div class="subIdeImg1 bjE6 UpgradedVersion-Hover">
             <div class="subIdeImg1relative relative">
               <div class="subIdeImgForm1Box absolute">
-                <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
+                <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isImg="1" :isUploadImg="true"
                   :isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(1)" @toSelectImg="toSelectImg(1)"
                   @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(1)" />
               </div>
@@ -118,7 +118,7 @@
     ],
     data() {
       return {
- 
+
       };
     },
     methods: {

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

@@ -15,16 +15,17 @@
     </div>
     <div class="featureHome-left UpgradedVersion-Hover">
       <div class="featureHome-vToolBar-one absolute z-index3">
-        <FeatureControls :index="index" :FeatureData="FeatureItem" :ControlsType="'row'"
-          :isDeletePage="FeatureItem.isDeletePage" :pagesType="1" @toAddPages="toAddPages"
-          @toDeletePages="toDeletePages">
-        </FeatureControls>
+        <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"></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'" :isTemplate="false"
-          :isUploadImg="true" :isSelectImg="true" :isAddImg="false" :isDeleteImg="false" @toUploadImg="UploadImg"
-          @toSelectImg="SelectImg" @toAddImg="AddImg" @toDeleteImg="DeleteImg"></FeatureControls>
+        <FeatureControls :index="index" :FeatureData="FeatureItem" :ControlsType="'column'"
+          :isDeletePage="FeatureItem.isDeletePage" :pagesType="1" @toAddPages="toAddPages"
+          @toDeletePages="toDeletePages">
+        </FeatureControls>
+
       </div>
       <div class="featureHome-left-one bjF6 absolute z-index2">
         <template v-if="FeatureItem.dataObj.ImgList&&FeatureItem.dataObj.ImgList.length>0">

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

@@ -6,17 +6,18 @@
       :class="[FeatureItem.pageType==2?'':'UpgradedVersion-Hover']">
       <div class="MasterMapList-box-one absolute">
         <FeatureControls :index="index" :FeatureData="FeatureItem" :ControlsType="'row'"
-          :isDeletePage="FeatureItem.isDeletePage" :pagesType="1" @toAddPages="toAddPages"
-          @toDeletePages="toDeletePages">
-        </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'"
           :isUploadImg="FeatureItem.pageType==2?true:false" :isSelectImg="FeatureItem.pageType==2?true:false" :isAddImg="FeatureItem.pageType==2?false:
           FeatureItem.pageType!=2&&FeatureItem.dataObj.ImgList
           &&FeatureItem.dataObj.ImgList.length!=9?true:false" :isDeleteImg="false" @toUploadImg="UploadImg"
           @toSelectImg="SelectImg" @toAddImg="AddImg" @toDeleteImg="DeleteImg"></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">
+        </FeatureControls>
+
       </div>
     </div>
     <!-- 上传主图文件 -->