Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SuperMan
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
罗超
SuperMan
Commits
a84d6ba5
Commit
a84d6ba5
authored
Oct 08, 2023
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
07d223da
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
83 additions
and
18 deletions
+83
-18
UpgradedVersion.css
src/assets/css/UpgradedVersion.css
+56
-3
featureControls.vue
...oupControl/UpgradedVersion/components/featureControls.vue
+1
-1
featureHome.vue
...anager/TravelGroupControl/UpgradedVersion/featureHome.vue
+24
-12
index.vue
...ravelmanager/TravelGroupControl/UpgradedVersion/index.vue
+2
-2
No files found.
src/assets/css/UpgradedVersion.css
View file @
a84d6ba5
...
@@ -323,9 +323,16 @@ img {
...
@@ -323,9 +323,16 @@ img {
.featureHome-right-three
{
.featureHome-right-three
{
width
:
143px
;
width
:
143px
;
max-
height
:
747px
;
height
:
747px
;
top
:
240px
;
top
:
240px
;
right
:
42px
;
}
.featureHome-right-three.active
{
height
:
inherit
;
max-height
:
747px
;
left
:
938px
;
left
:
938px
;
right
:
inherit
;
margin-bottom
:
34px
;
}
}
.featureHomeBjH1
{
.featureHomeBjH1
{
...
@@ -349,37 +356,69 @@ img {
...
@@ -349,37 +356,69 @@ img {
}
}
.featureHomeBj2
{
.featureHomeBj2
{
left
:
7px
;
top
:
-18px
;
}
.featureHomeBj2.active
{
left
:
7px
;
left
:
7px
;
top
:
0px
;
top
:
0px
;
}
}
.featureHomeBj3
{
.featureHomeBj3
{
left
:
134px
;
top
:
-25px
;
}
.featureHomeBj3.active
{
left
:
136px
;
left
:
136px
;
top
:
0px
;
top
:
0px
;
}
}
.featureHomeBj4
{
.featureHomeBj4
{
left
:
109px
;
top
:
-43px
;
}
.featureHomeBj4.active
{
left
:
111px
;
left
:
111px
;
top
:
0px
;
top
:
0px
;
}
}
.featureHomeBj5
{
.featureHomeBj5
{
left
:
0
;
left
:
0
;
top
:
668px
;
}
.featureHomeBj5.active
{
left
:
0
;
top
:
inherit
;
bottom
:
0
;
bottom
:
0
;
}
}
.featureHomeBj6
{
.featureHomeBj6
{
left
:
7px
;
left
:
7px
;
top
:
661px
;
}
.featureHomeBj6.active
{
left
:
7px
;
top
:
inherit
;
bottom
:
0
;
bottom
:
0
;
}
}
.featureHomeBj7
{
.featureHomeBj7
{
left
:
134px
;
top
:
634px
;
}
.featureHomeBj7.active
{
left
:
136px
;
left
:
136px
;
top
:
inherit
;
bottom
:
0
;
bottom
:
0
;
}
}
.featureHomeBj8
{
.featureHomeBj8
{
left
:
109px
;
top
:
627px
;
}
.featureHomeBj8.active
{
left
:
111px
;
left
:
111px
;
top
:
inherit
;
bottom
:
0
;
bottom
:
0
;
}
}
...
@@ -393,18 +432,32 @@ img {
...
@@ -393,18 +432,32 @@ img {
}
}
.featureHome-three-textOne
{
.featureHome-three-textOne
{
max-
height
:
600px
;
height
:
600px
;
overflow
:
hidden
;
overflow
:
hidden
;
top
:
93px
;
top
:
93px
;
left
:
24px
;
left
:
24px
;
}
}
.featureHome-three-textOne.active
{
height
:
auto
;
max-height
:
600px
;
margin-top
:
93px
;
margin-left
:
24px
;
margin-bottom
:
34px
;
}
.featureHome-three-textTwo
{
.featureHome-three-textTwo
{
max-
height
:
650px
;
height
:
650px
;
overflow
:
hidden
;
overflow
:
hidden
;
top
:
22px
;
top
:
22px
;
right
:
31px
;
right
:
31px
;
}
}
.featureHome-three-textTwo.active
{
height
:
auto
;
max-height
:
650px
;
margin-top
:
20px
;
margin-left
:
25px
;
}
.MasterMapList-form
{
.MasterMapList-form
{
left
:
33px
;
left
:
33px
;
top
:
268px
;
top
:
268px
;
...
...
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/featureControls.vue
View file @
a84d6ba5
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
<el-tooltip
class=
"item"
effect=
"dark"
content=
"设置字体大小"
placement=
"top"
v-if=
"isFontSize"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"设置字体大小"
placement=
"top"
v-if=
"isFontSize"
>
<p
class=
"row-aic"
>
<p
class=
"row-aic"
>
<span
class=
"fz14"
style=
"flex-shrink: 0;margin-right: 3px;"
>
字体大小
</span>
<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=
"cursorInitial fz14"
style=
"flex-shrink: 0;margin-left: 5px;"
>
<span
class=
"relative"
style=
"top: -3px;"
>
px
</span>
<span
class=
"relative"
style=
"top: -3px;"
>
px
</span>
</span>
</span>
...
...
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/featureHome.vue
View file @
a84d6ba5
...
@@ -57,26 +57,38 @@
...
@@ -57,26 +57,38 @@
<vEditDiv
:canEdit=
'canEdit'
v-model=
"FeatureItem.dataObj.ShadowName"
:fontSize=
"FeatureItem.dataObj.ShadowFontSize"
></vEditDiv>
<vEditDiv
:canEdit=
'canEdit'
v-model=
"FeatureItem.dataObj.ShadowName"
:fontSize=
"FeatureItem.dataObj.ShadowFontSize"
></vEditDiv>
</div>
</div>
</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>
<div
class=
"featureHomeBjH1 featureHomeBj1 absolute"
:style=
"
{'background':TripColor}">
</div>
<div
class=
"featureHomeBjH1 featureHomeBj1"
<div
class=
"featureHomeBjW1 featureHomeBj2 absolute"
:style=
"
{'background':TripColor}">
</div>
:class=
"[FeatureItem.dataObj.ShadowFontSize>0?'active absolute':'relative']"
:style=
"
{'background':TripColor}">
</div>
<div
class=
"featureHomeBjH1 featureHomeBj3 absolute"
:style=
"
{'background':TripColor}">
</div>
<div
class=
"featureHomeBjW1 featureHomeBj2"
<div
class=
"featureHomeBjW1 featureHomeBj4 absolute"
:style=
"
{'background':TripColor}">
</div>
:class=
"[FeatureItem.dataObj.ShadowFontSize>0?'active absolute':'relative']"
:style=
"
{'background':TripColor}">
</div>
</div>
<div
class=
"featureHomeBjH1 featureHomeBj3 relative"
<div
class=
"row"
style=
"padding: 20px 0 34px 0;"
>
:class=
"[FeatureItem.dataObj.ShadowFontSize>0?'active absolute':'relative']"
:style=
"
{'background':TripColor}">
</div>
<div
class=
"featureHome-three-text featureHome-three-textOne"
style=
"margin-left: 24px;margin-top: 93px;"
>
<div
class=
"featureHomeBjW1 featureHomeBj4 relative"
:class=
"[FeatureItem.dataObj.ShadowFontSize>0?'active absolute':'relative']"
:style=
"
{'background':TripColor}">
</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>
<vEditDiv
:canEdit=
'canEdit'
v-model=
"FeatureItem.dataObj.MainName"
></vEditDiv>
</div>
</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>
<vEditDiv
:canEdit=
'canEdit'
v-model=
"FeatureItem.dataObj.SubName"
></vEditDiv>
</div>
</div>
</div>
</div>
<div>
<div>
<div
class=
"featureHomeBjH2 featureHomeBj5 absolute"
:style=
"
{'background':TripColor}">
</div>
<div
class=
"featureHomeBjH2 featureHomeBj5"
<div
class=
"featureHomeBjW2 featureHomeBj6 absolute"
:style=
"
{'background':TripColor}">
</div>
:class=
"[FeatureItem.dataObj.ShadowFontSize>0?'active absolute':'relative']"
:style=
"
{'background':TripColor}">
</div>
<div
class=
"featureHomeBjH2 featureHomeBj7 absolute"
:style=
"
{'background':TripColor}">
</div>
<div
class=
"featureHomeBjW2 featureHomeBj6"
<div
class=
"featureHomeBjW2 featureHomeBj8 absolute"
:style=
"
{'background':TripColor}">
</div>
:class=
"[FeatureItem.dataObj.ShadowFontSize>0?'active absolute':'relative']"
:style=
"
{'background':TripColor}">
</div>
<div
class=
"featureHomeBjH2 featureHomeBj7"
:class=
"[FeatureItem.dataObj.ShadowFontSize>0?'active absolute':'relative']"
:style=
"
{'background':TripColor}">
</div>
<div
class=
"featureHomeBjW2 featureHomeBj8"
:class=
"[FeatureItem.dataObj.ShadowFontSize>0?'active absolute':'relative']"
:style=
"
{'background':TripColor}">
</div>
</div>
</div>
</div>
</div>
</div>
</div>
...
...
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/index.vue
View file @
a84d6ba5
...
@@ -196,7 +196,7 @@
...
@@ -196,7 +196,7 @@
},
},
initFeature
(
isReload
)
{
initFeature
(
isReload
)
{
this
.
FeatureData
.
FeatureHtmlJson
.
forEach
(
x
=>
{
this
.
FeatureData
.
FeatureHtmlJson
.
forEach
(
x
=>
{
x
.
dataObj
.
ShadowFontSize
=
x
.
dataObj
.
ShadowFontSize
?
x
.
dataObj
.
ShadowFontSize
:
6
0
x
.
dataObj
.
ShadowFontSize
=
x
.
dataObj
.
ShadowFontSize
?
Number
(
x
.
dataObj
.
ShadowFontSize
):
0
})
})
var
oldJson
=
this
.
FeatureData
.
FeatureHtmlJson
?
var
oldJson
=
this
.
FeatureData
.
FeatureHtmlJson
?
JSON
.
parse
(
JSON
.
stringify
(
this
.
FeatureData
.
FeatureHtmlJson
))
:
JSON
.
parse
(
JSON
.
stringify
(
this
.
FeatureData
.
FeatureHtmlJson
))
:
...
@@ -262,7 +262,7 @@
...
@@ -262,7 +262,7 @@
}
}
newObj
.
ShadowName
=
"遇见最美好的自己"
;
newObj
.
ShadowName
=
"遇见最美好的自己"
;
newObj
.
SubShadowName
=
"在古老的日本樱花街道"
;
newObj
.
SubShadowName
=
"在古老的日本樱花街道"
;
newObj
.
ShadowFontSize
=
tripObj
.
ShadowFontSize
?
tripObj
.
ShadowFontSize
:
6
0
;
newObj
.
ShadowFontSize
=
tripObj
.
ShadowFontSize
?
Number
(
tripObj
.
ShadowFontSize
):
0
;
if
(
tripObj
.
scenicArray
&&
tripObj
.
scenicArray
.
length
>
0
)
{
if
(
tripObj
.
scenicArray
&&
tripObj
.
scenicArray
.
length
>
0
)
{
newObj
.
DetailsName
=
tripObj
.
scenicArray
[
0
].
MainName
;
newObj
.
DetailsName
=
tripObj
.
scenicArray
[
0
].
MainName
;
var
tempImgUrl
=
this
.
homeBg2
;
var
tempImgUrl
=
this
.
homeBg2
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment