Commit 96ece275 authored by xiabin's avatar xiabin

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/common/models/Course.php
parents 3c56cb0d 7efe5423
...@@ -4,8 +4,8 @@ namespace common\models; ...@@ -4,8 +4,8 @@ namespace common\models;
use Yii; use Yii;
use yii\behaviors\TimestampBehavior; use yii\behaviors\TimestampBehavior;
use yii\data\Pagination;
use yii\helpers\HtmlPurifier; use yii\helpers\HtmlPurifier;
use yii\redis\ActiveQuery;
use yii\redis\ActiveRecord; use yii\redis\ActiveRecord;
/** /**
...@@ -83,7 +83,7 @@ class Course extends \yii\db\ActiveRecord ...@@ -83,7 +83,7 @@ class Course extends \yii\db\ActiveRecord
['price', 'integer', 'min' => 0, 'max' => 9999], ['price', 'integer', 'min' => 0, 'max' => 9999],
['free_time', 'integer', 'min' => 0, 'max' => 15], ['free_time', 'integer', 'min' => 0, 'max' => 15],
['recommend', 'boolean'], ['recommend', 'boolean'],
[['recommend', 'comment_count', 'favorite_count', 'support_count', 'play_count'], 'default', 'value' => 0], [['recommend', 'comment_count', 'favorit_count', 'support_count', 'play_count'], 'default', 'value' => 0],
['status', 'in', 'range' => [0, 1, 2, 3]] ['status', 'in', 'range' => [0, 1, 2, 3]]
]; ];
} }
...@@ -127,26 +127,37 @@ class Course extends \yii\db\ActiveRecord ...@@ -127,26 +127,37 @@ class Course extends \yii\db\ActiveRecord
/** /**
* 获取课程列表 * 获取课程列表
* @param $classId *
* @param $page 从0开始 * @param int $classId
* @param $num * @param int $page 从0开始,如果传入null则使用系统分页机制,并返回 pagination 对象
* @param int $num
* @param int $status 要获取的状态,null代表获取全部,默认为只获取审核通过的课程
* @return array * @return array
*/ */
public static function getCourseListsByClassId($classId, $page, $num) public static function getCourseListsByClassId($classId, $page=0, $num=10, $status=self::STATUS_OK)
{ {
$status = self::STATUS_OK; $cond = ['class_id'=>$classId];
$condition = "class_id=:class_id and status=$status"; $status !== null && $cond['status'] = $status;
$params = [':class_id' => $classId];
//获取总数 //获取总数
$count = self::find()->where($condition, $params)->count(); $count = self::find()->where($cond)->count();
$start = $page * $num; $return = ['count'=>$count, 'data' =>[]];
if ($page === null) {
$pagination = new Pagination(['totalCount' => $count, 'pageSize'=>$num, 'forcePageParam'=>false]);
$offset = $pagination->offset;
$return['pagination'] = $pagination;
} else {
$offset = $page * $num;
}
if ($count > 0) { if ($count > 0) {
$data = self::find()->select('id,user_id,price,name,intro,preview_pic,recommend,play_count,comment_count,favorite_count,support_count,created_at')->where($condition, $params)->limit($num)->offset($start)->with('teachers')->asArray()->all(); $return['data'] = self::find()
->select('id,user_id,price,name,intro,preview_pic,recommend,play_count,comment_count,favorite_count,created_at')
->where($cond)->limit($num)->offset($offset)->with('teachers')->asArray()->all();
} }
return [
'count' => $count, return $return;
'data' => $data
];
} }
/** /**
......
...@@ -21,6 +21,7 @@ class m160927_115114_classes_init extends Migration ...@@ -21,6 +21,7 @@ class m160927_115114_classes_init extends Migration
'id_name' => $this->string(64)->notNull(), 'id_name' => $this->string(64)->notNull(),
'name' => $this->string(64)->notNull(), 'name' => $this->string(64)->notNull(),
'intro' => $this->text()->notNull(), 'intro' => $this->text()->notNull(),
'desc' => $this->text()->notNull()->comment('案例资源'),
'status' => $this->smallInteger()->notNull()->defaultValue(0)->comment('0 未审核 1 审核通过 2 审核不通过 3 锁定 '), 'status' => $this->smallInteger()->notNull()->defaultValue(0)->comment('0 未审核 1 审核通过 2 审核不通过 3 锁定 '),
'created_at' => $this->integer()->notNull(), 'created_at' => $this->integer()->notNull(),
'updated_at' => $this->integer()->notNull(), 'updated_at' => $this->integer()->notNull(),
......
...@@ -17,16 +17,20 @@ class m160927_121107_course_init extends Migration ...@@ -17,16 +17,20 @@ class m160927_121107_course_init extends Migration
$this->createTable($this->table, [ $this->createTable($this->table, [
'id' => $this->primaryKey()->unsigned(), 'id' => $this->primaryKey()->unsigned(),
'user_id' => $this->integer()->notNull()->unsigned(), 'user_id' => $this->integer()->notNull()->unsigned(),
'classed_id' => $this->integer()->notNull()->unsigned(), 'class_id' => $this->integer(10)->notNull()->unsigned(),
'name' => $this->string(32)->notNull(), 'name' => $this->string(32)->notNull(),
'price' => $this->integer()->notNull(), 'price' => $this->integer(10)->notNull()->defaultValue(0),
'free_time' => $this->integer()->notNull(), 'free_time' => $this->integer(10)->notNull()->defaultValue(0),
'intro' => $this->text()->notNull(), 'intro' => $this->text()->notNull(),
'preview_pic' => $this->string(255)->notNull(), 'preview_pic' => $this->string(255)->notNull(),
'recommend' => $this->smallInteger()->notNull()->defaultValue(0)->comment('0 表示推荐 1推荐'), 'recommend' => $this->smallInteger()->notNull()->defaultValue(0)->comment('0 表示推荐 1推荐'),
'status' => $this->smallInteger()->notNull()->defaultValue(0)->comment('0 未审核 1 审核通过 2 审核不通过 3 锁定 '), 'status' => $this->smallInteger()->notNull()->defaultValue(0)->comment('0 未审核 1 审核通过 2 审核不通过 3 锁定 '),
'play_count' => $this->integer(10)->unsigned()->notNull()->defaultValue(0)->comment('播放次数'),
'comment_count' => $this->integer(8)->unsigned()->notNull()->defaultValue(0)->comment('评论次数'),
'favorite_count' => $this->integer(8)->unsigned()->notNull()->defaultValue(0)->comment('收藏次数'),
'support_count' => $this->integer(8)->unsigned()->notNull()->defaultValue(0)->comment('点赞次数'),
'created_at' => $this->integer()->notNull(), 'created_at' => $this->integer()->notNull(),
'updated_at' => $this->integer()->notNull(), 'updated_at' => $this->integer()->notNull()
], $tableOptions); ], $tableOptions);
$this->createIndex( $this->createIndex(
'index-user_id-status', 'index-user_id-status',
......
...@@ -20,12 +20,16 @@ class m160927_121625_courseware_init extends Migration ...@@ -20,12 +20,16 @@ class m160927_121625_courseware_init extends Migration
'course_id' => $this->integer()->notNull()->unsigned(), 'course_id' => $this->integer()->notNull()->unsigned(),
'type' => $this->smallInteger()->notNull()->defaultValue(0)->unsigned()->comment('课件类型 默认0'), 'type' => $this->smallInteger()->notNull()->defaultValue(0)->unsigned()->comment('课件类型 默认0'),
'name' => $this->string(128)->notNull(), 'name' => $this->string(128)->notNull(),
'status' => $this->smallInteger()->notNull()->defaultValue(0)->comment('0 未审核 1 审核通过 2 审核不通过 3 锁定 '), 'status' => $this->smallInteger()->notNull()->defaultValue(0)->comment('0 未审核, 1 审核通过, 2 审核不通过, 3 锁定'),
'size' => $this->string(32)->notNull()->comment('文件大小 kb'), 'size' => $this->integer(10)->notNull()->unsigned()->comment('文件大小/bytes'),
'time' => $this->string(32)->notNull()->comment('视频时间 秒'), 'time' => $this->smallInteger(8)->unsigned()->notNull()->comment('视频时间/秒'),
'format' => $this->string(16)->notNull()->comment('格式'), 'format' => $this->string(16)->notNull()->comment('格式'),
'play_count' => $this->integer(10)->unsigned()->notNull()->defaultValue(0)->comment('播放次数'),
'comment_count' => $this->integer(8)->unsigned()->notNull()->defaultValue(0)->comment('评论次数'),
'favorite_count' => $this->integer(8)->unsigned()->notNull()->defaultValue(0)->comment('收藏次数'),
'support_count' => $this->integer(8)->unsigned()->notNull()->defaultValue(0)->comment('点赞次数'),
'created_at' => $this->integer()->notNull(), 'created_at' => $this->integer()->notNull(),
'updated_at' => $this->integer()->notNull(), 'updated_at' => $this->integer()->notNull()
], $tableOptions); ], $tableOptions);
$this->addCommentOnTable($this->table, '用户课件表'); $this->addCommentOnTable($this->table, '用户课件表');
$this->createIndex('index-course_id', $this->table, 'course_id'); $this->createIndex('index-course_id', $this->table, 'course_id');
......
...@@ -44,23 +44,27 @@ class MyCourseController extends \yii\web\Controller ...@@ -44,23 +44,27 @@ class MyCourseController extends \yii\web\Controller
]; ];
} }
/**
* 课程列表
*
* @return string
*/
public function actionIndex() public function actionIndex()
{ {
//return $this->render('index'); $list = Course::getCourseListsByClassId($this->classStatus['id'], null, 6, null);
return $this->render('index', ['list'=>$list['data'], 'pagination'=>$list['pagination']]);
} }
/** /**
* 发布课程 * 发布课程
* *
* @param int $id
* @return string * @return string
*/ */
public function actionPublish() public function actionPublish($id=0)
{ {
/* @var \common\components\Qiniu $qiniu */ /* @var \common\components\Qiniu $qiniu */
$qiniu = Yii::$app->qiniu; $qiniu = Yii::$app->qiniu;
//$auth = Yii::$app->qiniu->getAuthInstance();
//$returnBody = '{"uuid":$(uuid), "key": "$(key)", "size": $(fsize), "w":$(imageInfo.width), "h":$(imageInfo.height)}';
//图片上传Token //图片上传Token
//$imgName = 'preview/'.$qiniu->genRandomDir().'/'.Yii::$app->security->generateRandomString(20); //$imgName = 'preview/'.$qiniu->genRandomDir().'/'.Yii::$app->security->generateRandomString(20);
...@@ -219,7 +223,14 @@ class MyCourseController extends \yii\web\Controller ...@@ -219,7 +223,14 @@ class MyCourseController extends \yii\web\Controller
Utils::ajaxResponse(true, '', ['course_id'=>$course->id]); Utils::ajaxResponse(true, '', ['course_id'=>$course->id]);
} }
/**
* 显示课程状态
*
* @return string|Response
* @throws \yii\web\ForbiddenHttpException
* @throws \yii\web\NotFoundHttpException
*/
public function actionResult() public function actionResult()
{ {
$id = Yii::$app->request->get('id'); $id = Yii::$app->request->get('id');
......
...@@ -42,8 +42,7 @@ class TeacherManagerController extends \yii\web\Controller ...@@ -42,8 +42,7 @@ class TeacherManagerController extends \yii\web\Controller
*/ */
public function actionIndex() public function actionIndex()
{ {
$data = Teacher::fetchTeachers($this->classStatus['id']); $data = Teacher::fetchTeachers($this->classStatus['id'], 0, 100);
return $this->render('index', compact('data')); return $this->render('index', compact('data'));
} }
...@@ -100,8 +99,13 @@ class TeacherManagerController extends \yii\web\Controller ...@@ -100,8 +99,13 @@ class TeacherManagerController extends \yii\web\Controller
} }
$oldAvatar = $model->avatar; $oldAvatar = $model->avatar;
} }
$data = [];
foreach (['name', 'intro', 'avatar'] as $k) {
$data[$k] = Yii::$app->request->post($k);
}
$model->load(Yii::$app->request->post()); $model->load($data);
$model->class_id = $this->classStatus['id']; $model->class_id = $this->classStatus['id'];
//认领头像文件 //认领头像文件
......
...@@ -27,7 +27,7 @@ $this->beginContent('@app/views/layouts/center.php'); ...@@ -27,7 +27,7 @@ $this->beginContent('@app/views/layouts/center.php');
<div class="link"><i class="icon-ondemand_video"></i>我的课程<i class="icon-navigate_next"></i></div> <div class="link"><i class="icon-ondemand_video"></i>我的课程<i class="icon-navigate_next"></i></div>
<ul class="submenu"> <ul class="submenu">
<li><a href="/my-course/publish">发布课程</a></li> <li><a href="/my-course/publish">发布课程</a></li>
<li><a href="#">课程列表</a></li> <li><a href="/my-course">课程列表</a></li>
</ul> </ul>
</li> </li>
<li> <li>
......
<?php <?php
/* @var $this yii\web\View */ /**
?> * @var $this yii\web\View
<h1>my-course/index</h1> * @var $list array
* @var $pagination yii\data\Pagination
*/
use yii\helpers\Url;
use yii\widgets\LinkPager;
$this->title = '课程列表';
<p> /**
You may change the content of this page by modifying * @var $qiniu common\components\Qiniu;
the file <code><?= __FILE__; ?></code>. */
</p> $qiniu = \Yii::$app->qiniu;
?>
<div class="cls-list-box clearfix">
<?php foreach ($list as $course) { ?>
<div class="col-md-4">
<div class="cls-box-main">
<div class="video-img-box">
<a href="<?=Url::to(['video/index', 'id'=>$course['id']])?>" target="_blank"><img src="<?=$qiniu->getUrl('public', $course['preview_pic'])?>-m.preview"></a>
<div class="video-list-cnt">
<div class="tit"><a href="<?=Url::to(['video/index', 'id'=>$course['id']])?>" target="_blank"><?=$course['name']?></a></div>
<?php if ($course['teachers']) { ?>
<div class="teacher">讲师:<?=join(',', array_column($course['teachers'], 'name'))?></div>
<?php } ?>
<div class="description"><?=mb_substr(strip_tags($course['intro']), 0, 250)?></div>
</div>
<div class="outline">
<span><?=$course['play_count']?> 次播放</span> · <span><?=$course['comment_count']?> 次评论</span> · <span><?=$course['favorite_count']?> 收藏</span>
</div>
<!--<div class="edit"><a href="<?=Url::to(['my-course/publish', 'id'=>$course['id']])?>"><i class="icon-mode_edit"></i></a></div>-->
</div>
</div>
</div>
<?php } ?>
</div>
<?=LinkPager::widget(['pagination'=>$pagination])?>
\ No newline at end of file
...@@ -806,7 +806,7 @@ textarea.input-r-control { ...@@ -806,7 +806,7 @@ textarea.input-r-control {
.cls-box-main { .cls-box-main {
margin: 0 10px 40px 10px; margin: 0 10px 40px 10px;
background-color: #fff; background-color: #fff;
height: 350px; height: 370px;
} }
.video-img-box { .video-img-box {
position: relative; position: relative;
...@@ -837,6 +837,11 @@ textarea.input-r-control { ...@@ -837,6 +837,11 @@ textarea.input-r-control {
color: #999; color: #999;
margin-top: 5px; margin-top: 5px;
} }
.video-list-cnt .teacher {
font-size: 12px;
margin-top: 5px;
color: #666;
}
.video-img-box .outline { .video-img-box .outline {
position: absolute; position: absolute;
bottom: 10px; bottom: 10px;
......
...@@ -169,8 +169,8 @@ a,a:hover,a:link { ...@@ -169,8 +169,8 @@ a,a:hover,a:link {
border-radius: 100%; border-radius: 100%;
} }
.v-tit, .v-tit,
.v-price, .v-foot,
.v-foot { .v-teacher-list {
padding: 0 10px; padding: 0 10px;
} }
.v-tit { .v-tit {
...@@ -181,17 +181,21 @@ a,a:hover,a:link { ...@@ -181,17 +181,21 @@ a,a:hover,a:link {
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
.v-teacher-list {
font-size: 12px;
color: #666;
}
.v-tit a { .v-tit a {
color: #333333; color: #333333;
} }
.v-price { .v-price {
color: #ef2f11; color: #ef2f11;
padding-bottom: 10px;
} }
.v-foot { .v-foot {
position: relative; position: relative;
font-size: 12px; font-size: 12px;
color: #999; color: #999;
padding-top: 10px;
} }
.v-detail { .v-detail {
position: absolute; position: absolute;
...@@ -302,21 +306,26 @@ a,a:hover,a:link { ...@@ -302,21 +306,26 @@ a,a:hover,a:link {
border-top: none; border-top: none;
} }
.video-teacher { .video-teacher {
padding: 15px; padding: 10px;
display: inline-block;
text-align: center;
width: 60px;
} }
.video-teacher a { .video-teacher a {
color: #333; color: #333;
} }
.video-teacher img{ .video-teacher img{
float: left; width: 40px;
width: 50px; height: 40px;
height: 50px;
border-radius: 100%; border-radius: 100%;
margin-right: 10px;
} }
.video-teacher p { .video-teacher p {
font-size: 16px; font-size: 12px;
margin: 5px 0 0; margin: 5px 0 0;
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
} }
.video-teacher span { .video-teacher span {
font-size: 12px; font-size: 12px;
......
...@@ -181,7 +181,6 @@ ul, ...@@ -181,7 +181,6 @@ ul,
ol, ol,
li { li {
list-style: none; list-style: none;
float: left;
} }
i, em { i, em {
......
...@@ -806,7 +806,7 @@ textarea.input-r-control { ...@@ -806,7 +806,7 @@ textarea.input-r-control {
.cls-box-main { .cls-box-main {
margin: 0 10px 40px 10px; margin: 0 10px 40px 10px;
background-color: #fff; background-color: #fff;
height: 350px; height: 370px;
} }
.video-img-box { .video-img-box {
position: relative; position: relative;
...@@ -837,6 +837,11 @@ textarea.input-r-control { ...@@ -837,6 +837,11 @@ textarea.input-r-control {
color: #999; color: #999;
margin-top: 5px; margin-top: 5px;
} }
.video-list-cnt .teacher {
font-size: 12px;
margin-top: 5px;
color: #666;
}
.video-img-box .outline { .video-img-box .outline {
position: absolute; position: absolute;
bottom: 10px; bottom: 10px;
......
...@@ -58,13 +58,38 @@ ...@@ -58,13 +58,38 @@
<img src="img/videobg.jpg"> <img src="img/videobg.jpg">
<span class="play-mask"><i class="glyphicon glyphicon-play-circle"></i></span> <span class="play-mask"><i class="glyphicon glyphicon-play-circle"></i></span>
</a> </a>
<!--头像--> <!--<span><img src="img/avatar2.jpg"></span>-->
<span><img src="img/avatar2.jpg"></span>
</div> </div>
<div class="v-tit"><a href="#">英国为什么比中国先为什么比中国先进入工业时代?</a></div> <div class="v-tit"><a href="#">英国为什么比中国先为什么比中国先进入工业时代?</a></div>
<div class="v-price"><small>¥</small>81.00</div> <div class="v-teacher-list">
讲师:高帆,罗永浩,华妃
</div>
<div class="v-foot">
<p class="v-price"><small>¥</small>81.00</p>
<div class="v-detail">
<span><i class="icon-comment-full"></i> 12031</span>
<span><i class="icon-fav-full"></i> 87</span>
<span><i class="icon-zan-full"></i> 331</span>
</div>
</div>
</div>
</div>
<div class="col-md-4">
<div class="v-main-box">
<div class="v-screen">
<a href="#">
<img src="img/videobg.jpg">
<span class="play-mask"><i class="glyphicon glyphicon-play-circle"></i></span>
</a>
<!--<span><img src="img/avatar2.jpg"></span>-->
</div>
<div class="v-tit"><a href="#">英国为什么比中国先为什么比中国先进入工业时代?</a></div>
<div class="v-teacher-list">
讲师:高帆,罗永浩,华妃
</div>
<div class="v-foot"> <div class="v-foot">
<p>5天前</p> <p class="v-price"><small>¥</small>81.00</p>
<div class="v-detail"> <div class="v-detail">
<span><i class="icon-comment-full"></i> 12031</span> <span><i class="icon-comment-full"></i> 12031</span>
<span><i class="icon-fav-full"></i> 87</span> <span><i class="icon-fav-full"></i> 87</span>
...@@ -81,13 +106,14 @@ ...@@ -81,13 +106,14 @@
<img src="img/videobg.jpg"> <img src="img/videobg.jpg">
<span class="play-mask"><i class="glyphicon glyphicon-play-circle"></i></span> <span class="play-mask"><i class="glyphicon glyphicon-play-circle"></i></span>
</a> </a>
<!--头像--> <!--<span><img src="img/avatar2.jpg"></span>-->
<span><img src="img/avatar2.jpg"></span>
</div> </div>
<div class="v-tit"><a href="#">英国为什么比中国先为什么比中国先进入工业时代?</a></div> <div class="v-tit"><a href="#">英国为什么比中国先为什么比中国先进入工业时代?</a></div>
<div class="v-price"><small>¥</small>81.00</div> <div class="v-teacher-list">
讲师:高帆,罗永浩,华妃
</div>
<div class="v-foot"> <div class="v-foot">
<p>5天前</p> <p class="v-price"><small>¥</small>81.00</p>
<div class="v-detail"> <div class="v-detail">
<span><i class="icon-comment-full"></i> 12031</span> <span><i class="icon-comment-full"></i> 12031</span>
<span><i class="icon-fav-full"></i> 87</span> <span><i class="icon-fav-full"></i> 87</span>
...@@ -104,13 +130,14 @@ ...@@ -104,13 +130,14 @@
<img src="img/videobg.jpg"> <img src="img/videobg.jpg">
<span class="play-mask"><i class="glyphicon glyphicon-play-circle"></i></span> <span class="play-mask"><i class="glyphicon glyphicon-play-circle"></i></span>
</a> </a>
<!--头像--> <!--<span><img src="img/avatar2.jpg"></span>-->
<span><img src="img/avatar2.jpg"></span>
</div> </div>
<div class="v-tit"><a href="#">英国为什么比中国先为什么比中国先进入工业时代?</a></div> <div class="v-tit"><a href="#">英国为什么比中国先为什么比中国先进入工业时代?</a></div>
<div class="v-price"><small>¥</small>81.00</div> <div class="v-teacher-list">
讲师:高帆,罗永浩,华妃
</div>
<div class="v-foot"> <div class="v-foot">
<p>5天前</p> <p class="v-price"><small>¥</small>81.00</p>
<div class="v-detail"> <div class="v-detail">
<span><i class="icon-comment-full"></i> 12031</span> <span><i class="icon-comment-full"></i> 12031</span>
<span><i class="icon-fav-full"></i> 87</span> <span><i class="icon-fav-full"></i> 87</span>
...@@ -127,13 +154,14 @@ ...@@ -127,13 +154,14 @@
<img src="img/videobg.jpg"> <img src="img/videobg.jpg">
<span class="play-mask"><i class="glyphicon glyphicon-play-circle"></i></span> <span class="play-mask"><i class="glyphicon glyphicon-play-circle"></i></span>
</a> </a>
<!--头像--> <!--<span><img src="img/avatar2.jpg"></span>-->
<span><img src="img/avatar2.jpg"></span>
</div> </div>
<div class="v-tit"><a href="#">英国为什么比中国先为什么比中国先进入工业时代?</a></div> <div class="v-tit"><a href="#">英国为什么比中国先为什么比中国先进入工业时代?</a></div>
<div class="v-price"><small>¥</small>81.00</div> <div class="v-teacher-list">
讲师:高帆,罗永浩,华妃
</div>
<div class="v-foot"> <div class="v-foot">
<p>5天前</p> <p class="v-price"><small>¥</small>81.00</p>
<div class="v-detail"> <div class="v-detail">
<span><i class="icon-comment-full"></i> 12031</span> <span><i class="icon-comment-full"></i> 12031</span>
<span><i class="icon-fav-full"></i> 87</span> <span><i class="icon-fav-full"></i> 87</span>
...@@ -150,13 +178,14 @@ ...@@ -150,13 +178,14 @@
<img src="img/videobg.jpg"> <img src="img/videobg.jpg">
<span class="play-mask"><i class="glyphicon glyphicon-play-circle"></i></span> <span class="play-mask"><i class="glyphicon glyphicon-play-circle"></i></span>
</a> </a>
<!--头像--> <!--<span><img src="img/avatar2.jpg"></span>-->
<span><img src="img/avatar2.jpg"></span>
</div> </div>
<div class="v-tit"><a href="#">英国为什么比中国先为什么比中国先进入工业时代?</a></div> <div class="v-tit"><a href="#">英国为什么比中国先为什么比中国先进入工业时代?</a></div>
<div class="v-price"><small>¥</small>81.00</div> <div class="v-teacher-list">
讲师:高帆,罗永浩,华妃
</div>
<div class="v-foot"> <div class="v-foot">
<p>5天前</p> <p class="v-price"><small>¥</small>81.00</p>
<div class="v-detail"> <div class="v-detail">
<span><i class="icon-comment-full"></i> 12031</span> <span><i class="icon-comment-full"></i> 12031</span>
<span><i class="icon-fav-full"></i> 87</span> <span><i class="icon-fav-full"></i> 87</span>
...@@ -173,13 +202,14 @@ ...@@ -173,13 +202,14 @@
<img src="img/videobg.jpg"> <img src="img/videobg.jpg">
<span class="play-mask"><i class="glyphicon glyphicon-play-circle"></i></span> <span class="play-mask"><i class="glyphicon glyphicon-play-circle"></i></span>
</a> </a>
<!--头像--> <!--<span><img src="img/avatar2.jpg"></span>-->
<span><img src="img/avatar2.jpg"></span>
</div> </div>
<div class="v-tit"><a href="#">英国为什么比中国先为什么比中国先进入工业时代?</a></div> <div class="v-tit"><a href="#">英国为什么比中国先为什么比中国先进入工业时代?</a></div>
<div class="v-price"><small>¥</small>81.00</div> <div class="v-teacher-list">
讲师:高帆,罗永浩,华妃
</div>
<div class="v-foot"> <div class="v-foot">
<p>5天前</p> <p class="v-price"><small>¥</small>81.00</p>
<div class="v-detail"> <div class="v-detail">
<span><i class="icon-comment-full"></i> 12031</span> <span><i class="icon-comment-full"></i> 12031</span>
<span><i class="icon-fav-full"></i> 87</span> <span><i class="icon-fav-full"></i> 87</span>
...@@ -196,13 +226,14 @@ ...@@ -196,13 +226,14 @@
<img src="img/videobg.jpg"> <img src="img/videobg.jpg">
<span class="play-mask"><i class="glyphicon glyphicon-play-circle"></i></span> <span class="play-mask"><i class="glyphicon glyphicon-play-circle"></i></span>
</a> </a>
<!--头像--> <!--<span><img src="img/avatar2.jpg"></span>-->
<span><img src="img/avatar2.jpg"></span>
</div> </div>
<div class="v-tit"><a href="#">英国为什么比中国先为什么比中国先进入工业时代?</a></div> <div class="v-tit"><a href="#">英国为什么比中国先为什么比中国先进入工业时代?</a></div>
<div class="v-price"><small>¥</small>81.00</div> <div class="v-teacher-list">
讲师:高帆,罗永浩,华妃
</div>
<div class="v-foot"> <div class="v-foot">
<p>5天前</p> <p class="v-price"><small>¥</small>81.00</p>
<div class="v-detail"> <div class="v-detail">
<span><i class="icon-comment-full"></i> 12031</span> <span><i class="icon-comment-full"></i> 12031</span>
<span><i class="icon-fav-full"></i> 87</span> <span><i class="icon-fav-full"></i> 87</span>
...@@ -219,13 +250,14 @@ ...@@ -219,13 +250,14 @@
<img src="img/videobg.jpg"> <img src="img/videobg.jpg">
<span class="play-mask"><i class="glyphicon glyphicon-play-circle"></i></span> <span class="play-mask"><i class="glyphicon glyphicon-play-circle"></i></span>
</a> </a>
<!--头像--> <!--<span><img src="img/avatar2.jpg"></span>-->
<span><img src="img/avatar2.jpg"></span>
</div> </div>
<div class="v-tit"><a href="#">英国为什么比中国先为什么比中国先进入工业时代?</a></div> <div class="v-tit"><a href="#">英国为什么比中国先为什么比中国先进入工业时代?</a></div>
<div class="v-price"><small>¥</small>81.00</div> <div class="v-teacher-list">
讲师:高帆,罗永浩,华妃
</div>
<div class="v-foot"> <div class="v-foot">
<p>5天前</p> <p class="v-price"><small>¥</small>81.00</p>
<div class="v-detail"> <div class="v-detail">
<span><i class="icon-comment-full"></i> 12031</span> <span><i class="icon-comment-full"></i> 12031</span>
<span><i class="icon-fav-full"></i> 87</span> <span><i class="icon-fav-full"></i> 87</span>
......
...@@ -43,9 +43,16 @@ ...@@ -43,9 +43,16 @@
<div class="video-detail-info"> <div class="video-detail-info">
<div class="video-teacher"> <div class="video-teacher">
<a href="#"><img src="img/avatar2.jpg"></a> <a href="#" data-toggle="modal" data-target="#myModal2"><img src="img/avatar2.jpg"></a>
<p><a href="#">乔布斯</a></p> <p><a href="#" data-toggle="modal" data-target="#myModal2">万梓良</a></p>
<span>2016-10-08</span> </div>
<div class="video-teacher">
<a href="#" data-toggle="modal" data-target="#myModal2"><img src="img/avatar2.jpg"></a>
<p><a href="#" data-toggle="modal" data-target="#myModal2">skadodo</a></p>
</div>
<div class="video-teacher">
<a href="#" data-toggle="modal" data-target="#myModal2"><img src="img/avatar2.jpg"></a>
<p><a href="#" data-toggle="modal" data-target="#myModal2">RandyOrton</a></p>
</div> </div>
<div class="video-sm-info pull-left"> <div class="video-sm-info pull-left">
...@@ -159,29 +166,34 @@ ...@@ -159,29 +166,34 @@
<img src="img/qrcode.jpg"> <img src="img/qrcode.jpg">
<p>请使用微信扫一扫付款</p> <p>请使用微信扫一扫付款</p>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<!--讲师信息-->
<div class="modal fade" id="myModal2" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
<h4 class="modal-title">讲师信息</h4>
</div>
<div class="modal-body">
<div class="teacher-info text-center">
<img src="img/avatar2.jpg">
<h3>欧阳夏丹</h3>
<p class="teacher-detail">
1977年7月28日出生于广西桂林,中国内地节目主持人。毕业于中国传媒大学。
</p>
</div>
</div>
</div>
</div>
</div>
<script type="text/javascript" src="js/jquery-1.11.3.min.js"></script> <script type="text/javascript" src="js/jquery-1.11.3.min.js"></script>
<script type='text/javascript' src="js/bootstrap.min.js"></script> <script type='text/javascript' src="js/bootstrap.min.js"></script>
<script type='text/javascript' src="js/swiper.min.js"></script>
<!-- Initialize Swiper -->
<script>
var swiper = new Swiper('.swiper-container', {
pagination: '.swiper-pagination',
nextButton: '.swiper-button-next',
prevButton: '.swiper-button-prev',
paginationClickable: true,
spaceBetween: 30,
centeredSlides: true,
autoplay: 2500,
autoplayDisableOnInteraction: false
});
</script>
</body> </body>
</html> </html>
\ No newline at end of file
...@@ -61,9 +61,10 @@ ...@@ -61,9 +61,10 @@
<div class="col-md-4"> <div class="col-md-4">
<div class="cls-box-main"> <div class="cls-box-main">
<div class="video-img-box"> <div class="video-img-box">
<img src="img/videoimg.jpg"> <a href="#"><img src="img/videoimg.jpg"></a>
<div class="video-list-cnt"> <div class="video-list-cnt">
<div class="tit">英国为什么比中国先进入工业时代?</div> <div class="tit"><a href="#">英国为什么比中国先进入工业时代?</a></div>
<div class="teacher">讲师:华妃,刘德华,陈华</div>
<div class="description"> <div class="description">
锁定胜局,利物浦客场取克拉万低射破门为利物克拉万低射破门为利物浦客场取得领先。库蒂尼奥破门为利物浦扩大领先优势。奥里吉爆射为利物浦锁定胜局。 锁定胜局,利物浦客场取克拉万低射破门为利物克拉万低射破门为利物浦客场取得领先。库蒂尼奥破门为利物浦扩大领先优势。奥里吉爆射为利物浦锁定胜局。
</div> </div>
...@@ -72,55 +73,118 @@ ...@@ -72,55 +73,118 @@
<span>28121 次播放</span> · <span>6721 次评论</span> · <span>212 收藏</span> <span>28121 次播放</span> · <span>6721 次评论</span> · <span>212 收藏</span>
</div> </div>
<div class="avatar"><img src="img/avatar2.jpg"></div> <div class="edit"><a href="#"><i class="icon-mode_edit"></i></a></div>
</div>
</div>
</div>
<div class="col-md-4">
<div class="cls-box-main">
<div class="video-img-box">
<a href="#"><img src="img/videoimg.jpg"></a>
<div class="video-list-cnt">
<div class="tit"><a href="#">英国为什么比中国先进入工业时代?</a></div>
<div class="teacher">讲师:华妃,刘德华,陈华</div>
<div class="description">
锁定胜局,利物浦客场取克拉万低射破门为利物克拉万低射破门为利物浦客场取得领先。库蒂尼奥破门为利物浦扩大领先优势。奥里吉爆射为利物浦锁定胜局。
</div>
</div>
<div class="outline">
<span>28121 次播放</span> · <span>6721 次评论</span> · <span>212 收藏</span>
</div>
<div class="edit"><a href="#"><i class="icon-mode_edit"></i></a></div> <div class="edit"><a href="#"><i class="icon-mode_edit"></i></a></div>
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<div class="cls-box-main"> <div class="cls-box-main">
<div class="video-img-box"> <div class="video-img-box">
<img src="img/videoimg.jpg"> <a href="#"><img src="img/videoimg.jpg"></a>
<div class="video-list-cnt"> <div class="video-list-cnt">
<div class="tit">英国为什么比中国先进入工业时代?</div> <div class="tit"><a href="#">英国为什么比中国先进入工业时代?</a></div>
<div class="teacher">讲师:华妃,刘德华,陈华</div>
<div class="description"> <div class="description">
奥里吉爆射为利物浦锁定胜局,利物浦客场取克拉万低射破门为利物浦客场取得领先。库蒂尼奥破门为利物浦扩大领先优势。得领先。 锁定胜局,利物浦客场取克拉万低射破门为利物克拉万低射破门为利物浦客场取得领先。库蒂尼奥破门为利物浦扩大领先优势。奥里吉爆射为利物浦锁定胜局。
</div> </div>
</div> </div>
<div class="outline"> <div class="outline">
<span>28121 次播放</span> · <span>6721 次评论</span> · <span>212 收藏</span> <span>28121 次播放</span> · <span>6721 次评论</span> · <span>212 收藏</span>
</div> </div>
<div class="avatar"><img src="img/avatar2.jpg"></div> <div class="edit"><a href="#"><i class="icon-mode_edit"></i></a></div>
</div>
</div>
</div>
<div class="col-md-4">
<div class="cls-box-main">
<div class="video-img-box">
<a href="#"><img src="img/videoimg.jpg"></a>
<div class="video-list-cnt">
<div class="tit"><a href="#">英国为什么比中国先进入工业时代?</a></div>
<div class="teacher">讲师:华妃,刘德华,陈华</div>
<div class="description">
锁定胜局,利物浦客场取克拉万低射破门为利物克拉万低射破门为利物浦客场取得领先。库蒂尼奥破门为利物浦扩大领先优势。奥里吉爆射为利物浦锁定胜局。
</div>
</div>
<div class="outline">
<span>28121 次播放</span> · <span>6721 次评论</span> · <span>212 收藏</span>
</div>
<div class="edit"><a href="#"><i class="icon-mode_edit"></i></a></div> <div class="edit"><a href="#"><i class="icon-mode_edit"></i></a></div>
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<div class="cls-box-main"> <div class="cls-box-main">
<div class="video-img-box"> <div class="video-img-box">
<img src="img/videoimg.jpg"> <a href="#"><img src="img/videoimg.jpg"></a>
<div class="video-list-cnt"> <div class="video-list-cnt">
<div class="tit">英国为什么比中国先进入工业时代?</div> <div class="tit"><a href="#">英国为什么比中国先进入工业时代?</a></div>
<div class="teacher">讲师:华妃,刘德华,陈华</div>
<div class="description"> <div class="description">
奥里吉爆射为利物浦锁定胜局,利物浦客场取克拉万低射破门为利物浦客场取得领先。库蒂尼奥破门为利物浦扩大领先优势。得领先。 锁定胜局,利物浦客场取克拉万低射破门为利物克拉万低射破门为利物浦客场取得领先。库蒂尼奥破门为利物浦扩大领先优势。奥里吉爆射为利物浦锁定胜局。
</div> </div>
</div> </div>
<div class="outline"> <div class="outline">
<span>28121 次播放</span> · <span>6721 次评论</span> · <span>212 收藏</span> <span>28121 次播放</span> · <span>6721 次评论</span> · <span>212 收藏</span>
</div> </div>
<div class="avatar"><img src="img/avatar2.jpg"></div> <div class="edit"><a href="#"><i class="icon-mode_edit"></i></a></div>
</div>
</div>
</div>
<div class="col-md-4">
<div class="cls-box-main">
<div class="video-img-box">
<a href="#"><img src="img/videoimg.jpg"></a>
<div class="video-list-cnt">
<div class="tit"><a href="#">英国为什么比中国先进入工业时代?</a></div>
<div class="teacher">讲师:华妃,刘德华,陈华</div>
<div class="description">
锁定胜局,利物浦客场取克拉万低射破门为利物克拉万低射破门为利物浦客场取得领先。库蒂尼奥破门为利物浦扩大领先优势。奥里吉爆射为利物浦锁定胜局。
</div>
</div>
<div class="outline">
<span>28121 次播放</span> · <span>6721 次评论</span> · <span>212 收藏</span>
</div>
<div class="edit"><a href="#"><i class="icon-mode_edit"></i></a></div> <div class="edit"><a href="#"><i class="icon-mode_edit"></i></a></div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
......
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