Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Z
zuiketang
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
夏彬
zuiketang
Commits
3d081634
Commit
3d081634
authored
Oct 19, 2016
by
xiabin
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts: # src/frontend/web/js/home/components/video-play.vue
parents
71fdce16
747f1b96
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
70 additions
and
28 deletions
+70
-28
video.php
src/frontend/views/home/video.php
+7
-0
main.css
src/frontend/web/css/main.css
+48
-4
video-play.vue
src/frontend/web/js/home/components/video-play.vue
+15
-24
No files found.
src/frontend/views/home/video.php
View file @
3d081634
...
@@ -34,5 +34,12 @@ $this->registerJs($js);
...
@@ -34,5 +34,12 @@ $this->registerJs($js);
<video-intro
:courseware-info=
"coursewareInfo"
></video-intro>
<video-intro
:courseware-info=
"coursewareInfo"
></video-intro>
</div>
</div>
<div
class=
"xs-show-bg"
></div>
<script
type=
'text/javascript'
>
$
(
function
()
{
var
wVideo
=
$
(
'.video-detail-info'
).
width
();
$
(
'#my-video-play'
).
css
(
'width'
,
wVideo
);
})
</script>
<div
class=
"copyright"
>
© 2016 c.pp.cc 皖ICP备13046642号
</div>
<div
class=
"copyright"
>
© 2016 c.pp.cc 皖ICP备13046642号
</div>
src/frontend/web/css/main.css
View file @
3d081634
...
@@ -530,12 +530,9 @@ a,a:hover,a:link {
...
@@ -530,12 +530,9 @@ a,a:hover,a:link {
color
:
#999
;
color
:
#999
;
}
}
.video-sm-info
{
.video-sm-info
{
position
:
absolute
;
height
:
80px
;
height
:
80px
;
line-height
:
80px
;
line-height
:
80px
;
right
:
15px
;
padding-right
:
30px
;
top
:
0
;
}
}
.video-sm-info
a
{
.video-sm-info
a
{
display
:
inline-block
;
display
:
inline-block
;
...
@@ -745,4 +742,51 @@ a,a:hover,a:link {
...
@@ -745,4 +742,51 @@ a,a:hover,a:link {
text-align
:
center
;
text-align
:
center
;
line-height
:
150px
;
line-height
:
150px
;
color
:
#666
;
color
:
#666
;
}
.avatar
{
padding-right
:
30px
;
height
:
60px
;
}
.avatar
a
{
display
:
block
;
margin-top
:
15px
;
}
.avatar
a
img
{
height
:
30px
;
width
:
30px
;
border-radius
:
100%
;
}
.mb-right
{
display
:
inline-block
;
margin-bottom
:
0
}
.xs-show-bg
{
display
:
none
;
}
@media
(
max-width
:
767px
)
{
.mb-left
{
position
:
fixed
!important
;
right
:
10px
!important
;
bottom
:
7px
!important
;
z-index
:
11
;
}
.mb-right
{
position
:
fixed
!important
;
left
:
10px
!important
;
bottom
:
-14px
!important
;
z-index
:
11
;
}
.xs-show-bg
{
display
:
block
;
height
:
50px
;
width
:
100%
;
position
:
fixed
;
bottom
:
0
;
left
:
0
;
background-color
:
#fff
;
border-top
:
1px
solid
#f3f3f3
;
z-index
:
10
}
}
}
\ No newline at end of file
src/frontend/web/js/home/components/video-play.vue
View file @
3d081634
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
<div
class=
"video-main"
>
<div
class=
"video-main"
>
<video
id=
"my-video-play"
class=
"video-js vjs-default-skin vjs-big-play-centered"
<video
id=
"my-video-play"
class=
"video-js vjs-default-skin vjs-big-play-centered"
controls
preload=
"auto"
>
controls
preload=
"auto"
>
<source
:src=
"coursewareInfo.videoUrl"
type=
"video/mp4"
/>
<source
:src=
"coursewareInfo.videoUrl"
type=
"video/mp4"
/>
</video>
</video>
</div>
</div>
...
@@ -22,34 +22,25 @@
...
@@ -22,34 +22,25 @@
:src="
getFullPic
(
item
.
avatar
)
"></a>
:src="
getFullPic
(
item
.
avatar
)
"></a>
<p><a href="
javascript
:;
" data-toggle="
modal
" data-target="
#
myModal2
">{{item.name
}}
</a></p>
<p><a href="
javascript
:;
" data-toggle="
modal
" data-target="
#
myModal2
">{{item.name
}}
</a></p>
</div>
</div>
<div class="
video
-
sm
-
info
pull
-
left
">
<div class="
video
-
sm
-
info
pull
-
right
">
<a href="
javascript
:;
"><i class="
icon
-
comment
-
empty
"></i>{{coursewareInfo.comment_count
}}
</a>
<p class="
mb
-
right
">
<a @click="
favorite
" href="
javascript
:;
"><i
<a href="
javascript
:;
"><i class="
icon
-
comment
-
empty
"></i>{{coursewareInfo.comment_count
}}
</a>
:class="
{
'icon-fav-full'
:
coursewareInfo
.
isFavorite
,
'icon-fav-empty'
:
!
coursewareInfo
.
isFavorite
}
"></i>{{coursewareInfo.favorite_count
}}
</a>
<a @click="
favorite
" href="
javascript
:;
"><i
<a @click="
support
" href="
javascript
:;
"><i
:class="
{
'icon-fav-full'
:
coursewareInfo
.
isFavorite
,
'icon-fav-empty'
:
!
coursewareInfo
.
isFavorite
}
"></i>{{coursewareInfo.favorite_count
}}
</a>
:class="
{
'icon-zan-full'
:
coursewareInfo
.
isSupport
,
'icon-zan-empty'
:
!
coursewareInfo
.
isSupport
}
"></i>{{coursewareInfo.support_count
}}
</a>
<a @click="
support
" href="
javascript
:;
"><i
:class="
{
'icon-zan-full'
:
coursewareInfo
.
isSupport
,
'icon-zan-empty'
:
!
coursewareInfo
.
isSupport
}
"></i>{{coursewareInfo.support_count
}}
</a>
</p>
<button v-if="
coursewareInfo
.
isGuest
" @click="
login
" class="
btn
btn
-
danger
m
-
l
-
20
">购买
<button v-if="
coursewareInfo
.
isGuest
" @click="
login
" class="
btn
btn
-
danger
m
-
l
-
20
mb
-
left
">购买
¥{{coursewareInfo.price
}}
¥{{coursewareInfo.price
}}
</button>
</button>
<template v-else>
<template v-else>
<button v-if="
coursewareInfo
.
isShop
" class="
btn
btn
-
danger
m
-
l
-
20
hidden
-
xs
" data-toggle="
modal
">已购买
<button v-if="
coursewareInfo
.
isShop
" class="
btn
btn
-
danger
m
-
l
-
20
hidden
-
xs
mb
-
left
" data-toggle="
modal
">已购买
</button>
<button v-else class="
btn
btn
-
danger
m
-
l
-
20
" data-toggle="
modal
"
data-target="
#
pay
">购买 ¥{{coursewareInfo.price
}}
</button>
</button>
<template>
<button v-if="
isMobile
===
false
and
isWeixin
===
false
" class="
btn
btn
-
danger
m
-
l
-
20
"
data-toggle="
modal
"
data-target="
#
pay
">购买 ¥{{coursewareInfo.price
}}
</button>
<button v-if="
isMobile
===
true
and
isWeixin
===
false
"
@click="
alipay
(
coursewareInfo
.
course_id
)
" class="
btn
btn
-
danger
m
-
l
-
20
"
>购买 ¥{{coursewareInfo.price
}}
</button>
<button v-if="
isWeixin
===
true
" @click="
weixinJsPay
(
coursewareInfo
.
course_id
)
"
class="
btn
btn
-
danger
m
-
l
-
20
"
>购买 ¥{{coursewareInfo.price
}}
</button>
</template>
</template>
</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