Commit 7bab12ea authored by 汪波's avatar 汪波

Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev

# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
parent bd88e550
...@@ -22,10 +22,7 @@ $this->title = '我的课堂'; ...@@ -22,10 +22,7 @@ $this->title = '我的课堂';
<div role="tabpanel" class="tab-pane active" id="home"> <div role="tabpanel" class="tab-pane active" id="home">
<div class="class-name m-t-50"> <div class="class-name m-t-50">
<span class="nomal-class-name"><?=$model->name?><!-- <a href="#"><i class="icon-mode_edit"></i></a>--></span> <span class="nomal-class-name"><?=$model->name?><!-- <a href="#"><i class="icon-mode_edit"></i></a>--></span>
<div class="edit"><a href="#" title="课堂设置"><i class="icon-mode_edit"></i></a></div> <div class="edit"><a href="#" title="课堂设置"><i class="icon-mode_edit"></i></a></div>
<span class="edit-class-name" style="display: none"><input type="text" class="input-r-control"> <button class="btn btn-default">保存</button> <button class="btn btn-default">取消</button></span> <span class="edit-class-name" style="display: none"><input type="text" class="input-r-control"> <button class="btn btn-default">保存</button> <button class="btn btn-default">取消</button></span>
</div> </div>
<div class="class-intro"> <div class="class-intro">
......
...@@ -60,7 +60,9 @@ $qiniu = \Yii::$app->qiniu; ...@@ -60,7 +60,9 @@ $qiniu = \Yii::$app->qiniu;
<?php if ($course['teachers']) { ?>讲师:<?= join(', ', array_column($course['teachers'], 'name')) ?><?php } ?> <?php if ($course['teachers']) { ?>讲师:<?= join(', ', array_column($course['teachers'], 'name')) ?><?php } ?>
</div> </div>
<div class="description"><?= mb_substr(strip_tags($course['intro']), 0, 250) ?></div> <div class="teacher clearfix"><span class="pull-left">发布时间:2016-12-11</span> <span class="pull-right">时长:01:23:21</span></div>
<!--<div class="description"><?/*= mb_substr(strip_tags($course['intro']), 0, 250) */?></div>-->
<div class="teacher"> <div class="teacher">
<span><?= $course['play_count'] ?> 次播放</span> · <span><?= $course['play_count'] ?> 次播放</span> ·
......
...@@ -840,6 +840,7 @@ a,a:hover,a:link { ...@@ -840,6 +840,7 @@ a,a:hover,a:link {
/*审核中视频样式*/ /*审核中视频样式*/
.video-main { .video-main {
position: relative;
height: 500px; height: 500px;
width: 100%; width: 100%;
background-color: #444; background-color: #444;
...@@ -857,4 +858,30 @@ a,a:hover,a:link { ...@@ -857,4 +858,30 @@ a,a:hover,a:link {
line-height: 1.8; line-height: 1.8;
} }
.play-mask-box {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
text-align: center;
background-color: rgba(0,0,0,.4);
}
.look-video {
position: absolute;
left: 0;
width: 100%;
height: 110px;
top: 60%;
}
.look-video p {
margin-top: 10px;
}
.look-video a {
color: #f7b940;
}
.vjs-big-play-centered .vjs-big-play-button {
z-index: 2!important;
}
...@@ -16,6 +16,11 @@ ...@@ -16,6 +16,11 @@
<span v-if="item.teachers.length > 0">讲师:{{getTeachers(index)}}</span> <span v-if="item.teachers.length > 0">讲师:{{getTeachers(index)}}</span>
</div> </div>
<div class="v-teacher-list clearfix">
<span class="pull-left">发布时间:2016-08-04</span>
<span class="pull-right">时长:01:28:21</span>
</div>
<div class="v-foot"> <div class="v-foot">
<div class="v-price"> <div class="v-price">
<small>¥</small> <small>¥</small>
......
...@@ -4,6 +4,17 @@ ...@@ -4,6 +4,17 @@
controls preload="auto"> controls preload="auto">
<source :src="videoUrl"/> <source :src="videoUrl"/>
</video> </video>
<!-- 付费视频的样式
<img src="http://deimg.c.pp.cc/preview/f0/97/a3/f8s68SyefrZj3841.jpg" width="100%" height="auto">
<div class="play-mask-box">
<div class="look-video">
<p>本课程为付费课程,价格¥108.00 <a href="#">立即购买</a></p>
&lt;!&ndash;<p>本课程可试看2分钟</p>&ndash;&gt;
</div>
</div>
-->
</div> </div>
</template> </template>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment