行程特色首页设置字体大小

src/assets/css/UpgradedVersion.css

@@ -227,6 +227,10 @@ img {
     top: 425px;
     left: -30px;
   }
+  .featureHome-vToolBar-three {
+    top: 535px;
+    right: 186px;
+  }
 
   .featureHome-left-one {
     width: 697px;
@@ -296,7 +300,7 @@ img {
 
   .featureHome-right-text .edit_div {
     width: 60px;
-    font-size: 60px;
+    /* font-size: 60px; */
     font-family: Microsoft YaHei;
     font-weight: bold;
     color: #2A2A2A;
@@ -319,9 +323,9 @@ img {
 
   .featureHome-right-three {
     width: 143px;
-    height: 747px;
+    max-height: 747px;
     top: 240px;
-    right: 42px;
+    left: 938px;
   }
 
   .featureHomeBjH1 {
@@ -346,37 +350,37 @@ img {
 
   .featureHomeBj2 {
     left: 7px;
-    top: -18px;
+    top: 0px;
   }
 
   .featureHomeBj3 {
-    left: 134px;
-    top: -25px;
+    left: 136px;
+    top: 0px;
   }
 
   .featureHomeBj4 {
-    left: 109px;
-    top: -43px;
+    left: 111px;
+    top: 0px;
   }
 
   .featureHomeBj5 {
     left: 0;
-    top: 668px;
+    bottom: 0;
   }
 
   .featureHomeBj6 {
     left: 7px;
-    top: 661px;
+    bottom: 0;
   }
 
   .featureHomeBj7 {
-    left: 134px;
-    top: 634px;
+    left: 136px;
+    bottom: 0;
   }
 
   .featureHomeBj8 {
-    left: 109px;
-    top: 627px;
+    left: 111px;
+    bottom: 0;
   }
 
   .featureHome-three-text .edit_div {
@@ -389,14 +393,14 @@ img {
   }
 
   .featureHome-three-textOne {
-    height: 600px;
+    max-height: 600px;
     overflow: hidden;
     top: 93px;
     left: 24px;
   }
 
   .featureHome-three-textTwo {
-    height: 650px;
+    max-height: 650px;
     overflow: hidden;
     top: 22px;
     right: 31px;

src/components/newTravelmanager/TravelGroupControl/TravelTemp/VEditDiv.vue

 <template>
   <div :data-name="isLocked" class="edit_div" :contenteditable="canEdit" v-html="innerText" @focus="isLocked = true"
-    @blur="isLocked = false" @input="changeText">
+    @blur="isLocked = false" @input="changeText"
+    :style="{'font-size':fontSize?fontSize+'px':''}">
   </div>
 </template>
 <script>
   export default {
-    props: ["value", "canEdit", "textLength"],
+    props: ["value", "canEdit", "textLength","fontSize"],
     data() {
       return {
         innerText: this.value,

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

@@ -24,6 +24,13 @@
       <el-tooltip class="item" effect="dark" :content="'尺寸'+x+'*'+y" placement="top" v-if="x&&y">
         <div class="cursorInitial fz14">{{x}} * {{y}}</div>
       </el-tooltip>
+      <el-tooltip class="item" effect="dark" content="设置字体大小" placement="top" v-if="isFontSize">
+        <p class="row-aic">
+          <span class="fz14" style="flex-shrink: 0;">字体大小</span>
+          <el-input size="mini" v-model="FeatureData.dataObj.ShadowFontSize" style="width: 80px;"></el-input>
+          <span class="cursorInitial fz14" style="flex-shrink: 0;">px</span>
+        </p>
+      </el-tooltip>
     </div>
     <div class="column featureControls-bottom featureControls-bottomTwo" v-else>
       <template v-if="!isImg&&!isTemplate">
@@ -76,7 +83,7 @@
 
     },
     props: ['index', 'FeatureData', 'ControlsType','isImg', 'pagesType', 'isDeletePage',
-      'isUploadImg', 'isSelectImg', 'isAddImg', 'isDeleteImg', 'isTemplate', 'Template','x','y'
+      'isUploadImg', 'isSelectImg', 'isAddImg', 'isDeleteImg', 'isTemplate', 'Template','x','y','isFontSize'
     ],
     data() {
       return {

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

@@ -45,30 +45,38 @@
       </div>
     </div>
     <div class="featureHome-right">
-      <div class="featureHome-right-text featureHome-right-one absolute z-index1">
-        <vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.SubShadowName"></vEditDiv>
-      </div>
-      <div class="featureHome-right-text featureHome-right-two absolute z-index1">
-        <vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.ShadowName"></vEditDiv>
+      <div class="UpgradedVersion-Hover">
+        <div class="featureHome-vToolBar-three absolute z-index3">
+          <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>
+        </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>
+        </div>
       </div>
-      <div class="featureHome-right-three absolute z-index1">
+      <div class="featureHome-right-three relative z-index1">
         <div>
-          <div class="featureHomeBjH1 featureHomeBj1" :style="{'background':TripColor}">&nbsp;</div>
-          <div class="featureHomeBjW1 featureHomeBj2 relative" :style="{'background':TripColor}">&nbsp;</div>
-          <div class="featureHomeBjH1 featureHomeBj3 relative" :style="{'background':TripColor}">&nbsp;</div>
-          <div class="featureHomeBjW1 featureHomeBj4 relative" :style="{'background':TripColor}">&nbsp;</div>
-        </div>
-        <div class="featureHome-three-text featureHome-three-textOne absolute">
-          <vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.MainName"></vEditDiv>
+          <div class="featureHomeBjH1 featureHomeBj1 absolute" :style="{'background':TripColor}">&nbsp;</div>
+          <div class="featureHomeBjW1 featureHomeBj2 absolute" :style="{'background':TripColor}">&nbsp;</div>
+          <div class="featureHomeBjH1 featureHomeBj3 absolute" :style="{'background':TripColor}">&nbsp;</div>
+          <div class="featureHomeBjW1 featureHomeBj4 absolute" :style="{'background':TripColor}">&nbsp;</div>
         </div>
-        <div class="featureHome-three-text featureHome-three-textTwo absolute">
-          <vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.SubName"></vEditDiv>
+        <div class="row" style="padding: 20px 0 34px 0;">
+          <div class="featureHome-three-text featureHome-three-textOne" style="margin-left: 24px;margin-top: 93px;">
+            <vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.MainName"></vEditDiv>
+          </div>
+          <div class="featureHome-three-text featureHome-three-textTwo" style="margin-left: 26px;">
+            <vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.SubName"></vEditDiv>
+          </div>
         </div>
         <div>
-          <div class="featureHomeBjH2 featureHomeBj5 relative" :style="{'background':TripColor}">&nbsp;</div>
-          <div class="featureHomeBjW2 featureHomeBj6 relative" :style="{'background':TripColor}">&nbsp;</div>
-          <div class="featureHomeBjH2 featureHomeBj7 relative" :style="{'background':TripColor}">&nbsp;</div>
-          <div class="featureHomeBjW2 featureHomeBj8 relative" :style="{'background':TripColor}">&nbsp;</div>
+          <div class="featureHomeBjH2 featureHomeBj5 absolute" :style="{'background':TripColor}">&nbsp;</div>
+          <div class="featureHomeBjW2 featureHomeBj6 absolute" :style="{'background':TripColor}">&nbsp;</div>
+          <div class="featureHomeBjH2 featureHomeBj7 absolute" :style="{'background':TripColor}">&nbsp;</div>
+          <div class="featureHomeBjW2 featureHomeBj8 absolute" :style="{'background':TripColor}">&nbsp;</div>
         </div>
       </div>
     </div>

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

@@ -208,6 +208,7 @@
           });
           this.pageList = oldJson;
           this.RenderingOk = true;
+
         } else {
           var tripObj = this.getTripData();
           this.pageList.forEach(pItem => {
@@ -258,6 +259,7 @@
         }
         newObj.ShadowName = "遇见最美好的自己";
         newObj.SubShadowName = "在古老的日本樱花街道";
+        newObj.ShadowFontSize = tripObj.ShadowFontSize?tripObj.ShadowFontSize:60;
         if (tripObj.scenicArray && tripObj.scenicArray.length > 0) {
           newObj.DetailsName = tripObj.scenicArray[0].MainName;
           var tempImgUrl = this.homeBg2;