Commit 1d2d4565 authored by 杨培's avatar 杨培

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

parents 05d5f8c3 7c137d0e
......@@ -10,7 +10,11 @@ use yii\helpers\Url;
$this->title = '我的课堂';
?>
<div class="class-name"><?=$model->name?></div>
<div class="class-name">
<span style="display: none"><?=$model->name?> <a href="#"><i class="icon-mode_edit"></i></a></span>
<span class="edit-class-name"><input type="text" class="input-r-control"> <button class="btn btn-default">保存</button> <button class="btn btn-default">取消</button></span>
</div>
<div class="class-intro">
<div class="col-md-4">
<h3>课程总数</h3>
......
......@@ -12,7 +12,7 @@ $this->beginPage() ?>
<meta charset="<?=\Yii::$app->charset?>">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title><?=($this->title ? Html::encode($this->title).'-' : '')?>最课堂</title>
<title><?=($this->title ? Html::encode($this->title).'-' : '')?>云涯</title>
<?php $this->head() ?>
</head>
<body>
......
......@@ -19,7 +19,7 @@ AppAsset::addCss($this, '@web/assets/css/style.css');
//
//$this->registerJs($js, View::POS_HEAD);
$js = <<<JS
/*$js = <<<JS
$(function() {
var Accordion = function(el, multiple) {
this.el = el || {};
......@@ -46,7 +46,7 @@ $(function() {
});
JS;
$this->registerJs($js, View::POS_END);
$this->registerJs($js, View::POS_END);*/
$this->registerCss('[v-cloak] {display:none;}');
?>
<?php $this->beginPage() ?>
......@@ -56,7 +56,7 @@ $this->registerCss('[v-cloak] {display:none;}');
<meta charset="<?= Yii::$app->charset ?>">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title><?= $this->title ? Html::encode($this->title) . '-' : '' ?>最课堂</title>
<title><?= $this->title ? Html::encode($this->title) . '-' : '' ?>云涯</title>
<?= Html::csrfMetaTags() ?>
<?php $this->head() ?>
</head>
......
......@@ -19,7 +19,7 @@ $this->beginContent('@app/views/layouts/center.php');
<ul class="simple-menu">
<li <?= (Yii::$app->controller->id === 'user-center' and Yii::$app->controller->action->id === 'info') ? 'class = "active"' : '' ?>>
<a href="<?= $baseUrl . '/user-center/' ?>"><i class="icon-person_pin"></i>基本信息</a>
<a href="<?= $baseUrl . '/user-center/' ?>"><i class="icon-person_pin"></i>个人信息</a>
</li>
<li <?= (Yii::$app->controller->id === 'user-center' and Yii::$app->controller->action->id === 'purchased-course') ? 'class = "active"' : '' ?>>
<a href="<?= $baseUrl . '/user-center/purchased-course' ?>"><i
......@@ -32,12 +32,18 @@ $this->beginContent('@app/views/layouts/center.php');
</li>
<li><a href="<?=$baseUrl .'/classes-info'?>"><i class="icon-school"></i>我的课堂</a></li>
<li><a href="<?=$baseUrl .'/site/logout'?>"><i class="icon-power_settings_new"></i>退出登录</a></li>
<!--
<li><a href="<?/*=$baseUrl .'/my-course'*/?>"><i class="icon-school"></i>我的课堂</a></li>
<li><a href="<?/*=$baseUrl .'/site/logout'*/?>"><i class="icon-power_settings_new"></i>退出登录</a></li>
-->
</ul>
<div class="apply-class">
<button class="btn btn-danger" onclick="location.href='/classes-info/apply';">申请课堂</button>
</div>
</div>
</div>
<div class="auto-main">
......
......@@ -23,14 +23,15 @@ $qiniu = \Yii::$app->qiniu;
<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>
<?php if ($course['teachers']) { ?>
<div class="teacher">讲师:<?=join(', ', array_column($course['teachers'], 'name'))?></div>
<?php } ?>
<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>
<div class="teacher"><span><?=$course['play_count']?> 次播放</span> · <span><?=$course['comment_count']?> 次评论</span> · <span><?=$course['favorite_count']?> 收藏</span></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/edit', 'id'=>$course['id']])?>" title="编辑课程信息"><i class="icon-mode_edit"></i></a></div>
</div>
</div>
......@@ -41,3 +42,11 @@ $qiniu = \Yii::$app->qiniu;
<div class="text-center">
<?=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);
})
</script>
......@@ -18,7 +18,7 @@ AppAsset::addCss($this, '@web/assets/css/course_publish.css');
<form method="post" name="coursePublish">
<div class="cls-part">
<div class="tit">标题</div>
<div class="tit">标题<span class="required">*</span></div>
<input type="text" name="name" class="input-r-control" placeholder="请输入课程标题,20 个汉字以内...">
</div>
......@@ -28,7 +28,7 @@ AppAsset::addCss($this, '@web/assets/css/course_publish.css');
</div>
<div class="cls-part">
<div class="tit">上传视频</div>
<div class="tit">上传视频<span class="required">*</span></div>
<video-upload uptoken="<?=$videoToken?>"></video-upload>
</div>
......@@ -51,14 +51,14 @@ AppAsset::addCss($this, '@web/assets/css/course_publish.css');
</div>
<div class="cls-part">
<div class="tit">课程介绍</div>
<div class="tit">课程介绍<span class="required">*</span></div>
<div class="cls-intro-textarea">
<textarea name="intro" class="input-r-control" placeholder="请输入课程介绍..." id="introEditor"></textarea>
</div>
</div>
<div class="cls-part">
<div class="cls-part">
<div class="tit">缩略图 <small>建议尺寸:900像素 * 500像素</small></div>
<div class="tit">缩略图<span class="required">*</span> <small>建议尺寸:900像素 * 500像素</small></div>
<thumb-upload uptoken="<?=$thumbToken?>"></thumb-upload>
</div>
......
......@@ -9,9 +9,6 @@ $baseUrl = \yii\helpers\Url::base();
?>
<div class="container">
<div class="z-m-center">
<h3>云涯</h3>
<p>欢迎来到最课堂,专注在线直播</p>
<div id="myTab" class="tab-a">
<ul>
......
......@@ -13,8 +13,7 @@ $this->registerJsFile('http://static.geetest.com/static/tools/gt.js');
?>
<div class="container">
<div class="z-m-center">
<h3>云涯</h3>
<p>欢迎来到云涯,专注在线直播</p>
<div id="myTab" class="tab-a">
<ul>
<li><a href="<?= $baseUrl . "/site/login" ?>">登录</a></li>
......
......@@ -25,9 +25,9 @@ $this->title = '浏览记录';
<img src="<?= Yii::$app->qiniu->getUrl('public', $value['course']['preview_pic']) ?>">
<div class="video-list-cnt">
<div class="tit"><a href="<?php echo $baseUrl.'/home/video?courseId='.$value['course']['id'];?>"><?=$value['course']['name']?></a></div>
<div class="price"><?=$value['course']['price']?></div>
<div class="teacher">
讲师:<?php foreach ($value['course']['teachers'] as $teaKey => $teaValue): ?>
讲师:<?php foreach ($value['course']['teachers'] as $teaKey => $teaValue): ?>
<?php if ($teaKey > 0): ?>
,<?= $teaValue['name']?>
<?php else: ?>
......@@ -35,10 +35,16 @@ $this->title = '浏览记录';
<?php endif ?>
<?php endforeach; ?>
</div>
<div class="teacher"><b>售价:¥<?=$value['course']['price']?></b></div>
<div class="teacher">
购买日期:<?=date("Y-m-d H:i:s",$value['time'])?>
</div>
</div>
<div class="outline">
<span><?=date("Y-m-d H:i:s",$value['time'])?></span>
</div>
<!--<div class="outline">
<span><?/*=date("Y-m-d H:i:s",$value['time'])*/?></span>
</div>-->
<div class="play-mask">
......@@ -62,27 +68,14 @@ $this->title = '浏览记录';
</div>
<?php endif; ?>
<div class="cls-list-box hide">
<div class="col-md-4">
<div class="cls-box-main sm-box">
<div class="video-img-box">
<img src="<?= AppAsset::getStaticUrl('img/videoimg.jpg') ?>">
<div class="video-list-cnt">
<div class="tit"><a href="#">英国为什么比中国先进入工业时代?</a></div>
<div class="price">¥182.97</div>
</div>
<div class="outline">
<span>购买日期:2016年9月12日 16:02</span>
</div>
<div class="avatar"><img src="<?= AppAsset::getStaticUrl('img/avatar2.jpg') ?>"></div>
<div class="play-mask">
<a href="#"><i class="glyphicon glyphicon-play"></i></a>
</div>
</div>
</div>
</div>
</div>
<script type='text/javascript'>
$(function () {
turmbw = $('.video-img-box img').width();
turmbh = turmbw*5/9;
$('.video-img-box img,.play-mask').css('height',turmbh);
$('.play-mask').css('padding-top',turmbh/2-20);
})
</script>
......@@ -187,6 +187,20 @@ html {
font-size: 18px;
color: #fff;
}
.edit-class-name input{
display: inline-block;
width: 100px;
text-align: center;
background-color: transparent;
}
.edit-class-name input:focus {
border-bottom: 1px solid #fff;
}
.edit-class-name button {
background-color: transparent;
border: none;
color: #fff;
}
.class-intro {
height: 400px;
border-radius: 3px;
......@@ -218,7 +232,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 +358,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 +477,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;
......@@ -626,6 +658,7 @@ textarea.input-r-control {
position: relative;
margin-top: 30px;
}
.cls-part .tit {
font-size: 14px;
color: #777;
......@@ -633,13 +666,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 +793,7 @@ textarea.input-r-control {
}
.upload-ready .video-loading-text {
font-size: 12px;
padding-top: 15px;
padding-top: 8px;
}
.upload-ready i {
position: absolute;
......@@ -833,7 +870,6 @@ textarea.input-r-control {
.cls-box-main {
margin: 0 10px 40px 10px;
background-color: #fff;
height: 370px;
}
.video-img-box {
position: relative;
......@@ -867,11 +903,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;
......@@ -972,6 +1015,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 {
......@@ -1105,9 +1149,6 @@ textarea.input-r-control {
width: 200px;
margin-left: 10px;
}
.sm-box {
height: 400px;
}
.sm-box .price {
height: 40px;
line-height: 40px;
......@@ -1120,10 +1161,8 @@ textarea.input-r-control {
left: 0;
width: 100%;
background-color: rgba(0,0,0,.2);
height: 220px;
line-height: 240px;
text-align: center;
z-index: 8;
z-index: 2;
opacity: 0;
-webkit-transition: all 0.4s ease;
-o-transition: all 0.4s ease;
......
......@@ -10,10 +10,6 @@
</template>
</div>
</template>
<style>
.upload-avatar:hover .upload-avatar-mask {display:block;}
.upload-avatar-mask {height:30px; display:none; line-height:30px; color:#CCC; background-color:rgba(0, 0, 0, 0.3); position:absolute; z-index:3; top:35px; width:100%;}
</style>
<script>
import layer from "layer-js";
import str from "../../utils/string";
......
......@@ -27,15 +27,17 @@ var vm = new Vue({
},
ready: function() {
var self = this;
this.$on("video-uploaded", function(name, data) {
self.vuid = data.uuid;
});
this.$on("thumb-uploaded", function(name, data) {
self.previewKey = data.uuid;
});
$.validator.addMethod('courseName',function (value, element, param) {
return value.indexOf('云涯');
});
var validator = $(form).validate({
//debug: true,
//errorClass: "",
......@@ -43,7 +45,8 @@ var vm = new Vue({
ignore: "",
rules: {
name: {
required: true
required: true,
courseName:true
},
preview: {
required: true
......@@ -54,7 +57,8 @@ var vm = new Vue({
},
messages: {
name: {
required: "请填写标题"
required: "请填写标题",
courseName:'课堂名称不允许出现“云涯”二字。'
},
preview: {
required: "必须上传缩略图"
......
......@@ -833,7 +833,6 @@ textarea.input-r-control {
.cls-box-main {
margin: 0 10px 40px 10px;
background-color: #fff;
height: 370px;
}
.video-img-box {
position: relative;
......@@ -1105,9 +1104,6 @@ textarea.input-r-control {
width: 200px;
margin-left: 10px;
}
.sm-box {
height: 400px;
}
.sm-box .price {
height: 40px;
line-height: 40px;
......@@ -1120,10 +1116,8 @@ textarea.input-r-control {
left: 0;
width: 100%;
background-color: rgba(0,0,0,.2);
height: 220px;
line-height: 240px;
text-align: center;
z-index: 8;
z-index: 2;
opacity: 0;
-webkit-transition: all 0.4s ease;
-o-transition: all 0.4s ease;
......
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