Commit a323f662 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 7c137d0e
...@@ -11,7 +11,7 @@ use yii\helpers\Url; ...@@ -11,7 +11,7 @@ use yii\helpers\Url;
$this->title = '我的课堂'; $this->title = '我的课堂';
?> ?>
<div class="class-name"> <div class="class-name">
<span style="display: none"><?=$model->name?> <a href="#"><i class="icon-mode_edit"></i></a></span> <span class="nomal-class-name" 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> <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>
......
...@@ -15,5 +15,6 @@ $this->registerMetaTag(['name' => 'keywords', 'content' => $classInfo['name']]); ...@@ -15,5 +15,6 @@ $this->registerMetaTag(['name' => 'keywords', 'content' => $classInfo['name']]);
<course-lists :class-id="classId"></course-lists> <course-lists :class-id="classId"></course-lists>
</div> </div>
<div class="copyright m-t-20">© 2016 c.pp.cc 皖ICP备13046642号</div> <div class="copyright m-t-20">© 2016 c.pp.cc 皖ICP备13046642号</div>
...@@ -34,6 +34,9 @@ $this->registerJs($js); ...@@ -34,6 +34,9 @@ $this->registerJs($js);
\frontend\assets\AppAsset::addScript($this, '@web/assets/home_video.js'); \frontend\assets\AppAsset::addScript($this, '@web/assets/home_video.js');
\frontend\assets\AppAsset::addCss($this, '@web/assets/css/home_video.css'); \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)) ?>"/> <input type="hidden" id="courseware-info" value="<?= \yii\helpers\Html::encode(json_encode($coursewareInfo)) ?>"/>
<div id="video-container"> <div id="video-container">
<video-play :courseware-info="coursewareInfo"></video-play> <video-play :courseware-info="coursewareInfo"></video-play>
...@@ -42,3 +45,12 @@ $this->registerJs($js); ...@@ -42,3 +45,12 @@ $this->registerJs($js);
<div class="xs-show-bg"></div> <div class="xs-show-bg"></div>
<div class="copyright">© 2016 c.pp.cc 皖ICP备13046642号</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>
...@@ -8,5 +8,15 @@ ...@@ -8,5 +8,15 @@
?> ?>
<div class="tp-head navbar-fixed-top clearfix"> <div class="tp-head navbar-fixed-top clearfix">
<div class="menu-btn fl"><a href="javascript:;"><i class="icon-menu"></i></a></div> <div class="menu-btn fl"><a href="javascript:;"><i class="icon-menu"></i></a></div>
<div class="avatar fr"><a href="<?= \yii\helpers\Url::base() . '/user-center/'?>"><img src="<?=\common\models\User::getAvatarUrl(Yii::$app->user->identity->avatar) ?>"></a></div> <div class="avatar fr">
<a href="<?= \yii\helpers\Url::base() . '/user-center/'?>"><img src="<?=\common\models\User::getAvatarUrl(Yii::$app->user->identity->avatar) ?>"></a>
<!--
<ul class="updownmenu">
<li><a href="#">课堂中心</a></li>
<li><a href="#">个人中心</a></li>
<li><a href="#">退出登录</a></li>
</ul>
-->
</div>
</div> </div>
...@@ -40,6 +40,7 @@ $this->beginContent('@app/views/layouts/center.php'); ...@@ -40,6 +40,7 @@ $this->beginContent('@app/views/layouts/center.php');
</ul> </ul>
</li> </li>
</ul> </ul>
<a class="loginout" href="#"><i class="icon-power_settings_new"></i>退出登录</a>
</div> </div>
</div> </div>
......
...@@ -30,8 +30,7 @@ $this->beginContent('@app/views/layouts/center.php'); ...@@ -30,8 +30,7 @@ $this->beginContent('@app/views/layouts/center.php');
<li <?= (Yii::$app->controller->id === 'user-center' and Yii::$app->controller->action->id === 'browse-record') ? 'class = "active"' : '' ?>> <li <?= (Yii::$app->controller->id === 'user-center' and Yii::$app->controller->action->id === 'browse-record') ? 'class = "active"' : '' ?>>
<a href="<?= $baseUrl . '/user-center/browse-record' ?>"><i class="icon-visibility"></i>浏览记录</a> <a href="<?= $baseUrl . '/user-center/browse-record' ?>"><i class="icon-visibility"></i>浏览记录</a>
</li> </li>
<li><a href="<?=$baseUrl .'/classes-info'?>"><i class="icon-school"></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>
<!-- <!--
<li><a href="<?/*=$baseUrl .'/my-course'*/?>"><i class="icon-school"></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> <li><a href="<?/*=$baseUrl .'/site/logout'*/?>"><i class="icon-power_settings_new"></i>退出登录</a></li>
...@@ -42,7 +41,7 @@ $this->beginContent('@app/views/layouts/center.php'); ...@@ -42,7 +41,7 @@ $this->beginContent('@app/views/layouts/center.php');
<button class="btn btn-danger" onclick="location.href='/classes-info/apply';">申请课堂</button> <button class="btn btn-danger" onclick="location.href='/classes-info/apply';">申请课堂</button>
</div> </div>
<a class="loginout" href="<?=$baseUrl .'/site/logout'?>"><i class="icon-power_settings_new"></i>退出登录</a>
</div> </div>
</div> </div>
......
...@@ -33,7 +33,7 @@ AppAsset::addCss($this, '@web/assets/css/course_publish.css'); ...@@ -33,7 +33,7 @@ AppAsset::addCss($this, '@web/assets/css/course_publish.css');
</div> </div>
<div class="cls-part"> <div class="cls-part">
<div class="tit">规则设定</div> <div class="tit">规则设定<span class="required">*</span></div>
<div class="clearfix"> <div class="clearfix">
<div class="checkbox rules-set fl"> <div class="checkbox rules-set fl">
......
...@@ -14,6 +14,9 @@ AppAsset::addCss($this, '@web/assets/css/style.css'); ...@@ -14,6 +14,9 @@ AppAsset::addCss($this, '@web/assets/css/style.css');
\Yii::$app->controller->layout = 'blank'; \Yii::$app->controller->layout = 'blank';
$css = <<<CSS $css = <<<CSS
body{
background-color: #fff;
}
.sus-tips { .sus-tips {
position: absolute; position: absolute;
left: 50%; left: 50%;
...@@ -24,8 +27,6 @@ $css = <<<CSS ...@@ -24,8 +27,6 @@ $css = <<<CSS
padding: 40px; padding: 40px;
text-align: center; text-align: center;
background-color: #fff; background-color: #fff;
border-radius: 5px;
box-shadow: 0 0 10px rgba(0,0,0,.05);
} }
.sus-tips i { .sus-tips i {
display: inline-block; display: inline-block;
......
...@@ -7,6 +7,14 @@ AppAsset::addScript($this, '@web/assets/teacher_form.js'); ...@@ -7,6 +7,14 @@ AppAsset::addScript($this, '@web/assets/teacher_form.js');
AppAsset::addCss($this, '@web/assets/css/teacher_form.css'); AppAsset::addCss($this, '@web/assets/css/teacher_form.css');
?> ?>
<style>
.simditor {
border: 1px solid #f3f3f3;
}
.simditor .simditor-body, .editor-style {
text-align: left;
}
</style>
<div class="add-box"> <div class="add-box">
<div class="add-box-main"> <div class="add-box-main">
<div class="tit"><?=$this->title?></div> <div class="tit"><?=$this->title?></div>
...@@ -20,7 +28,6 @@ AppAsset::addCss($this, '@web/assets/css/teacher_form.css'); ...@@ -20,7 +28,6 @@ AppAsset::addCss($this, '@web/assets/css/teacher_form.css');
<div class="teacher-info"> <div class="teacher-info">
<textarea id="teacher-intro" name="intro" placeholder="请输入讲师介绍..."><?=$teacher->intro?></textarea> <textarea id="teacher-intro" name="intro" placeholder="请输入讲师介绍..."><?=$teacher->intro?></textarea>
<p class="text-number">20 / 500</p>
</div> </div>
<input type="hidden" name="id" value="<?=$teacher->id?>"> <input type="hidden" name="id" value="<?=$teacher->id?>">
......
...@@ -36,10 +36,10 @@ $this->title = '浏览记录'; ...@@ -36,10 +36,10 @@ $this->title = '浏览记录';
<?php endforeach; ?> <?php endforeach; ?>
</div> </div>
<div class="teacher"><b>售价:¥<?=$value['course']['price']?></b></div> <div class="teacher">售价:¥<?=$value['course']['price']?></div>
<div class="teacher"> <div class="teacher">
购买日期:<?=date("Y-m-d H:i:s",$value['time'])?> <b>日期:<?=date("Y-m-d H:i:s",$value['time'])?></b>
</div> </div>
</div> </div>
<!--<div class="outline"> <!--<div class="outline">
......
...@@ -24,7 +24,7 @@ $this->title = '收藏记录'; ...@@ -24,7 +24,7 @@ $this->title = '收藏记录';
<div class="video-list-cnt"> <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="tit"><a href="<?php echo $baseUrl.'/home/video?courseId='.$value['course']['id'];?>"><?=$value['course']['name']?></a></div>
<div class="teacher"> <div class="teacher">
讲师:<?php foreach ($value['course']['teachers'] as $teaKey => $teaValue): ?> 讲师:<?php foreach ($value['course']['teachers'] as $teaKey => $teaValue): ?>
<?php if ($teaKey > 0): ?> <?php if ($teaKey > 0): ?>
,<?= $teaValue['name']?> ,<?= $teaValue['name']?>
<?php else: ?> <?php else: ?>
...@@ -32,10 +32,8 @@ $this->title = '收藏记录'; ...@@ -32,10 +32,8 @@ $this->title = '收藏记录';
<?php endif ?> <?php endif ?>
<?php endforeach; ?> <?php endforeach; ?>
</div> </div>
<div class="price"><?=$value['course']['price']?></div> <div class="price">售价:¥<?=$value['course']['price']?></div>
</div> <div class="teacher"><b><?=$value['course']['user']['username']?>收藏了该内容</b></div>
<div class="outline">
<span><?=$value['course']['user']['username']?>收藏了该内容</span>
</div> </div>
<div class="play-mask"> <div class="play-mask">
...@@ -62,3 +60,11 @@ $this->title = '收藏记录'; ...@@ -62,3 +60,11 @@ $this->title = '收藏记录';
<?php endif;?> <?php endif;?>
<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>
\ No newline at end of file
...@@ -32,9 +32,10 @@ $this->title = '已购课程'; ...@@ -32,9 +32,10 @@ $this->title = '已购课程';
<?= $teaValue['name']?> <?= $teaValue['name']?>
<?php endif ?> <?php endif ?>
<?php endforeach; ?> <?php endforeach; ?>
</div> </div> </div>
<div class="outline"> <div class="teacher">
<span>购买日期:<?=date("Y-m-d H:i:s",$value['updated_at'])?></span> <b><span>购买日期:<?=date("Y-m-d H:i:s",$value['updated_at'])?></span></b>
</div>
</div> </div>
......
...@@ -305,7 +305,6 @@ a,a:hover,a:link { ...@@ -305,7 +305,6 @@ a,a:hover,a:link {
.swiper-container { .swiper-container {
width: 100%; width: 100%;
height: 500px; height: 500px;
} }
.swiper-slide { .swiper-slide {
text-align: center; text-align: center;
...@@ -370,6 +369,8 @@ a,a:hover,a:link { ...@@ -370,6 +369,8 @@ a,a:hover,a:link {
.v-foot, .v-foot,
.v-teacher-list { .v-teacher-list {
padding: 0 10px; padding: 0 10px;
height: 22px;
line-height: 22px;
} }
.v-tit { .v-tit {
height: 40px; height: 40px;
...@@ -508,6 +509,7 @@ a,a:hover,a:link { ...@@ -508,6 +509,7 @@ a,a:hover,a:link {
display: inline-block; display: inline-block;
text-align: center; text-align: center;
width: 60px; width: 60px;
cursor: pointer;
} }
.video-teacher a { .video-teacher a {
color: #333; color: #333;
...@@ -571,6 +573,11 @@ a,a:hover,a:link { ...@@ -571,6 +573,11 @@ a,a:hover,a:link {
.video-description .text { .video-description .text {
color: #999; color: #999;
} }
.video-description .text img {
max-width: 100%;
border: none;
vertical-align: top;
}
.video-comment { .video-comment {
margin-top: 30px; margin-top: 30px;
...@@ -599,6 +606,7 @@ a,a:hover,a:link { ...@@ -599,6 +606,7 @@ a,a:hover,a:link {
position: relative; position: relative;
padding-left: 60px; padding-left: 60px;
margin-top: 20px; margin-top: 20px;
padding-bottom: 40px;
} }
.comment-head img { .comment-head img {
width: 50px; width: 50px;
...@@ -662,6 +670,7 @@ a,a:hover,a:link { ...@@ -662,6 +670,7 @@ a,a:hover,a:link {
max-width: 500px; max-width: 500px;
margin: 0 auto; margin: 0 auto;
color: #666; color: #666;
word-break: break-all;
} }
...@@ -789,4 +798,14 @@ a,a:hover,a:link { ...@@ -789,4 +798,14 @@ a,a:hover,a:link {
border-top: 1px solid #f3f3f3; border-top: 1px solid #f3f3f3;
z-index: 10 z-index: 10
} }
}
/*分享样式修改*/
.bd_weixin_popup_head {
font-size: 14px!important;
}
.bd_weixin_popup {
width: 260px!important;
height: 300px!important;
border: 1px solid transparent!important;
} }
\ No newline at end of file
...@@ -4,7 +4,9 @@ html { ...@@ -4,7 +4,9 @@ html {
background-color: #f3f3f3; background-color: #f3f3f3;
font-family: "Helvitica Neue",Helvitica,Arial,"Hiragino Sans GB","Microsoft YaHei","Arial Regular","Microsoft JhengHei",sans-serif; font-family: "Helvitica Neue",Helvitica,Arial,"Hiragino Sans GB","Microsoft YaHei","Arial Regular","Microsoft JhengHei",sans-serif;
} }
a.active {
text-decoration: none;
}
.auto-main { .auto-main {
padding-left: 225px; padding-left: 225px;
height: 100px; height: 100px;
...@@ -152,11 +154,11 @@ html { ...@@ -152,11 +154,11 @@ html {
padding-right: 30px; padding-right: 30px;
height: 60px; height: 60px;
} }
.avatar a { .avatar > a {
display: block; display: block;
margin-top: 15px; margin-top: 15px;
} }
.avatar a img { .avatar > a > img {
height: 30px; height: 30px;
width: 30px; width: 30px;
border-radius: 100%; border-radius: 100%;
...@@ -169,13 +171,38 @@ html { ...@@ -169,13 +171,38 @@ html {
color: #999; color: #999;
text-align: center; 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*/ /*main*/
.tp-main { .tp-main {
width: 100%; width: 100%;
margin-top: 90px; margin-top: 90px;
margin-bottom: 90px; padding-bottom: 120px;
} }
.class-name { .class-name {
...@@ -192,6 +219,7 @@ html { ...@@ -192,6 +219,7 @@ html {
width: 100px; width: 100px;
text-align: center; text-align: center;
background-color: transparent; background-color: transparent;
color: #fff;
} }
.edit-class-name input:focus { .edit-class-name input:focus {
border-bottom: 1px solid #fff; border-bottom: 1px solid #fff;
...@@ -201,6 +229,9 @@ html { ...@@ -201,6 +229,9 @@ html {
border: none; border: none;
color: #fff; color: #fff;
} }
.nomal-class-name a {
color: #fff;
}
.class-intro { .class-intro {
height: 400px; height: 400px;
border-radius: 3px; border-radius: 3px;
...@@ -545,8 +576,6 @@ html { ...@@ -545,8 +576,6 @@ html {
.teacher-info { .teacher-info {
position: relative; position: relative;
margin: 20px 0; margin: 20px 0;
height: 200px;
border-bottom: 1px solid #e7e7e7;
} }
.teacher-info textarea { .teacher-info textarea {
width: 100%; width: 100%;
...@@ -1212,6 +1241,31 @@ textarea.input-r-control { ...@@ -1212,6 +1241,31 @@ textarea.input-r-control {
color: #999; 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;
}
@media (max-width: 767px) { @media (max-width: 767px) {
.tp-sidebar { .tp-sidebar {
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
<div v-if="item.teachers.length > 0" class="v-teacher-list"> <div v-if="item.teachers.length > 0" class="v-teacher-list">
讲师:{{getTeachers(index)}} 讲师:{{getTeachers(index)}}
</div> </div>
<div class="v-foot"> <div class="v-foot">
<div class="v-price"> <div class="v-price">
<small>¥</small> <small>¥</small>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="warp-box"> <div class="warp-box">
<div class="container"> <div class="container">
<div class="video-description"> <div class="video-description">
<div class="title">视频介绍</div> <div class="title">课程介绍</div>
<div class="text"> <div class="text">
{{{coursewareInfo.intro}}} {{{coursewareInfo.intro}}}
</div> </div>
...@@ -17,13 +17,19 @@ ...@@ -17,13 +17,19 @@
需要 <a @click="login" href="javascript:;">登录</a> 才能评论 需要 <a @click="login" href="javascript:;">登录</a> 才能评论
</div> </div>
<div v-else class="comment-box"> <div v-else class="comment-box">
<div class="comment-head">
<img :src="coursewareInfo.userAvatar"> <div class="comment-input">
</div>
<div class="comment-input clearfix">
<textarea v-model="content" cols="30" rows="10" class="form-control" <textarea v-model="content" cols="30" rows="10" class="form-control"
placeholder="说几句吧,亲..."></textarea> placeholder="说几句吧,亲..."></textarea>
<button @click="comment" class="btn btn-default pull-right m-t-10">发表评论</button>
<div 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>
</div>
</div> </div>
</div> </div>
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
:src="item.avatar"></a> :src="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-right" style="width:100%"> <div class="video-sm-info pull-right">
<p class="mb-right"> <p class="mb-right">
<a href="javascript:;"><i class="icon-comment-empty"></i>{{coursewareInfo.comment_count}}</a> <a href="javascript:;"><i class="icon-comment-empty"></i>{{coursewareInfo.comment_count}}</a>
<a @click="favorite" href="javascript:;"><i <a @click="favorite" href="javascript:;"><i
......
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