Commit a84d6ba5 authored by youjie's avatar youjie

no message

parent 07d223da
......@@ -323,9 +323,16 @@ img {
.featureHome-right-three {
width: 143px;
max-height: 747px;
height: 747px;
top: 240px;
right: 42px;
}
.featureHome-right-three.active {
height: inherit;
max-height: 747px;
left: 938px;
right: inherit;
margin-bottom: 34px;
}
.featureHomeBjH1 {
......@@ -349,37 +356,69 @@ img {
}
.featureHomeBj2 {
left: 7px;
top: -18px;
}
.featureHomeBj2.active {
left: 7px;
top: 0px;
}
.featureHomeBj3 {
left: 134px;
top: -25px;
}
.featureHomeBj3.active {
left: 136px;
top: 0px;
}
.featureHomeBj4 {
left: 109px;
top: -43px;
}
.featureHomeBj4.active {
left: 111px;
top: 0px;
}
.featureHomeBj5 {
left: 0;
top: 668px;
}
.featureHomeBj5.active {
left: 0;
top: inherit;
bottom: 0;
}
.featureHomeBj6 {
left: 7px;
top: 661px;
}
.featureHomeBj6.active {
left: 7px;
top: inherit;
bottom: 0;
}
.featureHomeBj7 {
left: 134px;
top: 634px;
}
.featureHomeBj7.active {
left: 136px;
top: inherit;
bottom: 0;
}
.featureHomeBj8 {
left: 109px;
top: 627px;
}
.featureHomeBj8.active {
left: 111px;
top: inherit;
bottom: 0;
}
......@@ -393,18 +432,32 @@ img {
}
.featureHome-three-textOne {
max-height: 600px;
height: 600px;
overflow: hidden;
top: 93px;
left: 24px;
}
.featureHome-three-textOne.active {
height: auto;
max-height: 600px;
margin-top: 93px;
margin-left: 24px;
margin-bottom: 34px;
}
.featureHome-three-textTwo {
max-height: 650px;
height: 650px;
overflow: hidden;
top: 22px;
right: 31px;
}
.featureHome-three-textTwo.active {
height: auto;
max-height: 650px;
margin-top: 20px;
margin-left: 25px;
}
.MasterMapList-form {
left: 33px;
top: 268px;
......
......@@ -27,7 +27,7 @@
<el-tooltip class="item" effect="dark" content="设置字体大小" placement="top" v-if="isFontSize">
<p class="row-aic">
<span class="fz14" style="flex-shrink: 0;margin-right: 3px;">字体大小</span>
<el-input class="ShadowFontSize" 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.ShadowFontSize" 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>
......
......@@ -57,26 +57,38 @@
<vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.ShadowName" :fontSize="FeatureItem.dataObj.ShadowFontSize"></vEditDiv>
</div>
</div>
<div class="featureHome-right-three relative z-index1">
<div class="featureHome-right-three z-index1"
:class="[FeatureItem.dataObj.ShadowFontSize>0?'active relative':'absolute']">
<div>
<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="row" style="padding: 20px 0 34px 0;">
<div class="featureHome-three-text featureHome-three-textOne" style="margin-left: 24px;margin-top: 93px;">
<div class="featureHomeBjH1 featureHomeBj1"
:class="[FeatureItem.dataObj.ShadowFontSize>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>
<div class="featureHomeBjH1 featureHomeBj3 relative"
:class="[FeatureItem.dataObj.ShadowFontSize>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>
</div>
<div
:class="[FeatureItem.dataObj.ShadowFontSize>0?'row':'']">
<div class="featureHome-three-text featureHome-three-textOne"
:class="[FeatureItem.dataObj.ShadowFontSize>0?'active':'absolute']">
<vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.MainName"></vEditDiv>
</div>
<div class="featureHome-three-text featureHome-three-textTwo" style="margin-left: 26px;">
<div class="featureHome-three-text featureHome-three-textTwo"
:class="[FeatureItem.dataObj.ShadowFontSize>0?'active':'absolute']">
<vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.SubName"></vEditDiv>
</div>
</div>
<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 class="featureHomeBjH2 featureHomeBj5"
:class="[FeatureItem.dataObj.ShadowFontSize>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>
<div class="featureHomeBjH2 featureHomeBj7"
:class="[FeatureItem.dataObj.ShadowFontSize>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>
</div>
</div>
</div>
......
......@@ -196,7 +196,7 @@
},
initFeature(isReload) {
this.FeatureData.FeatureHtmlJson.forEach(x=>{
x.dataObj.ShadowFontSize = x.dataObj.ShadowFontSize?x.dataObj.ShadowFontSize:60
x.dataObj.ShadowFontSize = x.dataObj.ShadowFontSize?Number(x.dataObj.ShadowFontSize):0
})
var oldJson = this.FeatureData.FeatureHtmlJson ?
JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJson)) :
......@@ -262,7 +262,7 @@
}
newObj.ShadowName = "遇见最美好的自己";
newObj.SubShadowName = "在古老的日本樱花街道";
newObj.ShadowFontSize = tripObj.ShadowFontSize?tripObj.ShadowFontSize:60;
newObj.ShadowFontSize = tripObj.ShadowFontSize?Number(tripObj.ShadowFontSize):0;
if (tripObj.scenicArray && tripObj.scenicArray.length > 0) {
newObj.DetailsName = tripObj.scenicArray[0].MainName;
var tempImgUrl = this.homeBg2;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment