Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

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

@@ -213,8 +213,8 @@
       DeleteImg() {
 
       },
-      toAddPages() {
-        this.$emit('toAddPages', this.index, this.FeatureData)
+      toAddPages(index,item) {
+        this.$emit('toAddPages', index, item)
       },
       toDeletePages() {
         this.$emit('toDeletePages', this.index)

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

@@ -49,11 +49,25 @@
             <i class="iconfont icon-shangyi"></i>
           </div>
         </el-tooltip>
-        <el-tooltip class="item" effect="dark" content="添加页面" placement="top">
+        <el-tooltip class="item" effect="dark" content="选页面模版进行添加" placement="top">
+          <el-popover trigger="hover" placement="right">
+            <div class="featureControls-Template" style="height: 500px;overflow: auto;width: 300px;">
+              <div class="Template-img relative" v-for="(item,index) in PagesList" @click="toAddPages(item)"
+                :key="index">
+                <img :src="item.url" />
+                <!-- <div v-if="item.id==TemplateType" class="Template-imgSelect absolute row-ajc el-icon-success"></div> -->
+              </div>
+            </div>
+            <div slot="reference" style="padding: 0 4px;">
+              <i class="el-icon-plus"></i>
+            </div>
+          </el-popover>
+        </el-tooltip>
+        <!-- <el-tooltip class="item" effect="dark" content="添加页面" placement="top">
           <div @click="toAddPages">
             <i class="el-icon-plus"></i>
           </div>
-        </el-tooltip>
+        </el-tooltip> -->
         <el-tooltip class="item" effect="dark" content="删除页面" placement="top">
           <div @click="toDeletePages" v-if="isDeletePage">
             <i class="el-icon-delete"></i>
@@ -106,6 +120,32 @@
     ],
     data() {
       return {
+        PagesList:[
+          {
+            url: 'https://imgfile.oytour.com/static/page1.png',
+            pageType: 1,
+          },
+          {
+            url: 'https://imgfile.oytour.com/static/page2.png',
+            pageType: 7,
+          },
+          {
+            url: 'https://imgfile.oytour.com/static/page3.png',
+            pageType: 2,
+          },
+          {
+            url: 'https://imgfile.oytour.com/static/page4.png',
+            pageType: 4,
+          },
+          {
+            url: 'https://imgfile.oytour.com/static/page5.png',
+            pageType: 5,
+          },
+          {
+            url: 'https://imgfile.oytour.com/static/page6.png',
+            pageType: 6,
+          }
+        ],
         TemplateType: 1,
         TemplateList: [{
             url: 'http://imgfile.oytour.com/Static/NewTripFeature/featureTemplateOne.png',
@@ -163,9 +203,9 @@
       toDeleteImg() {
         this.$emit('toDeleteImg')
       },
-      toAddPages() {
-        // this.pagesType 1 首页 2 介绍 3餐食介绍 4宿 5食 6景
-        this.$emit('toAddPages')
+      toAddPages(item) {
+        // this.pagesType 1 首页 2 介绍 3餐食介绍 4宿 5食 6景 7新首页
+        this.$emit('toAddPages',this.index,item)
       },
       toDeletePages() {
         this.$emit('toDeletePages')

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

@@ -239,8 +239,8 @@
       DeleteImg() {
 
       },
-      toAddPages() {
-        this.$emit('toAddPages', this.index, this.FeatureItem)
+      toAddPages(index,item) {
+        this.$emit('toAddPages', index, item)
       },
       toDeletePages() {
         this.$emit('toDeletePages', this.index)

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

@@ -47,7 +47,7 @@
           :h="749" :ref="'viewSpotVds_' + (FeatureItem * 4 + 1) + '_'+index" tabindex="0" :resizable="false"
           :active="false" :parent="false" axis="y" @activated="onActivated(FeatureItem * 4 + 1, index)"
           :x="FeatureItem.dataObj.ImgList[0].x" :y="FeatureItem.dataObj.ImgList[0].y" :z="2" @dragstop="onViewSpotDragstop">
-          <img :src="FeatureItem.dataObj.ImgList[0].url" :id="'viewSpotImg_' + (FeatureItem * 4 + 1) + '_'+index" />
+          <img style="height: auto;" :src="FeatureItem.dataObj.ImgList[0].url" :id="'viewSpotImg_' + (FeatureItem * 4 + 1) + '_'+index" />
         </VueDraggableResizable>
         <!-- 蒙层 -->
         <div class="featureHome2-form featureHome2-formHover relative z-index3"
@@ -286,8 +286,8 @@
       DeleteImg() {
 
       },
-      toAddPages() {
-        this.$emit('toAddPages', this.index, this.FeatureItem)
+      toAddPages(index,item) {
+        this.$emit('toAddPages', index, item)
       },
       toDeletePages() {
         this.$emit('toDeletePages', this.index)

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

@@ -171,8 +171,8 @@
           });
         }
       },
-      toAddPages() {
-        this.$emit('toAddPages', this.index, this.FeatureItem)
+      toAddPages(index,item) {
+        this.$emit('toAddPages', index, item)
       },
       toDeletePages() {
         this.$emit('toDeletePages', this.index, this.FeatureItem)