Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
Athena
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
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
华国豪
Athena
Commits
44102b69
Commit
44102b69
authored
Aug 15, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
93435675
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
79 additions
and
55 deletions
+79
-55
JuanDetails.vue
src/components/taskPage/JuanDetails.vue
+29
-4
JuanList.vue
src/components/taskPage/JuanList.vue
+9
-29
JuanSaid.vue
src/components/taskPage/JuanSaid.vue
+41
-22
No files found.
src/components/taskPage/JuanDetails.vue
View file @
44102b69
...
...
@@ -37,7 +37,30 @@
max-width
:
100%
!important
;
}
.DetailDiv
.content
img
{
max-width
:
100%
!important
;
display
:
block
!important
;
margin
:
0
auto
!important
;
width
:
1000px
!important
;
height
:
auto
!important
;
}
.DetailDiv
.content
.wp-caption-text
{
font-size
:
12px
;
color
:
gray
;
}
.DetailDiv
.content
{
font-size
:
14px
;
line-height
:
30px
;
font-family
:
micrsoft
yahei
;
}
.DetailDiv
.content
p
{
line-height
:
30px
;
}
.DetailDiv
.content
em
{
font-style
:
normal
;
}
.DetailDiv
.content
a
{
color
:
#000
!important
;
cursor
:
text
!important
;
text-decoration
:
none
;
}
</
style
>
<
template
>
...
...
@@ -60,7 +83,7 @@
</p>
<p
class=
"f14 c88"
style=
"margin-top:10px"
>
<img
src=
"../../assets/img/juan/icon2.png"
alt=
""
>
<
span
v-html=
"datainfo.label"
></span
>
<
el-tag
size=
"mini"
style=
"margin-left:12px;"
v-for=
"(item,ind) in labs"
:key=
"ind"
>
{{
item
}}
</el-tag
>
</p>
<div
class=
"content w1000 f14 c33"
style=
"margin-top:20px"
>
<div
v-html=
"datainfo.descriptions"
></div>
...
...
@@ -69,7 +92,7 @@
</div>
</div>
<div
class=
"w1200"
STYLE=
"padding:90px 0"
>
<
!--
<
div
class=
"w1200"
STYLE=
"padding:90px 0"
>
<p
class=
"f30"
style=
"text-align:center"
>
合作
<span
style=
"color:#EE4454"
>
. 伙伴
</span></p>
<p
class=
"f20"
style=
"color:#999999;text-align:center"
>
COOPERATIVE PARTNER
</p>
<div
style=
"margin-top:60px"
>
...
...
@@ -86,7 +109,7 @@
<img
src=
"../../assets/img/juan/c4.png"
alt=
""
>
</div>
</div>
</div>
</div>
-->
</div>
</
template
>
...
...
@@ -104,6 +127,7 @@ export default {
width
:
0
,
datainfo
:{},
id
:
0
,
labs
:[]
}
},
methods
:{
...
...
@@ -111,6 +135,7 @@ export default {
this
.
apiJavaPost
(
'/api/rssarticle/getArticleDetail'
,{
Id
:
this
.
id
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
){
this
.
datainfo
=
res
.
data
.
data
;
this
.
labs
=
this
.
datainfo
.
label
.
split
(
','
)
// console.log("res",this.datainfo)
}
else
{
this
.
Error
(
res
.
data
.
message
);
...
...
src/components/taskPage/JuanList.vue
View file @
44102b69
...
...
@@ -432,14 +432,14 @@
</div>
<div
class=
"GreyDiv"
>
<p
class=
"f30"
style=
"text-align:center"
>
旅行
体验师
</p>
<
!--
<p
class=
"f20"
style=
"color:#999999;text-align:center"
>
Hot Destinations
</p>
--
>
<p
class=
"f30"
style=
"text-align:center"
>
旅行
<span
style=
"color:#EE4454"
>
. 体验师
</span>
</p>
<
p
class=
"f20"
style=
"color:#999999;text-align:center"
>
Hot Destinations
</p
>
<div
class=
"iconDiv"
style=
"margin-top:40px"
>
<div
class=
"w1200"
>
<div
class=
"w1200"
>
<div
class=
"iconItem"
>
<div
class=
"imgDiv"
style=
"position:relative"
>
<img
style=
"width:78px;height:78px;border-radius:50%"
src=
"../../assets/img/juan/p1.png"
alt=
""
>
<p
class=
"f14"
style=
"color:#3A4758;padding-top:30px"
>
娟娟
妹
</p>
<p
class=
"f14"
style=
"color:#3A4758;padding-top:30px"
>
卷
妹
</p>
<!--
<p
class=
"f14"
style=
"color:#A4A4B5"
>
资深旅行体验师
</p>
-->
</div>
<div
style=
"height:90px"
>
...
...
@@ -454,9 +454,9 @@
<!--
<p
class=
"f14"
style=
"color:#A4A4B5"
>
Icon name
</p>
-->
</div>
<div
style=
"height:90px"
>
大叔一名;阿公
開過美軍 Guest House,阿爸曾是日語導遊;自己當過 MV 導演、網路趨勢觀
察者,
並是國家考試合格的國際領隊;創辦過「部落客旅行團」,擔任過旅遊集團社群發展總監
;
鍾情啤酒與威士忌,旁及各種生活、娛樂與歷史題材;現任《旅飯》共同創辦人兼「旅行長
」(Chief Travel Officer)。
大叔一名;阿公
开过美軍 Guest House,阿爸曾是日语导游;自己当过 MV 导演、网络趋势观
察者,
并且是国家考试通过的国际林队;创办过「部落客旅行团」,担任过旅游集团社群的发展总监
;
钟情于啤酒喝威士忌,旁及各种生活、娱乐与历史題材;現任《旅饭》共同创办人兼「旅行长
」(Chief Travel Officer)。
</div>
</div>
...
...
@@ -467,8 +467,8 @@
<!--
<p
class=
"f14"
style=
"color:#A4A4B5"
>
Icon name
</p>
-->
</div>
<div
style=
"height:90px"
>
還沒上學之前以為自己是天才,上學之後才知道自己是廢柴,知識上癮患者兼發問狂,對自己的愚蠢擁有極高
自信,
對這個小小的世界有著過多的好奇,目前正在刻苦特訓,希望能在十年內練成龜派氣
功。
还没上学以为自己是天才,上学后才知道自己是废材,知识上瘾患者加提问狂,对自己的愚蠢拥有极高的
自信,
对这个小小的世界有极多的好奇,目前正在刻苦特训,希望能在十年內练成龟派气
功。
</div>
</div>
...
...
@@ -476,26 +476,6 @@
</div>
</div>
<div
style=
"background:#fff"
>
<div
class=
"w1200"
STYLE=
"padding:90px 0"
>
<p
class=
"f30"
style=
"text-align:center"
>
合作
<span
style=
"color:#EE4454"
>
. 伙伴
</span></p>
<p
class=
"f20"
style=
"color:#999999;text-align:center"
>
COOPERATIVE PARTNER
</p>
<div
style=
"margin-top:60px"
>
<div
class=
"partnerIcon"
>
<img
src=
"../../assets/img/juan/c1.png"
alt=
""
>
</div>
<div
class=
"partnerIcon"
>
<img
src=
"../../assets/img/juan/c2.png"
alt=
""
>
</div>
<div
class=
"partnerIcon"
>
<img
src=
"../../assets/img/juan/c3.png"
alt=
""
>
</div>
<div
class=
"partnerIcon"
>
<img
src=
"../../assets/img/juan/c4.png"
alt=
""
>
</div>
</div>
</div>
</div>
</div>
...
...
src/components/taskPage/JuanSaid.vue
View file @
44102b69
...
...
@@ -4,6 +4,29 @@
height
:
100%
;
transition
:
all
0.6s
;
}
.tst-one
{
background
:
url('../../assets/img/juan/bg3.jpg')
100%
center
;
background-size
:
cover
;
}
.tst-two
{
background
:
url('../../assets/img/juan/bg2.jpg')
100%
center
;
background-size
:
cover
;
}
.tst-three
{
background
:
url('../../assets/img/juan/bg1.jpg')
100%
center
;
background-size
:
cover
;
}
.tstt
{
background
:
url('../../assets/img/juan/bg3.jpg')
100%
center
;
background-size
:
cover
;
height
:
350px
;
cursor
:
pointer
;
}
.tstt-split
{
background
:
url('../../assets/img/juan/banner.png')
100%
center
;
background-size
:
cover
;
height
:
200px
;
}
.Homeimg
{
position
:
absolute
;
...
...
@@ -30,7 +53,7 @@
width
:
386px
;
height
:
288px
;
margin-left
:
21px
;
margin-bottom
:
30
px
;
margin-bottom
:
21
px
;
position
:
relative
;
cursor
:
pointer
;
}
...
...
@@ -141,7 +164,8 @@
<!-- 图片 -->
<div
style=
"position:relative"
>
<!--
<img
@
click=
"goUrl('Home')"
class=
"Homeimg"
src=
"../../assets/img/juan/home.png"
alt
/>
-->
<el-carousel
class=
"carousel"
style=
"height:600px"
>
<div
class=
"tstt"
@
click=
"goUrl('FoodImg2')"
></div>
<!--
<el-carousel
class=
"carousel"
style=
"height:600px"
>
<el-carousel-item>
<img
@
click=
"goUrl('FoodImg')"
src=
"../../assets/img/juan/bg1.jpg"
alt=
""
>
</el-carousel-item>
...
...
@@ -151,7 +175,7 @@
<el-carousel-item>
<img
@
click=
"goUrl('FoodImg2')"
src=
"../../assets/img/juan/bg3.jpg"
alt=
""
>
</el-carousel-item>
</el-carousel>
</el-carousel>
-->
</div>
<div
class=
"w1200"
style=
"margin-top:100px"
>
<p
class=
"f30"
style=
"text-align:center"
>
热门
<span
style=
"color:#EE4454"
>
. 目的地
</span></p>
...
...
@@ -190,18 +214,15 @@
<p
class=
"text"
><span>
京都
</span></p>
</div>
</div>
<
div
style=
"text-align:center;"
><span
@
click=
"goDestion('all')"
class=
"alldesSpan"
>
查看全部目的地
</span></div
>
<
!--
<div
style=
"text-align:center;"
><span
@
click=
"goDestion('all')"
class=
"alldesSpan"
>
查看全部目的地
</span></div>
--
>
<p
class=
"f30"
style=
"text-align:center;margin-top:100px"
>
本季
<span
style=
"color:#EE4454"
>
. 精选特惠
</span></p>
<p
class=
"f20"
style=
"color:#999999;text-align:center"
>
Selected Recommendation
</p>
<div
class=
"jxth destiDiv basefix"
>
<div
@
click=
"goUrl('FoodImg2')"
class=
"destiItem"
>
<img
src=
"../../assets/img/juan/bg3.jpg"
alt=
""
>
<div
@
click=
"goUrl('FoodImg2')"
class=
"destiItem tst-one"
>
</div>
<div
@
click=
"goUrl('Fire')"
class=
"destiItem"
>
<img
src=
"../../assets/img/juan/bg2.jpg"
alt=
""
>
<div
@
click=
"goUrl('Fire')"
class=
"destiItem tst-two"
>
</div>
<div
@
click=
"goUrl('FoodImg')"
class=
"destiItem"
>
<img
src=
"../../assets/img/juan/bg1.jpg"
alt=
""
>
<div
@
click=
"goUrl('FoodImg')"
class=
"destiItem tst-three"
>
</div>
<!--
<div
class=
"destiItem"
>
<img
src=
"../../assets/img/home/tour1.png"
alt=
""
>
...
...
@@ -211,9 +232,7 @@
</div>
-->
</div>
</div>
<div
style=
"margin-top:70px"
>
<img
src=
"../../assets/img/juan/banner.png"
alt=
""
>
</div>
<div
class=
"tstt-split"
></div>
<!--
<div
class=
"ImgDiv"
>
<div
class=
"ImgDivItem"
>
<img
src=
"../../assets/img/home/tour1.png"
alt=
""
>
...
...
@@ -229,14 +248,14 @@
</div>
</div>
-->
<div
class=
"GreyDiv"
>
<p
class=
"f30"
style=
"text-align:center"
>
热门
<span
style=
"color:#EE4454"
>
. 目的地
</span></p>
<p
class=
"f30"
style=
"text-align:center"
>
旅行
<span
style=
"color:#EE4454"
>
. 体验师
</span></p>
<p
class=
"f20"
style=
"color:#999999;text-align:center"
>
Hot Destinations
</p>
<div
class=
"iconDiv"
style=
"margin-top:40px"
>
<div
class=
"w1200"
>
<div
class=
"iconItem"
>
<div
class=
"imgDiv"
style=
"position:relative"
>
<img
style=
"width:78px;height:78px;border-radius:50%"
src=
"../../assets/img/juan/p1.png"
alt=
""
>
<p
class=
"f14"
style=
"color:#3A4758;padding-top:30px"
>
娟娟
妹
</p>
<p
class=
"f14"
style=
"color:#3A4758;padding-top:30px"
>
卷
妹
</p>
<!--
<p
class=
"f14"
style=
"color:#A4A4B5"
>
资深旅行体验师
</p>
-->
</div>
<div
style=
"height:90px"
>
...
...
@@ -251,9 +270,9 @@
<!--
<p
class=
"f14"
style=
"color:#A4A4B5"
>
Icon name
</p>
-->
</div>
<div
style=
"height:90px"
>
大叔一名;阿公
開過美軍 Guest House,阿爸曾是日語導遊;自己當過 MV 導演、網路趨勢觀
察者,
並是國家考試合格的國際領隊;創辦過「部落客旅行團」,擔任過旅遊集團社群發展總監
;
鍾情啤酒與威士忌,旁及各種生活、娛樂與歷史題材;現任《旅飯》共同創辦人兼「旅行長
」(Chief Travel Officer)。
大叔一名;阿公
开过美軍 Guest House,阿爸曾是日语导游;自己当过 MV 导演、网络趋势观
察者,
并且是国家考试通过的国际林队;创办过「部落客旅行团」,担任过旅游集团社群的发展总监
;
钟情于啤酒喝威士忌,旁及各种生活、娱乐与历史題材;現任《旅饭》共同创办人兼「旅行长
」(Chief Travel Officer)。
</div>
</div>
...
...
@@ -264,8 +283,8 @@
<!--
<p
class=
"f14"
style=
"color:#A4A4B5"
>
Icon name
</p>
-->
</div>
<div
style=
"height:90px"
>
還沒上學之前以為自己是天才,上學之後才知道自己是廢柴,知識上癮患者兼發問狂,對自己的愚蠢擁有極高
自信,
對這個小小的世界有著過多的好奇,目前正在刻苦特訓,希望能在十年內練成龜派氣
功。
还没上学以为自己是天才,上学后才知道自己是废材,知识上瘾患者加提问狂,对自己的愚蠢拥有极高的
自信,
对这个小小的世界有极多的好奇,目前正在刻苦特训,希望能在十年內练成龟派气
功。
</div>
</div>
...
...
@@ -273,7 +292,7 @@
</div>
</div>
<div
class=
"w1200"
STYLE=
"padding:90px 0"
>
<
!--
<
div
class=
"w1200"
STYLE=
"padding:90px 0"
>
<p
class=
"f30"
style=
"text-align:center"
>
合作
<span
style=
"color:#EE4454"
>
. 伙伴
</span></p>
<p
class=
"f20"
style=
"color:#999999;text-align:center"
>
COOPERATIVE PARTNER
</p>
<div
style=
"margin-top:60px"
>
...
...
@@ -290,7 +309,7 @@
<img
src=
"../../assets/img/juan/c4.png"
alt=
""
>
</div>
</div>
</div>
</div>
-->
</div>
</
template
>
...
...
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