行程特色字体调整

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

@@ -24,10 +24,10 @@
       <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="设置字体大小(默认60px)" placement="top" v-if="isFontSize">
+      <el-tooltip class="item" effect="dark" content="设置字体大小(默认34px)" placement="top" v-if="isFontSize">
         <p class="row-aic">
           <span class="fz14" style="flex-shrink: 0;margin-right: 3px;">字体大小</span>
-          <el-input class="ShadowFontSize" type="number" size="mini" v-model="FeatureData.dataObj.ShadowFontSize" style="width: 80px;height: 34px;"></el-input>
+          <el-input class="ShadowFontSize" type="number" size="mini" v-model="FeatureData.dataObj.ShadowFontSize2" style="width: 80px;height: 34px;"></el-input>
           <span class="cursorInitial fz14" style="flex-shrink: 0;margin-left: 5px;">
           <span class="relative" style="top: -3px;">px</span>
           </span>

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

@@ -45,54 +45,74 @@
       </div>
     </div>
     <div class="featureHome-right">
-      <div class="UpgradedVersion-Hover">
+      <div class="UpgradedVersion-Hover" style="display: none;">
         <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"
+          :width="width"></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="UpgradedVersion-Hover">
+        <div class="absolute z-index3" style="top: 204px;right: 44px;">
+          <FeatureControls :index="index" :FeatureData="FeatureItem" :ControlsType="'row'" :isTemplate="false"
+            :isFontSize="true"></FeatureControls>
+        </div>
         <div class="featureHome-right-three z-index1"
-      :class="[FeatureItem.dataObj.ShadowFontSize>0?'active relative':'absolute']">
+        :class="[FeatureItem.dataObj.ShadowFontSize>0||FeatureItem.dataObj.ShadowFontSize2>0?'active relative':'absolute']">
           <div>
             <div class="featureHomeBjH1 featureHomeBj1"
-          :class="[FeatureItem.dataObj.ShadowFontSize>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?'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?'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?'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?'row':'']">
+          :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?'active':'absolute']">
-            <vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.MainName"></vEditDiv>
+            :class="[FeatureItem.dataObj.ShadowFontSize>0||FeatureItem.dataObj.ShadowFontSize2>0?'active row-ajc':'absolute']"
+            :style="{'margin-left':FeatureItem.dataObj.ShadowFontSize2>0?'0':'',
+            'width':FeatureItem.dataObj.ShadowFontSize2>0?'50%':'',
+            'overflow':FeatureItem.dataObj.ShadowFontSize2>0?'initial':'initial',
+            'writing-mode':FeatureItem.dataObj.ShadowFontSize2>0?'vertical-lr':'',
+            'letter-spacing':FeatureItem.dataObj.ShadowFontSize2>0?'25px':'',}">
+              <vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.MainName"
+              :fontSize="FeatureItem.dataObj.ShadowFontSize2"></vEditDiv>
             </div>
             <div class="featureHome-three-text featureHome-three-textTwo"
-          :class="[FeatureItem.dataObj.ShadowFontSize>0?'active':'absolute']">
-            <vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.SubName"></vEditDiv>
+            :class="[FeatureItem.dataObj.ShadowFontSize>0||FeatureItem.dataObj.ShadowFontSize2>0?'active row-ajc':'absolute']"
+            :style="{'margin-left':FeatureItem.dataObj.ShadowFontSize2>0?'0':'',
+            'width':FeatureItem.dataObj.ShadowFontSize2>0?'50%':'',
+            'overflow':FeatureItem.dataObj.ShadowFontSize2>0?'initial':'initial',
+            'writing-mode':FeatureItem.dataObj.ShadowFontSize2>0?'vertical-lr':'',
+            'letter-spacing':FeatureItem.dataObj.ShadowFontSize2>0?'25px':'',}">
+                <vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.SubName"
+                :fontSize="FeatureItem.dataObj.ShadowFontSize2"></vEditDiv>
             </div>
           </div>
           <div>
             <div class="featureHomeBjH2 featureHomeBj5"
-          :class="[FeatureItem.dataObj.ShadowFontSize>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?'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?'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?'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:是否多选图片-->
       <DMCchooseImg @closeImg="closeDMCchooseImg" ref="DMCchooseImg1" @headCallBack="getDMCimg" v-bind:isCheckmore="1"

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

@@ -199,6 +199,7 @@
           Array) {
           this.FeatureData.FeatureHtmlJson.forEach(x => {
             x.dataObj.ShadowFontSize = x.dataObj.ShadowFontSize ? Number(x.dataObj.ShadowFontSize) : 0;
+            x.dataObj.ShadowFontSize2 = x.dataObj.ShadowFontSize2 ? Number(x.dataObj.ShadowFontSize2) : 0;
           })
         }
         var oldJson = this.FeatureData.FeatureHtmlJson ?
@@ -266,6 +267,7 @@
         newObj.ShadowName = "遇见最美好的自己";
         newObj.SubShadowName = "在古老的日本樱花街道";
         newObj.ShadowFontSize = tripObj.ShadowFontSize ? Number(tripObj.ShadowFontSize) : 0;
+        newObj.ShadowFontSize2 = tripObj.ShadowFontSize2 ? Number(tripObj.ShadowFontSize2) : 0;
         if (tripObj.scenicArray && tripObj.scenicArray.length > 0) {
           newObj.DetailsName = tripObj.scenicArray[0].MainName;
           var tempImgUrl = this.homeBg2;