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
866cf80a
Commit
866cf80a
authored
Aug 17, 2023
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
31225839
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
237 additions
and
48 deletions
+237
-48
Semibold.css
src/assets/css/Semibold.css
+6
-0
UpgradedVersion.css
src/assets/css/UpgradedVersion.css
+3
-0
subheading.vue
...velGroupControl/UpgradedVersion/components/subheading.vue
+167
-27
index.vue
...ravelmanager/TravelGroupControl/UpgradedVersion/index.vue
+3
-3
otherJourney.vue
...nager/TravelGroupControl/UpgradedVersion/otherJourney.vue
+58
-18
No files found.
src/assets/css/Semibold.css
View file @
866cf80a
@font-face
{
font-family
:
"FZCuSong-B09S"
;
src
:
url("../webfont/FZCSJW.ttf")
format
(
"truetype"
);
font-style
:
normal
;
font-weight
:
normal
;
}
@font-face
{
font-family
:
"PingFangSC-Semibold"
;
src
:
url("../webfont/Semibold.eot")
;
/* IE9 */
...
...
src/assets/css/UpgradedVersion.css
View file @
866cf80a
...
...
@@ -13,6 +13,9 @@
.z-index3
{
z-index
:
3
;
}
.row
{
display
:
flex
;
}
.row-aic
{
display
:
flex
;
align-items
:
center
;
...
...
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/subheading.vue
View file @
866cf80a
<
template
>
<div
class=
"UpgradedVersion-subheading"
>
<div
class=
"UpgradedVersion-subIde absolute z-index3"
>
<div
class=
"UpgradedVersion-subIdeBj relative"
>
<vEditDiv
class=
"absolute"
:canEdit=
'canEdit2'
v-model=
"first2"
></vEditDiv>
<!-- UpgradedVersion-otherSubheading 宿、食、景 标记 -->
<div
class=
"UpgradedVersion-otherSubheading"
>
<div
class=
"UpgradedVersion-subIdeBj relative z-index2"
>
<vEditDiv
class=
"absolute"
:canEdit=
'canEdit2'
v-model=
"first2"
></vEditDiv>
</div>
<img
class=
"UpgradedVersion-titleIcon relative"
src=
"http://192.168.10.214:8130/Upload/NewTripFeature/titleIcon.png"
/>
</div>
<img
class=
"UpgradedVersion-titleIcon relative"
src=
"http://192.168.10.214:8130/Upload/NewTripFeature/titleIcon.png"
/>
<!-- 副标题 -->
<div>
<div
class=
"UpgradedVersion-subIdeText relative"
>
<!-- 宿、食、景 副标题 -->
<div
class=
"UpgradedVersion-subIdeText-box"
style=
"display: block;"
>
<div
class=
"UpgradedVersion-subIdeText absolute z-index3"
>
<vEditDiv
:canEdit=
'canEdit'
v-model=
"first"
></vEditDiv>
</div>
<div
class=
"UpgradedVersion-subIdeTitle relative"
>
<div
class=
"UpgradedVersion-subIdeTitleBj absolute z-index1"
></div>
<div
class=
"UpgradedVersion-sT relative row-aic z-index2"
>
<div
class=
"UpgradedVersion-sTL"
></div>
<div
class=
"UpgradedVersion-subIdeTitle absolute"
>
<div
class=
"UpgradedVersion-subIdeTitleBj relative z-index1"
></div>
<div
class=
"UpgradedVersion-sT relative row z-index2"
>
<div>
<div
class=
"UpgradedVersion-sTL"
>
</div>
</div>
<div
class=
"UpgradedVersion-sTR marginL20"
>
<vEditDiv
:canEdit=
'canEdit1'
v-model=
"first1"
></vEditDiv>
</div>
...
...
@@ -21,16 +26,41 @@
</div>
</div>
</div>
<!-- subIdeImgBox 食景副标题图 -->
<div
class=
"subIdeImgBox"
>
<div
class=
"UpgradedVersion-subIdeImgBox absolute row z-index1"
>
<div
class=
"UpgradedVersion-subIdeImgBoxL"
>
<img
src=
"http://192.168.10.214:8130/Upload/NewTripFeature/subheadingBj.png"
/>
</div>
<div
class=
"UpgradedVersion-subIdeImgBoxR"
>
</div>
</div>
</div>
<div
class=
"UpgradedVersion-subIdeImgForm"
>
<!-- subIdeImgForm2 食 subIdeImgForm3 景 -->
<div
class=
"UpgradedVersion-subIdeImgForm1 subIdeImgForm3 absolute z-index2"
>
<div
class=
"subIdeImg1"
>
<div
class=
"relative"
>
<img
src=
"http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"
/>
</div>
</div>
</div>
<div
class=
"UpgradedVersion-subIdeImgForm1 subIdeImgForm3-two absolute z-index2"
>
<div
class=
"subIdeImg1"
>
<div
class=
"relative"
>
<img
src=
"http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"
/>
</div>
</div>
</div>
</div>
<!-- 介绍标题 -->
<
!--
<div
class=
"UpgradedVersion-intTitle
"
>
<
div
class=
"UpgradedVersion-intTitle"
style=
"display: none;
"
>
<div
class=
"UpgradedVersion-intTitle-one absolute"
>
<vEditDiv
:canEdit=
'canEdit3'
v-model=
"first3"
></vEditDiv>
</div>
<div
class=
"UpgradedVersion-intTitle-two absolute"
>
<vEditDiv
:canEdit=
'canEdit4'
v-model=
"first4"
></vEditDiv>
</div>
</div>
-->
</div>
</div>
</
template
>
...
...
@@ -47,12 +77,14 @@
return
{
first
:
'五星级风景美术馆'
,
first1
:
'新仓山浅间公园'
,
first2
:
'
介
绍'
,
//介绍
first2
:
'绍'
,
//介绍
first3
:
'日本旅行专家'
,
first4
:
'『印象日本』日本豪华游代名词 '
,
canEdit
:
true
,
canEdit1
:
true
,
canEdit2
:
true
,
canEdit3
:
true
,
canEdit4
:
true
,
};
},
methods
:
{
...
...
@@ -76,16 +108,23 @@
<
style
>
.UpgradedVersion-subIde
{
left
:
72px
;
top
:
827px
;
}
.UpgradedVersion-subIdeBj
{
left
:
72px
;
top
:
827px
;
width
:
154px
;
height
:
155px
;
background
:
url('http://192.168.10.214:8130/Upload/NewTripFeature/titleBj.png')
no-repeat
center
;
background-size
:
100%
100%
;
overflow
:
hidden
;
}
.UpgradedVersion-otherSubheading
.UpgradedVersion-subIdeBj
{
left
:
85px
;
top
:
840px
;
width
:
120px
;
height
:
120px
;
}
.UpgradedVersion-subIdeBj
.edit_div
{
left
:
18px
;
top
:
37px
;
...
...
@@ -94,16 +133,28 @@
font-weight
:
bold
;
color
:
#FFFFFF
;
}
.UpgradedVersion-otherSubheading
.UpgradedVersion-subIdeBj
.edit_div
{
left
:
30px
;
top
:
20px
;
}
.UpgradedVersion-titleIcon
{
width
:
64px
;
height
:
28px
;
left
:
189px
;
top
:
-80px
;
left
:
242px
;
top
:
748px
;
}
.UpgradedVersion-otherSubheading
.UpgradedVersion-titleIcon
{
left
:
236px
;
top
:
784px
;
}
.UpgradedVersion-subIdeText-box
{
}
.UpgradedVersion-subIdeText
{
left
:
189px
;
width
:
240px
;
left
:
237px
;
top
:
944px
;
right
:
350px
;
top
:
-70px
;
height
:
38px
;
overflow
:
hidden
;
font-size
:
30px
;
...
...
@@ -112,8 +163,9 @@
color
:
#2A2A2A
;
}
.UpgradedVersion-subIdeTitle
{
left
:
31px
;
top
:
-80px
;
left
:
67px
;
top
:
1001px
;
right
:
683px
;
}
.UpgradedVersion-subIdeTitleBj
{
width
:
233px
;
...
...
@@ -121,16 +173,18 @@
background
:
#D23181
;
opacity
:
0.2
;
border-radius
:
50%
;
left
:
-
41
px
;
top
:
-
69
px
;
left
:
-
24
px
;
top
:
-
92
px
;
}
.UpgradedVersion-sT
{
left
:
-6px
;
top
:
29px
;
width
:
354px
;
left
:
18px
;
top
:
-230px
;
}
.UpgradedVersion-sTL
{
width
:
17px
;
height
:
63px
;
height
:
100%
;
line-height
:
62px
;
background
:
#CC0066
;
border-radius
:
9px
;
}
...
...
@@ -140,6 +194,92 @@
font-weight
:
400
;
color
:
#2A2A2A
;
}
.UpgradedVersion-sTR
.edit_div
{
padding
:
8px
0
;
}
.UpgradedVersion-subIdeImgBox
{
top
:
1008px
;
right
:
0
;
width
:
476px
;
height
:
39px
;
overflow
:
hidden
;
border-top-left-radius
:
19px
;
border-bottom-left-radius
:
19px
;
}
.subIdeImgBox
.UpgradedVersion-subIdeImgBox
{
top
:
1062px
;
width
:
598px
;
}
.UpgradedVersion-subIdeImgBox
div
{
height
:
39px
;
}
.UpgradedVersion-subIdeImgBoxL
{
width
:
44px
;
flex-shrink
:
0
;
}
.UpgradedVersion-subIdeImgBoxL
img
{
width
:
44px
;
height
:
1005
;
}
.UpgradedVersion-subIdeImgBoxR
{
margin-left
:
12px
;
flex-grow
:
1
;
background
:
#CC0066
;
}
.UpgradedVersion-subIdeImgForm1
{
top
:
919px
;
right
:
81px
;
width
:
351px
;
height
:
207px
;
overflow
:
hidden
;
border-radius
:
25px
;
background
:
#ECF6FB
;
padding
:
10px
;
}
.UpgradedVersion-subIdeImgForm1.subIdeImgForm2
{
left
:
569px
;
top
:
933px
;
right
:
74px
;
width
:
270px
;
height
:
207px
;
}
.UpgradedVersion-subIdeImgForm1.subIdeImgForm2-two
{
left
:
770px
;
top
:
843px
;
right
:
84px
;
width
:
270px
;
height
:
207px
;
}
.UpgradedVersion-subIdeImgForm1.subIdeImgForm3
{
left
:
569px
;
top
:
933px
;
right
:
74px
;
width
:
198px
;
height
:
207px
;
}
.UpgradedVersion-subIdeImgForm1.subIdeImgForm3-two
{
left
:
787px
;
top
:
933px
;
right
:
84px
;
width
:
270px
;
height
:
207px
;
}
.subIdeImg1
{
height
:
187px
;
border-radius
:
14px
;
overflow
:
hidden
;
}
.subIdeImg1
div
{
left
:
0px
;
top
:
0px
;
}
.subIdeImg1
div
img
{
left
:
0
;
top
:
0
;
width
:
100%
;
height
:
100%
;
}
.UpgradedVersion-intTitle
{
text-align
:
center
;
}
...
...
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/index.vue
View file @
866cf80a
...
...
@@ -5,12 +5,12 @@
<!-- logo -->
<Header></Header>
<!-- 首页 -->
<
featureHome></featureHome
>
<
!--
<featureHome></featureHome>
--
>
<!-- 其余页 -->
<
!--
<
div>
<div>
<headerTitle></headerTitle>
<otherJourney></otherJourney>
</div>
-->
</div>
</div>
</div>
</
template
>
...
...
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/otherJourney.vue
View file @
866cf80a
<
template
>
<div
class=
"otherJourney-form"
>
<!-- 主图 -->
<MasterMapList></MasterMapList>
<!-- 副标题 -->
<subheading></subheading>
<!-- otherJourney-otherDetails 宿、食 景详情 -->
<div
class=
"otherJourney-otherDetails"
>
<div
class=
"otherJourney-details absolute z-index1"
>
<vEditDiv
:canEdit=
'canEdit'
v-model=
"first"
></vEditDiv>
</div>
</div>
<!-- otherJourney-footer 食景日本料理 -->
<div
class=
""
>
<div
class=
"otherJourney-introduceFooter absolute z-index1"
>
<vEditDiv
class=
"absolute z-index2"
:canEdit=
'canEdit1'
v-model=
"first1"
></vEditDiv>
</div>
</div>
</div>
</
template
>
<
script
>
import
MasterMapList
from
"./components/MasterMapList"
;
import
subheading
from
"./components/subheading"
;
import
vEditDiv
from
"../TravelTemp/VEditDiv"
;
export
default
{
components
:
{
MasterMapList
,
subheading
subheading
,
vEditDiv
},
props
:
{
// FeatureData
},
data
()
{
return
{
first
:
'森之京都~椿山庄.'
,
first1
:
'风景美术馆日本平系列'
,
first2
:
'顶鸠级住屋宿.温泉.美食.铁道之旅'
,
first3
:
'秋 季 国 庆 森 之 京 都 七 日'
,
first4
:
'枫叶隧道列车之旅,日本米其林星级美食与住宿追寻,秋季赏枫+网红打卡漫游 </br> 印象日本全新改版行程日本旅游新体验'
,
first5
:
'在古老的日本樱花街道'
,
first6
:
'遇见最美好的自己'
,
first7
:
'冲绳 大阪城公园湖 伊豆 大阪'
,
first8
:
'大阪 京都 富士山 伊豆 东京 京都'
,
first
:
'印象日本独家使用京 都 车 站旁 的 京都 千 饭店 ~酒店房间 37 平 方公 尺! 房型 多样 设 计, 京都千饭店外观为京町家的格子风格,非常引人注目。饭店以「Personal Comfort Hotel」为概念所打造,意思就是追求每个人入住时的舒适感。从有着庭院的大厅穿过以京町家的内庭长廊为主题所建的信道,便可看见用玻璃纱创作的艺术装置随风轻柔地飘动着。再往旁边一看,眼前只见充满开放感的挑高空间。有如通往神社寺庙大门般的大型阶梯充满了存在感。在柔和的光线包围下,一瞬间忘了自己是身处在建筑物之中。让人联想到京都传统建筑的内部装潢没有刻意的高调奢华,但连小细节都做得非常精致,散发出古都特有的风情。低調沉穩的寬敞客房。讓入住者可以從陽台或窗邊觀賞庭園的綠色景緻,同時享受頂級的休閒時光。 '
,
canEdit
:
true
,
first1
:
'欧洲线'
,
canEdit1
:
true
,
canEdit2
:
true
,
canEdit3
:
true
,
canEdit4
:
true
,
canEdit5
:
true
,
canEdit6
:
true
,
canEdit7
:
true
,
canEdit8
:
true
,
};
},
methods
:
{
...
...
@@ -60,5 +62,43 @@
</
script
>
<
style
>
.otherJourney-details
{
top
:
1137px
;
left
:
70px
;
right
:
70px
;
height
:
330px
;
overflow
:
hidden
;
font-size
:
23px
;
font-family
:
Microsoft
YaHei
;
font-weight
:
400
;
color
:
#444444
;
line-height
:
42px
;
}
.otherJourney-otherDetails
.otherJourney-details
{
top
:
1164px
;
}
.otherJourney-introduceFooter
{
left
:
0
;
right
:
0
;
bottom
:
0
;
width
:
100%
;
height
:
34px
;
background
:
url('http://192.168.10.214:8130/Upload/NewTripFeature/introduceButtom.png')
no-repeat
center
;
background-size
:
100%
100%
;
}
.otherJourney-introduceFooter
.edit_div
{
width
:
70px
;
height
:
30px
;
text-align
:
center
;
overflow
:
hidden
;
right
:
145px
;
bottom
:
0
;
font-size
:
22px
;
font-family
:
FZCuSong-B09S
;
font-weight
:
400
;
color
:
#2A2A2A
;
}
.otherJourney-footer
.otherJourney-introduceFooter
{
background
:
#CC0066
;
}
</
style
>
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