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
0de36292
Commit
0de36292
authored
Feb 18, 2020
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加视频显示
parent
a97d63f5
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
70 additions
and
13 deletions
+70
-13
fiveday.vue
src/components/trip/block/fiveday.vue
+14
-2
fourday.vue
src/components/trip/block/fourday.vue
+14
-2
index.vue
src/components/trip/block/index.vue
+4
-1
oneday.vue
src/components/trip/block/oneday.vue
+10
-4
threeday.vue
src/components/trip/block/threeday.vue
+21
-3
twoday.vue
src/components/trip/block/twoday.vue
+7
-1
No files found.
src/components/trip/block/fiveday.vue
View file @
0de36292
...
...
@@ -4,7 +4,13 @@
<div
class=
"five-box"
>
<div
class=
"left"
>
<div
class=
"image"
>
<template
v-if=
"day.details[0].fileType&&day.details[0].fileType=='.mp4'"
>
<video
ref=
"myVideo"
width=
"100%"
height=
"100%"
:src=
"day.details[0].videoPath"
controls=
"controls"
>
</video>
</
template
>
<
template
v-else
>
<img
:src=
'day.details[0].img'
:style=
"
{position: 'relative',top:day.details[0].scenicJson.y + 'px'}"/>
</
template
>
</div>
<div
class=
"item"
>
<h3
v-html=
"day.details[0].title"
@
click
.
stop=
"goUrl(day.details[0].url)"
style=
"cursor: pointer"
></h3>
...
...
@@ -29,7 +35,13 @@
<div
class=
"item"
>
<div
class=
"three-item"
>
<div
class=
"image"
>
<
template
v-if=
"item.fileType&&item.fileType=='.mp4'"
>
<video
ref=
"myVideo"
width=
"100%"
height=
"100%"
:src=
"item.videoPath"
controls=
"controls"
>
</video>
</
template
>
<
template
v-else
>
<img
:src=
'item.img'
/>
</
template
>
</div>
<h3
v-html=
"item.title"
@
click
.
stop=
"goUrl(item.url)"
style=
"cursor: pointer"
></h3>
<div
class=
"playInfo"
>
...
...
src/components/trip/block/fourday.vue
View file @
0de36292
...
...
@@ -3,7 +3,13 @@
<div
class=
"one-block"
>
<div
class=
"item big"
>
<div
class=
"left"
>
<template
v-if=
"day.details[0].fileType&&day.details[0].fileType=='.mp4'"
>
<video
ref=
"myVideo"
width=
"100%"
height=
"100%"
:src=
"day.details[0].videoPath"
controls=
"controls"
>
</video>
</
template
>
<
template
v-else
>
<img
:src=
'day.details[0].img'
/>
</
template
>
</div>
<div
class=
"right"
>
<div
class=
"details"
>
...
...
@@ -29,7 +35,13 @@
<div
class=
"item"
>
<div
class=
"three-item"
>
<div
class=
"image"
>
<
template
v-if=
"item.fileType&&item.fileType=='.mp4'"
>
<video
ref=
"myVideo"
width=
"100%"
height=
"100%"
:src=
"item.videoPath"
controls=
"controls"
>
</video>
</
template
>
<
template
v-else
>
<img
:src=
'item.img'
/>
</
template
>
</div>
<h3
v-html=
"item.title"
@
click
.
stop=
"goUrl(item.url)"
style=
"cursor: pointer"
></h3>
<div
class=
"playInfo"
>
...
...
src/components/trip/block/index.vue
View file @
0de36292
...
...
@@ -110,7 +110,10 @@ export default {
playTimeHour
:
y
.
childItem
.
playTimeHour
,
playTimeMinutes
:
y
.
childItem
.
playTimeMinutes
,
url
:
y
.
childItem
.
url
,
scenicJson
:
y
.
childItem
.
scenicJson
scenicJson
:
y
.
childItem
.
scenicJson
,
videoPath
:
y
.
childItem
.
imaArray
[
0
].
videoPath
,
fileType
:
y
.
childItem
.
imaArray
[
0
].
fileType
,
}
jin
.
push
(
obj
)
}
else
if
(
y
.
type
==
3
&&
y
.
childItem
.
hotelName
!=
''
&&
y
.
childItem
.
imaArray
.
length
>
0
){
...
...
src/components/trip/block/oneday.vue
View file @
0de36292
...
...
@@ -3,10 +3,16 @@
<div
class=
"one-block"
>
<div
class=
"item big"
>
<div
class=
"left"
>
<template
v-if=
"day.details[0].fileType&&day.details[0].fileType=='.mp4'"
>
<video
ref=
"myVideo"
width=
"100%"
height=
"100%"
:src=
"day.details[0].videoPath"
controls=
"controls"
>
</video>
</
template
>
<
template
v-else
>
<img
v-if=
"day.details[0].img!=''"
:src=
'day.details[0].img'
/>
<img
v-else-if=
"day.dayNum==1 && day.details[0].img==''"
src=
'../../../assets/img/nll.jpg'
/>
<img
v-else-if=
"day.islast && day.details[0].img==''"
src=
'../../../assets/img/nll.jpg'
/>
<img
v-else
src=
'../../../assets/img/activy.jpg'
/>
</
template
>
</div>
<div
class=
"right"
>
<div
class=
"details"
>
...
...
src/components/trip/block/threeday.vue
View file @
0de36292
...
...
@@ -3,7 +3,13 @@
<div
class=
"two-block"
>
<div
class=
"item big"
>
<div
class=
"left"
>
<template
v-if=
"day.details[0].fileType&&day.details[0].fileType=='.mp4'"
>
<video
ref=
"myVideo"
width=
"100%"
height=
"100%"
:src=
"day.details[0].videoPath"
controls=
"controls"
>
</video>
</
template
>
<
template
v-else
>
<img
:src=
'day.details[0].img'
:style=
"
{position: 'relative',top:day.details[0].scenicJson.y + 'px'}" />
</
template
>
</div>
<div
class=
"right"
>
<div
class=
"details"
>
...
...
@@ -48,7 +54,13 @@
<el-col
:span=
"16"
>
<div
class=
"item hor-box"
>
<div
class=
"image"
>
<
template
v-if=
"day.details[1].fileType&&day.details[1].fileType=='.mp4'"
>
<video
ref=
"myVideo"
width=
"100%"
height=
"100%"
:src=
"day.details[1].videoPath"
controls=
"controls"
>
</video>
</
template
>
<
template
v-else
>
<img
:src=
"day.details[1].img"
:style=
"
{position: 'relative',top:day.details[1].scenicJson.y + 'px'}" />
</
template
>
</div>
</div>
</el-col>
...
...
@@ -57,7 +69,13 @@
<el-col
:span=
"16"
>
<div
class=
"item hor-box"
>
<div
class=
"image"
>
<
template
v-if=
"day.details[2].fileType&&day.details[2].fileType=='.mp4'"
>
<video
ref=
"myVideo"
width=
"100%"
height=
"100%"
:src=
"day.details[2].videoPath"
controls=
"controls"
>
</video>
</
template
>
<
template
v-else
>
<img
:src=
"day.details[2].img"
:style=
"
{position: 'relative',top:day.details[2].scenicJson.y + 'px'}" />
</
template
>
</div>
</div>
</el-col>
...
...
src/components/trip/block/twoday.vue
View file @
0de36292
...
...
@@ -5,7 +5,13 @@
<el-col
:span=
"12"
v-for=
"item in day.details"
:key=
"item.dayNum"
>
<div
class=
"item"
>
<div
class=
"up"
>
<template
v-if=
"item.fileType&&item.fileType=='.mp4'"
>
<video
ref=
"myVideo"
width=
"100%"
height=
"100%"
:src=
"item.videoPath"
controls=
"controls"
>
</video>
</
template
>
<
template
v-else
>
<img
:src=
'item.img'
/>
</
template
>
</div>
<div
class=
"down"
>
<h3
v-if=
'item.title!=""'
v-html=
"item.title"
@
click
.
stop=
"goUrl(item.url)"
style=
"cursor: pointer"
></h3>
...
...
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