Commit 7364a947 authored by 杨培's avatar 杨培

Merge remote-tracking branch 'origin/dev' into dev

parents 4ca17efb c4f8805c
......@@ -169,7 +169,7 @@ class Course extends \yii\db\ActiveRecord
if ($count > 0) {
$return['data'] = self::find()
->select('id,user_id,price,name,intro,preview_pic,recommend,play_count,comment_count,favorite_count,created_at')
->select('id,user_id,price,name,intro,preview_pic,recommend,status,play_count,comment_count,favorite_count,created_at,updated_at')
->where($cond)->orderBy(['id'=>SORT_DESC])->limit($num)->offset($offset)->with('teachers')->asArray()->all();
}
......
......@@ -21,6 +21,7 @@ use yii\filters\AccessControl;
use yii\helpers\ArrayHelper;
use yii\helpers\Html;
use yii\web\ForbiddenHttpException;
use yii\web\HttpException;
class HomeController extends \yii\web\Controller
{
......@@ -60,6 +61,7 @@ class HomeController extends \yii\web\Controller
* 首页
* @param $classId 课堂id
* @return string
* @throws HttpException
*/
public function actionIndex($classId)
{
......@@ -71,7 +73,7 @@ class HomeController extends \yii\web\Controller
'classInfo' => $classInfo
]);
} else {
throw new InvalidParamException('参数错误');
throw new HttpException(404, '页面不存在');
}
}
......@@ -82,7 +84,7 @@ class HomeController extends \yii\web\Controller
* @param $classId
* @param $page
* @param int $num
* @throws ForbiddenHttpException
* @throws HttpException
*/
public function actionGetCourseLists($classId, $page, $num = 10)
{
......@@ -90,7 +92,7 @@ class HomeController extends \yii\web\Controller
if ($page >= 0 and $num > 0) {
$result = Course::getCourseListsByClassId($classId, $page, $num);
} else {
throw new InvalidParamException('参数错误');
throw new HttpException(404, '页面不存在');
}
} else {
throw new ForbiddenHttpException('非法请求');
......@@ -118,18 +120,19 @@ class HomeController extends \yii\web\Controller
* 视频播放页面
* @param $courseId
* @return string
* @throws HttpException
*/
public function actionVideo($courseId)
{
$coursewareInfo = Courseware::findOne(['course_id' => $courseId, 'status' => Courseware::STATUS_OK]);
$course = Course::findOne(['id' => $courseId]);
if($course === NULL){
throw new InvalidParamException('参数错误');
if ($course === NULL and $coursewareInfo['status'] != Courseware::STATUS_OK) {
throw new HttpException(404, '页面不存在');
}
$teachers = $course->teachers;
$userId = Yii::$app->user->id;
if ($coursewareInfo === NULL) {
throw new InvalidParamException('参数错误');
throw new HttpException(404, '页面不存在');
} else {
$coursewareInfo = $coursewareInfo->toArray();
$coursewareInfo['previewUrl'] = Yii::$app->qiniu->getUrl('public', $course->preview_pic);
......@@ -145,9 +148,9 @@ class HomeController extends \yii\web\Controller
$order = Orders::findByUserIdAndCourseId($userId, $courseId);
$coursewareInfo['isShop'] = ($order !== NULL and $order->status === Orders::PAID ? TRUE : FALSE);
}
if($coursewareInfo['isShop']){
if ($coursewareInfo['isShop']) {
$coursewareInfo['videoUrl'] = Yii::$app->qiniu->getUrl('video', $coursewareInfo['src_stand']);
}else{
} else {
$coursewareInfo['videoUrl'] = Yii::$app->qiniu->getUrl('video', $coursewareInfo['src_free']);
}
unset($coursewareInfo['src_stand']);
......@@ -157,7 +160,7 @@ class HomeController extends \yii\web\Controller
$coursewareInfo['className'] = Classes::findOne(['id' => $course->class_id])->name;
$coursewareInfo['isMobile'] = Yii::$app->deviceDetect->isMobile();
//处理讲师头像
foreach ($coursewareInfo['teachers'] as $key => $value){
foreach ($coursewareInfo['teachers'] as $key => $value) {
$coursewareInfo['teachers'][$key]['avatar'] = User::getAvatarUrl($value['avatar']);
}
return $this->render('video', [
......@@ -166,6 +169,58 @@ class HomeController extends \yii\web\Controller
}
}
/**
* 预览页
*/
public function actionPreview($courseId)
{
$coursewareInfo = Courseware::findOne(['course_id' => $courseId, 'status' => Courseware::STATUS_OK]);
$course = Course::findOne(['id' => $courseId]);
if ($course === NULL or Yii::$app->user->id !== $coursewareInfo['user_id']) {
throw new HttpException(404, '页面不存在');
}
$teachers = $course->teachers;
$userId = Yii::$app->user->id;
if ($coursewareInfo === NULL) {
throw new HttpException(404, '页面不存在');
} else {
$coursewareInfo = $coursewareInfo->toArray();
$coursewareInfo['previewUrl'] = Yii::$app->qiniu->getUrl('public', $course->preview_pic);
$coursewareInfo['intro'] = $course->intro;
$coursewareInfo['courseName'] = $course->name;
$coursewareInfo['teachers'] = ArrayHelper::toArray($teachers);
$coursewareInfo['isGuest'] = Yii::$app->user->isGuest;
$coursewareInfo['isSupport'] = (Support::findByUserIdAndCoursewareId($userId, $coursewareInfo['id']) === NULL ? FALSE : TRUE);
$coursewareInfo['isFavorite'] = (Favorite::findByUserIdAndCoursewareId($userId, $coursewareInfo['id']) === NULL ? FALSE : TRUE);
$coursewareInfo['isShop'] = FALSE;
if (!Yii::$app->user->isGuest) {
$coursewareInfo['userAvatar'] = User::getAvatarUrl(Yii::$app->user->identity->avatar);
$order = Orders::findByUserIdAndCourseId($userId, $courseId);
$coursewareInfo['isShop'] = ($order !== NULL and $order->status === Orders::PAID ? TRUE : FALSE);
}
if ($coursewareInfo['isShop']) {
$coursewareInfo['videoUrl'] = Yii::$app->qiniu->getUrl('video', $coursewareInfo['src_stand']);
} else {
$coursewareInfo['videoUrl'] = Yii::$app->qiniu->getUrl('video', $coursewareInfo['src_free']);
}
unset($coursewareInfo['src_stand']);
unset($coursewareInfo['src_free']);
$coursewareInfo['price'] = $course->price;
$coursewareInfo['classId'] = $course->class_id;
$coursewareInfo['className'] = Classes::findOne(['id' => $course->class_id])->name;
$coursewareInfo['isMobile'] = Yii::$app->deviceDetect->isMobile();
//处理讲师头像
foreach ($coursewareInfo['teachers'] as $key => $value) {
$coursewareInfo['teachers'][$key]['avatar'] = User::getAvatarUrl($value['avatar']);
}
return $this->render('preview', [
'coursewareInfo' => $coursewareInfo
]);
}
}
/**
* 获取评论列表
* @param $coursewareId
......
<?php
/**
* Created by PhpStorm.
* User: xiabin
* Date: 2016/10/26
* Time: 下午5:55
*/
$this->title = "{$coursewareInfo['courseName']}-{$coursewareInfo['className']}";
\frontend\assets\AppAsset::addCss($this, '@web/assets/css/main.css');
\frontend\assets\AppAsset::addScript($this, '@web/assets/home_video.js');
\frontend\assets\AppAsset::addCss($this, '@web/assets/css/home_video.css');
$coursewareInfo['isPreview'] = true;
?>
<input type="hidden" id="courseware-info" value="<?= \yii\helpers\Html::encode(json_encode($coursewareInfo)) ?>"/>
<div id="video-container">
<video-play :courseware-info="coursewareInfo"></video-play>
<video-intro :courseware-info="coursewareInfo"></video-intro>
</div>
<div class="xs-show-bg"></div>
<div class="copyright">© 2016 c.pp.cc 皖ICP备13046642号</div>
<script type='text/javascript'>
$(function () {
modeldialog = $('.modal-dialog');
winh = $(window).height();
mth = (winh - 245)/2;
modeldialog.css('margin-top',mth);
})
</script>
\ No newline at end of file
......@@ -34,9 +34,6 @@ $this->registerJs($js);
\frontend\assets\AppAsset::addScript($this, '@web/assets/home_video.js');
\frontend\assets\AppAsset::addCss($this, '@web/assets/css/home_video.css');
?>
<style>
</style>
<input type="hidden" id="courseware-info" value="<?= \yii\helpers\Html::encode(json_encode($coursewareInfo)) ?>"/>
<div id="video-container">
<video-play :courseware-info="coursewareInfo"></video-play>
......
......@@ -17,32 +17,69 @@ $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="<?=Course::url($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="<?=Course::url($course['id'])?>" target="_blank"><?=$course['name']?></a></div>
<div class="col-md-4">
<div class="cls-box-main">
<div class="video-img-box">
<?php if ($course['status'] == '3'): ?>
<a href="javascript:;" target="_blank"><img
src="<?= $qiniu->getUrl('public', $course['preview_pic']) ?>-m.preview"></a>
<?php elseif ($course['status'] == '1'): ?>
<a href="<?= Course::url($course['id']) ?>" target="_blank"><img
src="<?= $qiniu->getUrl('public', $course['preview_pic']) ?>-m.preview"></a>
<?php elseif ($course['status'] == '2' || $course['status'] == '0'): ?>
<a href="javascript:;" target="_blank"><img
src="<?= $qiniu->getUrl('public', $course['preview_pic']) ?>-m.preview"></a>
<?php endif; ?>
<div class="video-list-cnt">
<div class="teacher">
<?php if ($course['teachers']) { ?>讲师:<?=join(', ', array_column($course['teachers'], 'name'))?><?php } ?>
</div>
<?php if ($course['status'] == '3'): ?>
<div class="tit"><a href="javascript:;"
target="_blank"><?= $course['name'] ?></a></div>
<?php elseif ($course['status'] == '1'): ?>
<div class="tit"><a href="<?= Course::url($course['id']) ?>"
target="_blank"><?= $course['name'] ?></a></div>
<?php elseif ($course['status'] == '2' || $course['status'] == '0'): ?>
<div class="tit"><a href="javascript:;"
target="_blank"><?= $course['name'] ?></a></div>
<?php endif; ?>
<div class="description"><?=mb_substr(strip_tags($course['intro']), 0, 250)?></div>
<div class="teacher"><span><?=$course['play_count']?> 次播放</span> · <span><?=$course['comment_count']?> 次评论</span> · <span><?=$course['favorite_count']?> 收藏</span></div>
</div>
<div class="teacher">
<?php if ($course['teachers']) { ?>讲师:<?= join(', ', array_column($course['teachers'], 'name')) ?><?php } ?>
</div>
<div class="description"><?= mb_substr(strip_tags($course['intro']), 0, 250) ?></div>
<?php if ($course['status'] == '1' or $course['status'] == '3'): ?>
<div class="teacher"><span><?= $course['play_count'] ?> 次播放</span> ·
<span><?= $course['comment_count'] ?> 次评论</span> ·
<span><?= $course['favorite_count'] ?>
收藏</span></div>
<?php endif; ?>
<?php if ($course['status'] == '0'): ?>
<div class="teacher">提交时间:<?= date('Y-m-d H:i:s', $course['updated_at']) ?></div>
<?php endif; ?>
<div class="edit"><a href="<?=Url::to(['my-course/edit', 'id'=>$course['id']])?>" title="编辑课程信息"><i class="icon-mode_edit"></i></a></div>
</div>
<?php if ($course['recommend'] == '1'): ?>
<span class="video-examine-icon">荐</span>
<?php endif; ?>
<?php if ($course['status'] == '0' or $course['status'] == '2'): ?>
<span class="video-examine-icon">审</span>
<?php endif; ?>
<?php if ($course['status'] != '3'): ?>
<div class="edit"><a href="<?= Url::to(['my-course/edit', 'id' => $course['id']]) ?>"
title="编辑课程信息"><i class="icon-mode_edit"></i></a></div>
<?php endif; ?>
</div>
</div>
</div>
</div>
<?php } ?>
<div class="col-md-4">
<div class="cls-box-main">
<div class="video-img-box">
<a href="#" target="_blank"><img src="http://dev.qdn.pp.cc/preview/f0/97/a3/f8s68SyefrZj3841.jpg-m.preview"></a>
<a href="#" target="_blank"><img
src="http://dev.qdn.pp.cc/preview/f0/97/a3/f8s68SyefrZj3841.jpg-m.preview"></a>
<div class="video-list-cnt">
<div class="tit"><a href="#" target="_blank">课程名称</a></div>
<div class="teacher">讲师:万达</div>
......@@ -50,23 +87,22 @@ $qiniu = \Yii::$app->qiniu;
<div class="teacher">提交时间:2016-12-09 18:09</div>
</div>
<!--<span class="video-examine-icon">审</span>-->
<span class="video-examine-icon">荐</span>
<div class="edit"><a href="<?=Url::to(['my-course/edit', 'id'=>$course['id']])?>" title="编辑课程信息"><i class="icon-mode_edit"></i></a></div>
<div class="edit"><a href="<?= Url::to(['my-course/edit', 'id' => $course['id']]) ?>" title="编辑课程信息"><i
class="icon-mode_edit"></i></a></div>
</div>
</div>
</div>
</div>
<div class="text-center">
<?=LinkPager::widget(['pagination'=>$pagination])?>
<?= LinkPager::widget(['pagination' => $pagination]) ?>
</div>
<script type='text/javascript'>
$(function () {
turmbw = $('.video-img-box img').width();
turmbh = turmbw*5/9;
$('.video-img-box img').css('height',turmbh);
turmbh = turmbw * 5 / 9;
$('.video-img-box img').css('height', turmbh);
})
</script>
......@@ -424,8 +424,8 @@ a,a:hover,a:link {
width: 100%;
left: 0;
top: 0;
height: 180px;
line-height: 180px;
height: 150px;
line-height: 150px;
text-align: center;
font-size: 64px;
color: #fff;
......@@ -507,6 +507,7 @@ a,a:hover,a:link {
background-color: #fff;
border: 1px solid #f3f3f3;
border-top: none;
padding-left: 10px;
}
.video-teacher {
padding: 10px;
......@@ -538,7 +539,7 @@ a,a:hover,a:link {
.video-sm-info {
height: 80px;
line-height: 80px;
padding-right: 30px;
padding-right: 20px;
}
.video-sm-info a {
display: inline-block;
......@@ -559,26 +560,22 @@ a,a:hover,a:link {
line-height: 30px;
top: 0;
left: 0;
font-size: 30px;
font-size: 24px;
}
/*video detail*/
.warp-box {
background-color: #fff;
margin-top: 40px;
margin-top: 20px;
padding: 20px 0;
border-top: 1px solid #f3f3f3;
}
.video-description .title {
font-size: 16px;
color: #333;
padding-bottom: 10px;
}
.video-description .text {
color: #999;
}
.video-description .text img {
max-width: 100%;
height: auto;
border: none;
vertical-align: top;
}
......@@ -586,10 +583,14 @@ a,a:hover,a:link {
.video-comment {
margin-top: 30px;
}
.video-description .title,
.video-comment .title {
font-size: 16px;
color: #333;
padding-bottom: 10px;
padding-left: 10px;
border-left: 3px solid #3f7de4;
margin-bottom: 20px;
margin-top: 20px;
}
.video-comment .title small {
font-size: 12px;
......@@ -608,30 +609,49 @@ a,a:hover,a:link {
}
.comment-box {
position: relative;
padding-left: 60px;
margin-top: 20px;
padding-bottom: 40px;
margin-bottom: 40px;
}
.comment-head img {
width: 50px;
height: 50px;
width: 34px;
height: 34px;
border-radius: 100%;
}
.comment-head {
position: absolute;
left: 0;
top: 0;
padding-right: 10px;
padding: 10px;
}
.comment-head span {
display: inline-block;
height: 34px;
line-height: 34px;
}
.comment-input {
display: block;
border: 1px solid #e7e7e7;
}
.comment-input textarea {
height: 50px;
height: 80px;
border: none;
box-shadow: none;
border-radius: inherit;
width: 100%;
vertical-align: top;
outline: none;
}
.textarea-box {
padding: 10px;
}
.btn {
outline: none;
}
.comment-foot {
border-top:1px solid #f3f3f3;
}
.m-t-10 {
margin-top: 10px;
}
.m-r-10 {
margin-right: 10px;
}
.m-l-20 {
margin-left: 20px;
}
......@@ -643,16 +663,20 @@ a,a:hover,a:link {
width: 50px;
border-radius: 100%;
}
.user-i span,
.user-i span small {
.user-i span {
font-size: 14px;
color: #999;
}
.user-i span small {
font-size:12px;
color: #999;
}
.user-i span small {
padding-left: 5px;
}
.user-i p {
padding-top: 5px;
font-size: 14px;
}
.comment-main-list {
margin-bottom: 40px;
......@@ -814,4 +838,22 @@ a,a:hover,a:link {
border: 1px solid transparent!important;
}
/*审核中视频样式*/
.video-main {
height: 500px;
width: 100%;
background-color: #444;
color: #fff;
text-align: center;
}
.video-main i {
display: block;
font-size: 48px;
padding-top: 170px;
}
.video-main p {
font-size: 16px;
margin-top: 40px;
line-height: 1.8;
}
......@@ -13,21 +13,34 @@
<small>{{coursewareInfo.comment_count}}</small>
</div>
</div>
<div v-if="coursewareInfo.isGuest" class="comment-login">
<!--<div v-if="coursewareInfo.isGuest" class="comment-login">
需要 <a @click="login" href="javascript:;">登录</a> 才能评论
</div>
</div>-->
<div v-else class="comment-box">
<div class="comment-input">
<textarea v-model="content" cols="30" rows="10" class="form-control"
placeholder="说几句吧,亲..."></textarea>
<div class="textarea-box">
<textarea v-model="content" cols="30" rows="10" placeholder="说几句吧,亲..."></textarea>
</div>
<div v-if="coursewareInfo.isGuest" class="comment-foot clearfix">
<div class="comment-head pull-left" >
<span>需要 <a @click="login" href="javascript:;">登录</a> 才能评论</span>
</div>
<div class="comment-foot clearfix">
<div class="comment-head pull-left">
<button @click="comment" class="btn btn-info pull-right m-t-10 m-r-10" disabled="disabled">发表评论</button>
</div>
<div v-else class="comment-foot clearfix">
<div class="comment-head pull-left" >
<img :src="coursewareInfo.userAvatar">
</div>
<button @click="comment" class="btn btn-default pull-right m-t-10">发表评论</button>
<button v-if="!coursewareInfo.isPreview" @click="comment" class="btn btn-primary pull-right m-t-10 m-r-10">发表评论</button>
<button v-else="!coursewareInfo.isPreview" class="btn btn-primary pull-right m-t-10 m-r-10">发表评论</button>
</div>
</div>
......
......@@ -2,13 +2,25 @@
<div class="container">
<div class="cnt-tit">
<h3>{{coursewareInfo.courseName}}</h3>
<div class="tit-share hidden-xs bdsharebuttonbox">
<div v-if="!coursewareInfo.isPreview" class="tit-share hidden-xs bdsharebuttonbox">
<a href="javascript:;" class="wechat post-icons bds_weixin" data-cmd="weixin" title="分享到微信"></a>
<a href="javascript:;" class="weibo post-icons bds_tsina" data-cmd="tsina" title="分享到新浪微博"></a>
<a href="javascript:;" class="qzone post-icons bds_qzone" data-cmd="qzone" title="分享到QQ空间"></a>
</div>
<div v-else class="tit-share hidden-xs bdsharebuttonbox">
<a href="javascript:;" class="wechat post-icons bds_weixin" data-cmd="weixin" title="分享到微信"></a>
<a href="javascript:;" class="weibo post-icons bds_tsina" data-cmd="tsina" title="分享到新浪微博"></a>
<a href="javascript:;" class="qzone post-icons bds_qzone" data-cmd="qzone" title="分享到QQ空间"></a>
</div>
</div>
<myvideo :preview-url="coursewareInfo.previewUrl" :video-url="coursewareInfo.videoUrl"></myvideo>
<myvideo v-if="!coursewareInfo.isPreview" :preview-url="coursewareInfo.previewUrl" :video-url="coursewareInfo.videoUrl"></myvideo>
<div v-else class="video-main">
<div class="video-empty" style="height:500px; width: 100%; background-color: #444; color: #fff; text-align: center;">
<i class="icon-clock"></i>
<p>课程审核中,审核通过后大家才可以看到您的课程 <br />
审核结果将以短信形式通知您</p>
</div>
</div>
<div class="video-detail-info">
<div v-for="(index,item) in coursewareInfo.teachers" class="video-teacher">
<a data-toggle="modal" data-target="{{{'#teacherInfo'+index}}}"><img
......@@ -16,38 +28,47 @@
<p><a href="javascript:;" data-toggle="modal" data-target="#myModal2">{{item.name}}</a></p>
</div>
<div class="video-sm-info pull-right">
<p class="mb-right">
<p v-if="!coursewareInfo.isPreview" class="mb-right">
<a href="javascript:;"><i class="icon-comment-empty"></i>{{coursewareInfo.comment_count}}</a>
<a @click="favorite" href="javascript:;"><i
:class="{'icon-fav-full':coursewareInfo.isFavorite,'icon-fav-empty':!coursewareInfo.isFavorite}"></i>{{coursewareInfo.favorite_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>
<p v-else class="mb-right">
<a href="javascript:;"><i class="icon-comment-empty"></i>{{coursewareInfo.comment_count}}</a>
<a href="javascript:;"><i
:class="{'icon-fav-full':coursewareInfo.isFavorite,'icon-fav-empty':!coursewareInfo.isFavorite}"></i>{{coursewareInfo.favorite_count}}</a>
<a 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 mb-left">购买
<button v-if="coursewareInfo.isPreview" class="btn btn-danger m-l-20 mb-left">购买
¥{{coursewareInfo.price}}
</button>
<template v-else>
<button v-if="coursewareInfo.isShop" class="btn btn-danger m-l-20 hidden-xs mb-left"
data-toggle="modal">已购买
<button v-if="coursewareInfo.isGuest" @click="login" class="btn btn-danger m-l-20 mb-left">购买
¥{{coursewareInfo.price}}
</button>
<template v-else>
<button v-if="isMobile === false && isWeixin === false" class="btn btn-danger m-l-20 mb-left"
data-toggle="modal"
data-target="#pay">购买 ¥{{coursewareInfo.price}}
</button>
<button v-if="isMobile === true && isWeixin === false" class="btn btn-danger m-l-20 mb-left"
@click="mobileAliPay(coursewareInfo.course_id)">购买 ¥{{coursewareInfo.price}}
</button>
<button v-if="isWeixin === true" class="btn btn-danger m-l-20 mb-left"
@click="weixinJsPay(coursewareInfo.course_id)">购买 ¥{{coursewareInfo.price}}
<button v-if="coursewareInfo.isShop" class="btn btn-danger m-l-20 hidden-xs mb-left"
data-toggle="modal" disabled="disabled">已购买
</button>
</template>
<template v-else>
<button v-if="isMobile === false && isWeixin === false" class="btn btn-danger m-l-20 mb-left"
data-toggle="modal"
data-target="#pay">购买 ¥{{coursewareInfo.price}}
</button>
<button v-if="isMobile === true && isWeixin === false" class="btn btn-danger m-l-20 mb-left"
@click="mobileAliPay(coursewareInfo.course_id)">购买 ¥{{coursewareInfo.price}}
</button>
<button v-if="isWeixin === true" class="btn btn-danger m-l-20 mb-left"
@click="weixinJsPay(coursewareInfo.course_id)">购买 ¥{{coursewareInfo.price}}
</button>
</template>
</template>
</template>
</div>
</div>
</div>
......
......@@ -6,6 +6,9 @@ body {
a,a:hover,a:link {
text-decoration: none;
}
.mx900 {
max-width: 900px!important;
}
/*icomoon*/
@font-face {
......@@ -303,9 +306,6 @@ a,a:hover,a:link {
/* Swiper幻灯 */
.swiper-container {
width: 100%;
height: 500px;
}
.swiper-slide {
text-align: center;
......@@ -326,14 +326,17 @@ a,a:hover,a:link {
-webkit-align-items: center;
align-items: center;
}
.swiper-slide img {
width: 100%;
}
/*视频列表*/
.v-list {
margin-top: 20px;
}
.v-main-box {
padding-bottom: 10px;
background-color: #fff;
height: 300px;
margin-bottom: 20px;
-webkit-transition: all 0.4s ease;
-o-transition: all 0.4s ease;
......@@ -342,12 +345,13 @@ a,a:hover,a:link {
.v-screen {
position: relative;
width: 100%;
height: 200px;
overflow: hidden;
}
.v-screen a {
position: relative;
display: block;
height: 150px;
overflow: hidden;
}
.v-screen > span {
......@@ -373,7 +377,7 @@ a,a:hover,a:link {
}
.v-tit {
height: 40px;
line-height: 40px;
line-height: 45px;
font-size: 14px;
overflow: hidden;
text-overflow: ellipsis;
......@@ -382,6 +386,8 @@ a,a:hover,a:link {
.v-teacher-list {
font-size: 12px;
color: #666;
height: 22px;
line-height: 22px;
}
.v-tit a {
color: #333333;
......@@ -410,18 +416,17 @@ a,a:hover,a:link {
}
.v-main-box:hover .play-mask {
display: inline-block;
line-height: 200px;
}
.play-mask {
display: none;
position: absolute;
background-color: rgba(0,0,0,.3);
width: 100%;
height: 200px;
left: 0;
top: 0;
height: 150px;
line-height: 150px;
text-align: center;
line-height: 200px;
font-size: 64px;
color: #fff;
-webkit-transition: all 0.4s ease;
......@@ -502,12 +507,14 @@ a,a:hover,a:link {
background-color: #fff;
border: 1px solid #f3f3f3;
border-top: none;
padding-left: 10px;
}
.video-teacher {
padding: 10px;
display: inline-block;
text-align: center;
width: 60px;
cursor: pointer;
}
.video-teacher a {
color: #333;
......@@ -532,7 +539,7 @@ a,a:hover,a:link {
.video-sm-info {
height: 80px;
line-height: 80px;
padding-right: 30px;
padding-right: 20px;
}
.video-sm-info a {
display: inline-block;
......@@ -553,32 +560,37 @@ a,a:hover,a:link {
line-height: 30px;
top: 0;
left: 0;
font-size: 30px;
font-size: 24px;
}
/*video detail*/
.warp-box {
background-color: #fff;
margin-top: 40px;
margin-top: 20px;
padding: 20px 0;
border-top: 1px solid #f3f3f3;
}
.video-description .title {
font-size: 16px;
color: #333;
padding-bottom: 10px;
}
.video-description .text {
color: #999;
}
.video-description .text img {
max-width: 100%;
height: auto;
border: none;
vertical-align: top;
}
.video-comment {
margin-top: 30px;
}
.video-description .title,
.video-comment .title {
font-size: 16px;
color: #333;
padding-bottom: 10px;
padding-left: 10px;
border-left: 3px solid #3f7de4;
margin-bottom: 20px;
margin-top: 20px;
}
.video-comment .title small {
font-size: 12px;
......@@ -597,29 +609,49 @@ a,a:hover,a:link {
}
.comment-box {
position: relative;
padding-left: 60px;
margin-top: 20px;
margin-bottom: 40px;
}
.comment-head img {
width: 50px;
height: 50px;
width: 34px;
height: 34px;
border-radius: 100%;
}
.comment-head {
position: absolute;
left: 0;
top: 0;
padding-right: 10px;
padding: 10px;
}
.comment-head span {
display: inline-block;
height: 34px;
line-height: 34px;
}
.comment-input {
display: block;
border: 1px solid #e7e7e7;
}
.comment-input textarea {
height: 50px;
height: 80px;
border: none;
box-shadow: none;
border-radius: inherit;
width: 100%;
vertical-align: top;
outline: none;
}
.textarea-box {
padding: 10px;
}
.btn {
outline: none;
}
.comment-foot {
border-top:1px solid #f3f3f3;
}
.m-t-10 {
margin-top: 10px;
}
.m-r-10 {
margin-right: 10px;
}
.m-l-20 {
margin-left: 20px;
}
......@@ -631,16 +663,20 @@ a,a:hover,a:link {
width: 50px;
border-radius: 100%;
}
.user-i span,
.user-i span small {
.user-i span {
font-size: 14px;
color: #999;
}
.user-i span small {
font-size:12px;
color: #999;
}
.user-i span small {
padding-left: 5px;
}
.user-i p {
padding-top: 5px;
font-size: 14px;
}
.comment-main-list {
margin-bottom: 40px;
......@@ -662,6 +698,7 @@ a,a:hover,a:link {
max-width: 500px;
margin: 0 auto;
color: #666;
word-break: break-all;
}
......@@ -789,4 +826,34 @@ a,a:hover,a:link {
border-top: 1px solid #f3f3f3;
z-index: 10
}
}
\ No newline at end of file
}
/*分享样式修改*/
.bd_weixin_popup_head {
font-size: 14px!important;
}
.bd_weixin_popup {
width: 260px!important;
height: 300px!important;
border: 1px solid transparent!important;
}
.video-main {
height: 500px;
width: 100%;
background-color: #444;
color: #fff;
text-align: center;
}
.video-main i {
display: block;
font-size: 48px;
padding-top: 170px;
}
.video-main p {
font-size: 16px;
margin-top: 40px;
line-height: 1.8;
}
......@@ -4,7 +4,9 @@ html {
background-color: #f3f3f3;
font-family: "Helvitica Neue",Helvitica,Arial,"Hiragino Sans GB","Microsoft YaHei","Arial Regular","Microsoft JhengHei",sans-serif;
}
a.active {
text-decoration: none;
}
.auto-main {
padding-left: 225px;
height: 100px;
......@@ -152,11 +154,11 @@ html {
padding-right: 30px;
height: 60px;
}
.avatar a {
.avatar > a {
display: block;
margin-top: 15px;
}
.avatar a img {
.avatar > a > img {
height: 30px;
width: 30px;
border-radius: 100%;
......@@ -169,13 +171,38 @@ html {
color: #999;
text-align: center;
}
.updownmenu {
display: none;
width: 120px;
position: absolute;
top:59px;
right: 0;
background-color: #fff;
border: 1px solid #e7e7e7;
text-align: center;
box-shadow: 1px 1px 20px rgba(0,0,0,.1);
}
.updownmenu li a {
display: block;
padding: 0 20px;
height: 44px;
line-height: 44px;
color: #333;
border-bottom: 1px solid #f3f3f3;
}
.updownmenu li a:hover {
background-color: #f3f3f3;
}
.avatar:hover .updownmenu {
display: block;
}
/*main*/
.tp-main {
width: 100%;
margin-top: 90px;
margin-bottom: 90px;
padding-bottom: 120px;
}
.class-name {
......@@ -187,6 +214,24 @@ html {
font-size: 18px;
color: #fff;
}
.edit-class-name input{
display: inline-block;
width: 100px;
text-align: center;
background-color: transparent;
color: #fff;
}
.edit-class-name input:focus {
border-bottom: 1px solid #fff;
}
.edit-class-name button {
background-color: transparent;
border: none;
color: #fff;
}
.nomal-class-name a {
color: #fff;
}
.class-intro {
height: 400px;
border-radius: 3px;
......@@ -218,7 +263,7 @@ html {
color: #797979;
font-size: 14px;
font-weight: normal;
padding-left: 30px;
padding: 20px 0 20px 30px;
}
.class-intro .col-md-4 p {
margin-top: 10px;
......@@ -344,6 +389,8 @@ html {
line-height: 1.8;
text-indent: 2em;
opacity: 0;
height: 120px;
overflow: hidden;
-webkit-transition: all 0.4s ease;
-o-transition: all 0.4s ease;
transition: all 0.4s ease;
......@@ -461,6 +508,22 @@ html {
background-color: rgba(0,0,0,.5);
z-index: 3;
}
.upload-avatar:hover .upload-avatar-mask {
display:block;
}
.upload-avatar-mask {
height: 100px;
display: none;
color: #fff;
background-color: rgba(0, 0, 0, 0.3);
position: absolute;
z-index: 3;
top: 0;
left: 0;
width: 100px;
border-radius: 100%;
line-height: 100px;
}
.edit-info {
position: absolute;
display: inline-block;
......@@ -513,8 +576,6 @@ html {
.teacher-info {
position: relative;
margin: 20px 0;
height: 200px;
border-bottom: 1px solid #e7e7e7;
}
.teacher-info textarea {
width: 100%;
......@@ -626,6 +687,7 @@ textarea.input-r-control {
position: relative;
margin-top: 30px;
}
.cls-part .tit {
font-size: 14px;
color: #777;
......@@ -633,13 +695,17 @@ textarea.input-r-control {
}
.cls-part .tit small {
font-size: 12px;
color: #ccc;
color: #999;
margin-left: 5px;
}
.cls-part .tit span.remind {
padding-left: 10px;
color: red;
}
.cls-part span.required {
color: red;
padding-left: 5px;
}
.rules-set label span {
display: inline-block;
float: left;
......@@ -756,7 +822,7 @@ textarea.input-r-control {
}
.upload-ready .video-loading-text {
font-size: 12px;
padding-top: 15px;
padding-top: 8px;
}
.upload-ready i {
position: absolute;
......@@ -866,11 +932,18 @@ textarea.input-r-control {
line-height: 1.6;
color: #999;
margin-top: 5px;
height: 40px;
overflow: hidden;
}
.video-list-cnt .teacher {
font-size: 12px;
margin-top: 5px;
color: #666;
height: 22px;
line-height: 22px;
}
.video-list-cnt .teacher b{
color: red;
}
.video-img-box .outline {
position: absolute;
......@@ -919,6 +992,25 @@ textarea.input-r-control {
display: inline-block;
}
.video-examine-icon {
display: block;
position: absolute;
width: 30px;
height: 30px;
text-align: center;
line-height: 30px;
top: 10px;
left: 10px;
font-size: 14px;
background-color: rgba(0,0,0,.5);
color: #fff;
border-radius: 100%;
}
.video-img-box:hover .video-examine-icon {
background-color: red;
}
.examine-box {
margin-top: 100px;
}
......@@ -971,6 +1063,7 @@ textarea.input-r-control {
font-size: 36px;
font-weight: normal;
padding-top: 40px;
line-height: 50px;
}
.reg-vip-box i,
.money-vip-box i {
......@@ -1107,7 +1200,7 @@ textarea.input-r-control {
.sm-box .price {
height: 40px;
line-height: 40px;
color: #f11300;
color: #666;
}
.play-mask {
position: absolute;
......@@ -1167,6 +1260,34 @@ textarea.input-r-control {
color: #999;
}
.loginout {
position: absolute;
display: inline-block;
width: 225px;
height: 50px;
text-align: center;
line-height: 50px;
bottom: 0;
left: 0;
background-color: #313a46;
color: #999;
}
.loginout:hover {
color: #fff;
}
.loginout i {
font-size: 14px;
padding-right: 10px;
}
/*编辑器边框颜色*/
.simditor {
border: 1px solid #f3f3f3!important;
}
.simditor-body {
text-align: left!important;
}
@media (max-width: 767px) {
.tp-sidebar {
......
......@@ -38,11 +38,15 @@
</div>
<div class="video-main">
<embed src='http://player.youku.com/player.php/sid/XMTc1NDM3MjUyNA==/v.swf' allowFullScreen='true' quality='high' width='100%' height='630' align='middle' allowScriptAccess='always' type='application/x-shockwave-flash'></embed>
<div class="video-empty" style="height:500px; width: 100%; background-color: #444; color: #fff; text-align: center;">
<i class="icon-clock"></i>
<p>课程审核中,审核通过后大家才可以看到您的课程 <br />
审核结果将以短信形式通知您</p>
</div>
</div>
<div class="video-detail-info">
<div class="video-teacher">
<div class="video-teacher pull-left">
<a href="#" data-toggle="modal" data-target="#myModal2"><img src="img/avatar2.jpg"></a>
<p><a href="#" data-toggle="modal" data-target="#myModal2">万梓良</a></p>
</div>
......@@ -55,7 +59,7 @@
<p><a href="#" data-toggle="modal" data-target="#myModal2">RandyOrton</a></p>
</div>
<div class="video-sm-info pull-left">
<div class="video-sm-info pull-right">
<a href="#"><i class="icon-comment-empty"></i>543</a>
<a href="#"><i class="icon-fav-empty"></i>31</a>
<a href="#"><i class="icon-zan-empty"></i>97</a>
......@@ -65,78 +69,86 @@
</div>
</div>
<div class="warp-box">
<div class="container">
<div class="video-description">
<div class="title">视频介绍</div>
<div class="text">
四川水煮鱼,重庆串串香,新疆羊肉串,西北烤全羊,江西酒糟鱼,湖北小龙虾,汕头牛肉丸……虽然一直信奉着“胃有多大,世界就有多大”的至理名言,奈何却被一口烂牙阻挡了前进的脚步。快来看看今天的视频,保护好你的牙齿吧!
</div>
</div>
<!--视频介绍-->
<div class="warp-box">
<div class="container">
<div class="video-description">
<div class="title">视频介绍</div>
<div class="text">
四川水煮鱼,重庆串串香,新疆羊肉串,西北烤全羊,江西酒糟鱼,湖北小龙虾,汕头牛肉丸……虽然一直信奉着“胃有多大,世界就有多大”的至理名言,奈何却被一口烂牙阻挡了前进的脚步。快来看看今天的视频,保护好你的牙齿吧!
<div class="video-comment">
<div class="title">评论 <small>607次</small></div>
</div>
</div>
<div class="video-comment">
<div class="title">评论 <small>607次</small></div>
</div>
<div class="comment-login">
需要 <a href="#">登录</a> 才能评论
</div>
<div class="comment-box">
<div class="comment-input">
<div class="textarea-box">
<textarea cols="30" rows="10" placeholder="说几句吧,亲..."></textarea>
</div>
<div class="comment-foot clearfix">
<div class="comment-head pull-left">
<img src="http://dev.qdn.pp.cc/avatar/83/96/d3/DLOhbLdU2T.jpg-m.avatar">
</div>
<button class="btn btn-primary pull-right m-t-10 m-r-10">发表评论</button>
</div>
</div>
<div class="comment-box">
<div class="comment-head">
<img src="img/avatar2.jpg">
</div>
<div class="comment-input clearfix">
<textarea name="" id="" cols="30" rows="10" class="form-control" placeholder="说几句吧,亲..."></textarea>
<button class="btn btn-default pull-right m-t-10">发表评论</button>
</div>
</div>
<div class="comment-main-list clearfix">
<div class="user-h pull-left"><img src="img/avatar2.jpg"></div>
<div class="user-i">
<span>Frank <small>10分钟前</small></span>
<p>呵呵。。。不知为什么我听了你这么说话特牙疼</p>
<div class="comment-main-list clearfix">
<div class="user-h pull-left"><img src="img/avatar2.jpg"></div>
<div class="user-i">
<span>Frank <small>10分钟前</small></span>
<p>呵呵。。。不知为什么我听了你这么说话特牙疼</p>
</div>
</div>
</div>
<div class="comment-main-list clearfix">
<div class="user-h pull-left"><img src="img/avatar2.jpg"></div>
<div class="user-i">
<span>Frank <small>10分钟前</small></span>
<p>呵呵。。。不知为什么我听了你这么说话特牙疼</p>
<div class="comment-main-list clearfix">
<div class="user-h pull-left"><img src="img/avatar2.jpg"></div>
<div class="user-i">
<span>Frank <small>10分钟前</small></span>
<p>呵呵。。。不知为什么我听了你这么说话特牙疼</p>
</div>
</div>
</div>
<div class="comment-main-list clearfix">
<div class="user-h pull-left"><img src="img/avatarMax.png"></div>
<div class="user-i">
<span>Frank <small>10分钟前</small></span>
<p>呵呵。。。不知为什么我听了你这么说话特牙疼</p>
<div class="comment-main-list clearfix">
<div class="user-h pull-left"><img src="img/avatarMax.png"></div>
<div class="user-i">
<span>Frank <small>10分钟前</small></span>
<p>呵呵。。。不知为什么我听了你这么说话特牙疼</p>
</div>
</div>
</div>
<div class="comment-main-list clearfix">
<div class="user-h pull-left"><img src="img/avatar2.jpg"></div>
<div class="user-i">
<span>Frank <small>10分钟前</small></span>
<p>呵呵。。。不知为什么我听了你这么说话特牙疼</p>
<div class="comment-main-list clearfix">
<div class="user-h pull-left"><img src="img/avatar2.jpg"></div>
<div class="user-i">
<span>Frank <small>10分钟前</small></span>
<p>呵呵。。。不知为什么我听了你这么说话特牙疼</p>
</div>
</div>
</div>
<div class="comment-main-list clearfix">
<div class="user-h pull-left"><img src="img/avatarMax.png"></div>
<div class="user-i">
<span>Frank <small>10分钟前</small></span>
<p>呵呵。。。不知为什么我听了你这么说话特牙疼</p>
<div class="comment-main-list clearfix">
<div class="user-h pull-left"><img src="img/avatarMax.png"></div>
<div class="user-i">
<span>Frank <small>10分钟前</small></span>
<p>呵呵。。。不知为什么我听了你这么说话特牙疼</p>
</div>
</div>
</div>
</div>
</div>
<!--视频介绍-->
<div class="copyright">© 2016 c.pp.cc 皖ICP备13046642号</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