Skip to content

Z
zuiketang
Commit 143eca54 authored by 杨培's avatar 杨培
Browse files
Options

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

parents 6e1da601 749a687e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 618 additions and 123 deletions
src/frontend/controllers/HomeController.php
View file @ 143eca54
...@@ -179,7 +179,7 @@ class HomeController extends \yii\web\Controller ...@@ -179,7 +179,7 @@ class HomeController extends \yii\web\Controller
public function actionPreview($courseId) public function actionPreview($courseId)
{ {
$coursewareInfo = Courseware::findOne(['course_id' => $courseId, 'status' => Courseware::STATUS_OK]); $coursewareInfo = Courseware::findOne(['course_id' => $courseId]);
$course = Course::findOne(['id' => $courseId]); $course = Course::findOne(['id' => $courseId]);
if ($course === NULL or Yii::$app->user->id != $coursewareInfo->user_id) { if ($course === NULL or Yii::$app->user->id != $coursewareInfo->user_id) {
throw new HttpException(404, '页面不存在'); throw new HttpException(404, '页面不存在');
......
src/frontend/controllers/SiteController.php
View file @ 143eca54
...@@ -72,9 +72,6 @@ class SiteController extends Controller ...@@ -72,9 +72,6 @@ class SiteController extends Controller
public function actions() public function actions()
{ {
return [ return [
'error' => [
'class' => 'yii\web\ErrorAction',
],
'captcha' => [ 'captcha' => [
'class' => 'yii\captcha\CaptchaAction', 'class' => 'yii\captcha\CaptchaAction',
'fixedVerifyCode' => YII_ENV_DEV ? 'testme' : NULL, 'fixedVerifyCode' => YII_ENV_DEV ? 'testme' : NULL,
...@@ -88,6 +85,31 @@ class SiteController extends Controller ...@@ -88,6 +85,31 @@ class SiteController extends Controller
} }
/**
* @return string
*/
public function actionError()
{
$exception = Yii::$app->errorHandler->exception;
$this->layout = FALSE;
if($exception->statusCode == '404' ){
$name = Yii::$app->errorHandler->getExceptionName($exception);
$message = $exception->getMessage();
if ($exception !== null) {
return $this->render('notfound', ['name' => $name,
'message'=>$message]);
}
}else{
$name = Yii::$app->errorHandler->getExceptionName($exception);
$message = $exception->getMessage();
if ($exception !== null) {
return $this->render('error', ['name' => $name,
'message'=>$message]);
}
}
}
/** /**
* Logs in a user. * Logs in a user.
* *
......
src/frontend/views/layouts/center.php
View file @ 143eca54
...@@ -67,7 +67,7 @@ $this->registerCss('[v-cloak] {display:none;}'); ...@@ -67,7 +67,7 @@ $this->registerCss('[v-cloak] {display:none;}');
<div class="foot navbar-fixed-bottom"> <div class="foot navbar-fixed-bottom">
<p><a href="javascript:;">隐私权政策</a> - <a href="javascript:;">服务条款</a> - <a href="javascript:;">地图条款</a></p> <p><a href="javascript:;">隐私权政策</a> - <a href="javascript:;">服务条款</a> - <a href="javascript:;">地图条款</a></p>
<p>©2016 Zuiketang.com</p> <p>©2016 c.pp.cc</p>
</div> </div>
<?php $this->endBody(); ?> <?php $this->endBody(); ?>
......
src/frontend/views/layouts/classCenter.php
View file @ 143eca54
...@@ -8,71 +8,84 @@ $this->beginBody(); ...@@ -8,71 +8,84 @@ $this->beginBody();
$this->beginContent('@app/views/layouts/center.php'); $this->beginContent('@app/views/layouts/center.php');
?> ?>
<div class="tp-sidebar"> <div class="tp-sidebar">
<div class="logo"> <div class="logo">
<?php if (!empty(Yii::$app->controller->classStatus)) { ?> <?php if (!empty(Yii::$app->controller->classStatus)) { ?>
<a href="<?=\yii\helpers\Url::to(['home/index', 'classId'=>Yii::$app->controller->classStatus['id']])?>" target="_blank"> <a href="<?= \yii\helpers\Url::to(['home/index', 'classId' => Yii::$app->controller->classStatus['id']]) ?>"
<?=Yii::$app->controller->classStatus['name']?> target="_blank">
<i class="icon-home"></i> <?= Yii::$app->controller->classStatus['name'] ?>
</a> <i class="icon-home"></i>
<?php } ?> </a>
</div> <?php } ?>
<div class="side-menu"> </div>
<!-- Contenedor --> <div class="side-menu">
<ul id="accordion" class="accordion" data-route="<?=Yii::$app->controller->id?>_<?=Yii::$app->requestedAction->id?>"> <!-- Contenedor -->
<li> <ul id="accordion" class="accordion"
<div class="link">我的课堂<!--<i class="icon-navigate_next"></i>--></div> data-route="<?= Yii::$app->controller->id ?>_<?= Yii::$app->requestedAction->id ?>">
<ul class="submenu"> <li>
<li class="RT_classes-info_index"><a href="/classes-info"><i class="icon-school"></i>课堂概况</a></li> <div class="link">我的课堂<!--<i class="icon-navigate_next"></i>--></div>
<li class="RT_teacher-manager_index RT_teacher-manager_edit RT_teacher-manager_add"><a href="/teacher-manager"><i class="icon-folder_shared"></i>讲师管理</a></li> <ul class="submenu">
</ul> <li class="RT_classes-info_index"><a href="/classes-info"><i class="icon-school"></i>课堂概况</a>
</li> </li>
<li> <li class="RT_teacher-manager_index RT_teacher-manager_edit RT_teacher-manager_add"><a
<div class="link">我的课程</div> href="/teacher-manager"><i class="icon-folder_shared"></i>讲师管理</a></li>
<ul class="submenu"> </ul>
<li class="RT_my-course_publish RT_my-course_edit"><a href="/my-course/publish"><i class="icon-create_new_folder"></i>发布课程</a></li> </li>
<li class="RT_my-course_index"><a href="/my-course"><i class="icon-assignment"></i>课程列表</a></li> <li>
</ul> <div class="link">我的课程</div>
</li> <ul class="submenu">
<li> <li class="RT_my-course_publish RT_my-course_edit"><a href="/my-course/publish"><i
<div class="link">我的会员</div> class="icon-create_new_folder"></i>发布课程</a></li>
<ul class="submenu"> <li class="RT_my-course_index"><a href="/my-course"><i class="icon-assignment"></i>课程列表</a></li>
<li class="RT_my-member_index"><a href="/my-member"><i class="icon-person_pin"></i>会员列表</a></li> </ul>
</ul> </li>
</li> <li>
<li> <div class="link">我的会员</div>
<div class="link">知识有价</div> <ul class="submenu">
<ul class="submenu"> <li class="RT_my-member_index"><a href="/my-member"><i class="icon-person_pin"></i>会员列表</a></li>
<li class="RT_my-income_index"><a href="/my-income"><i class="icon-shop"></i>购买记录</a></li> </ul>
</ul> </li>
</li> <li>
</ul> <div class="link">知识有价</div>
<script> <ul class="submenu">
var accordion = $("#accordion"); <li class="RT_my-income_index"><a href="/my-income"><i class="icon-shop"></i>购买记录</a></li>
var currentRoute = accordion.data("route"); </ul>
accordion.find("li.RT_"+currentRoute).addClass("active"); </li>
</script> </ul>
<a class="loginout" href="<?=\yii\helpers\Url::base() .'/site/logout'?>"><i class="icon-power_settings_new"></i>退出登录</a> <script>
var accordion = $("#accordion");
var currentRoute = accordion.data("route");
accordion.find("li.RT_" + currentRoute).addClass("active");
</script>
<a class="loginout" href="<?= \yii\helpers\Url::base() . '/site/logout' ?>"><i
class="icon-power_settings_new"></i>退出登录</a>
</div>
</div> </div>
</div>
<script type='text/javascript'> <script type='text/javascript'>
$(function () { $(function () {
$('.menu-btn').click(function () { $('.menu-btn').click(function () {
$('.tp-sidebar').animate({left:"0"}); $('.menu-mask').css('display', 'block');
$('.tp-sidebar').animate({left: "0"});
});
$('.menu-mask').click(function () {
$(this).css('display', 'none');
$('.tp-sidebar').animate({left: "-225px"});
}); });
}) })
</script> </script>
<div class="auto-main"> <div class="menu-mask"></div>
<?= $this->render('centerHeader') ?>
<div class="auto-main">
<?= $this->render('centerHeader') ?>
<div class="tp-main"> <div class="tp-main">
<div class="container"> <div class="container">
<?= $content ?> <?= $content ?>
</div>
</div> </div>
</div> </div>
</div>
<?php <?php
$this->endContent(); $this->endContent();
$this->endBody(); $this->endBody();
......
src/frontend/views/layouts/userCenter.php
View file @ 143eca54
...@@ -51,6 +51,9 @@ $this->beginContent('@app/views/layouts/center.php'); ...@@ -51,6 +51,9 @@ $this->beginContent('@app/views/layouts/center.php');
</div> </div>
</div> </div>
<div class="menu-mask"></div>
<div class="auto-main"> <div class="auto-main">
<?= $this->render('centerHeader') ?> <?= $this->render('centerHeader') ?>
<div class="tp-main"> <div class="tp-main">
...@@ -63,8 +66,13 @@ $this->beginContent('@app/views/layouts/center.php'); ...@@ -63,8 +66,13 @@ $this->beginContent('@app/views/layouts/center.php');
<script type='text/javascript'> <script type='text/javascript'>
$(function () { $(function () {
$('.menu-btn').click(function () { $('.menu-btn').click(function () {
$('.menu-mask').css('display','block');
$('.tp-sidebar').animate({left: "0"}); $('.tp-sidebar').animate({left: "0"});
}); });
$('.menu-mask').click(function () {
$(this).css('display','none');
$('.tp-sidebar').animate({left: "-225px"});
});
}) })
</script> </script>
<?php <?php
......
src/frontend/views/site/error.php
View file @ 143eca54
...@@ -9,13 +9,98 @@ use yii\helpers\Html; ...@@ -9,13 +9,98 @@ use yii\helpers\Html;
$this->title = $name; $this->title = $name;
?> ?>
<div class="container">
<div class="site-error">
<h1><?= Html::encode($this->title) ?></h1> <!DOCTYPE html>
<html>
<head lang="zh-CN">
<title><?= Html::encode($this->title) ?></title>
<meta charset="UTF-8">
<meta name="description" content="">
<meta name="keywords" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<link rel="shortcut icon" href="<?=\frontend\assets\AppAsset::getStaticUrl('img/favicon.ico')?>">
<style>
*{
margin: 0;
padding: 0;
}
html,body{
height: 100%;
width: 100%;
background-color: #f4f7f7;
font-family: "Microsoft YaHei", "Helvitica Neue", Helvitica, Arial, "Hiragino Sans GB", "Arial Regular", "Microsoft JhengHei", sans-serif;
}
.vertical-obj {
display: table;
width: 100%;
height: 100%;
min-height: 100%;
text-align: center;
}
.vertical-obj .vertical-obj-cont {
display: table-cell;
vertical-align: middle;
}
.main-box {
min-width: 690px;
min-height: 440px;
position: relative;
display: inline-block;
background-color: #fff;
box-shadow: 0 0 80px rgba(0,0,0,.05);
}
.main-box img {
width: 150px;
margin-top: 80px;
}
.main-box p {
position: absolute;
display: block;
width: 100%;
text-align: center;
top:50%;
left: 0;
}
.main-box p span {
display: block;
color: #999;
font-size: 12px;
padding-top: 40px;
}
.main-box p a {
display: inline-block;
padding: 0 30px;
height: 30px;
background-color: #f7cf89;
color: #fff;
text-align: center;
line-height: 30px;
text-decoration: none;
font-size: 12px;
margin-top: 30px;
}
.main-box p a:hover {
background-color: #f6c269;
color: #fff;
}
</style>
</head>
<body>
<div class="vertical-obj">
<div class="vertical-obj-cont">
<div class="main-box">
<img src="<?=\frontend\assets\AppAsset::getStaticUrl('img/error.jpg')?>">
<p>
<span><?= nl2br(Html::encode($message)) ?></span>
<a href="<?=\yii\helpers\Url::base().'/'?>">回首页</a>
</p>
<div class="alert alert-danger">
<?= nl2br(Html::encode($message)) ?>
</div> </div>
</div> </div>
</div> </div>
</body>
</html>
src/frontend/views/site/notfound.php 0 → 100644
View file @ 143eca54
<?php
/* @var $this yii\web\View */
/* @var $name string */
/* @var $message string */
/* @var $exception Exception */
use yii\helpers\Html;
$this->title = $name;
?>
<!DOCTYPE html>
<html>
<head lang="zh-CN">
<title><?= Html::encode($this->title) ?></title>
<meta charset="UTF-8">
<meta name="description" content="">
<meta name="keywords" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<link rel="shortcut icon" href="<?=\frontend\assets\AppAsset::getStaticUrl('img/favicon.ico')?>">
<style>
*{
margin: 0;
padding: 0;
}
html,body{
height: 100%;
width: 100%;
background-color: #f4f7f7;
font-family: "Microsoft YaHei", "Helvitica Neue", Helvitica, Arial, "Hiragino Sans GB", "Arial Regular", "Microsoft JhengHei", sans-serif;
}
.vertical-obj {
display: table;
width: 100%;
height: 100%;
min-height: 100%;
text-align: center;
}
.vertical-obj .vertical-obj-cont {
display: table-cell;
vertical-align: middle;
}
.main-box {
position: relative;
display: inline-block;
background-color: #f4f7f7;
box-shadow: 0 0 80px rgba(0,0,0,.05);
}
.main-box p {
position: absolute;
display: block;
width: 100%;
text-align: center;
top:50%;
left: 0;
}
.main-box p span {
display: block;
color: #999;
font-size: 12px;
padding-top: 40px;
}
.main-box p a {
display: inline-block;
padding: 0 30px;
height: 30px;
background-color: #f7cf89;
color: #fff;
text-align: center;
line-height: 30px;
text-decoration: none;
font-size: 12px;
margin-top: 30px;
}
.main-box p a:hover {
background-color: #f6c269;
color: #fff;
}
.main-box img {
max-width: 690px;
}
</style>
</head>
<body>
<div class="vertical-obj">
<div class="vertical-obj-cont">
<div class="main-box">
<img src="<?=\frontend\assets\AppAsset::getStaticUrl('img/404.jpg')?>">
<p>
<span><?= nl2br(Html::encode($message)) ?></span>
<a href="<?=\yii\helpers\Url::base().'/'?>">回首页</a>
</p>
</div>
</div>
</div>
</body>
</html>
src/frontend/views/site/signup.php
View file @ 143eca54
...@@ -57,7 +57,7 @@ $this->registerJsFile('http://static.geetest.com/static/tools/gt.js'); ...@@ -57,7 +57,7 @@ $this->registerJsFile('http://static.geetest.com/static/tools/gt.js');
'captchaAction' => 'site/captcha', 'captchaAction' => 'site/captcha',
])->error(FALSE); ?> ])->error(FALSE); ?>
<input id="verifyCode" name="verifyCode" type="text" placeholder="输入验证码" required=""> <input id="verifyCode" name="verifyCode" type="text" placeholder="输入验证码" required="">
<span id="verifyCode" class="tips"><?= $model->getFirstError('verifyCode') ?></span> <span id="verifyCode" class="tips tip-vcode"><?= $model->getFirstError('verifyCode') ?></span>
</div> </div>
</div> </div>
......
src/frontend/web/css/login.css
View file @ 143eca54
...@@ -167,7 +167,7 @@ a,a:hover,a:link { ...@@ -167,7 +167,7 @@ a,a:hover,a:link {
} }
.input-wrapper span.tip-vcode { .input-wrapper span.tip-vcode {
right: 85px; right: 100px;
} }
.btn-get-vcode { .btn-get-vcode {
......
src/frontend/web/css/style.css
View file @ 143eca54
This diff is collapsed.
src/frontend/web/js/home/components/course-lists.vue
View file @ 143eca54
...@@ -23,8 +23,7 @@ ...@@ -23,8 +23,7 @@
<div class="v-foot"> <div class="v-foot">
<div class="v-price"> <div class="v-price">
<small>￥</small> 售价：<small>￥</small>{{item.price}}
{{item.price}}
</div> </div>
<div class="v-detail"> <div class="v-detail">
<span><i class="icon-comment-full"></i> {{item.comment_count}}</span> <span><i class="icon-comment-full"></i> {{item.comment_count}}</span>
......
src/frontend/web/js/home/components/video-play.vue
View file @ 143eca54
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
}, },
methods: { methods: {
payClick(){ payClick(){
if(this.coursewareInfo.isShop){ if(!this.coursewareInfo.isGuest){
if(this.isMobile == false && this.isWeixin == false){ if(this.isMobile == false && this.isWeixin == false){
$('#web-pay').trigger('click'); $('#web-pay').trigger('click');
}else if(this.isMobile == true && this.isWeixin == false){ }else if(this.isMobile == true && this.isWeixin == false){
......
ui/html/404.html 0 → 100644
View file @ 143eca54
<!DOCTYPE html>
<html>
<head lang="zh-CN">
<title>404</title>
<meta charset="UTF-8">
<meta name="description" content="">
<meta name="keywords" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<link rel="shortcut icon" href="/favicon.ico">
<style>
*{
margin: 0;
padding: 0;
}
html,body{
height: 100%;
width: 100%;
background-color: #f4f7f7;
font-family: "Microsoft YaHei", "Helvitica Neue", Helvitica, Arial, "Hiragino Sans GB", "Arial Regular", "Microsoft JhengHei", sans-serif;
}
.vertical-obj {
display: table;
width: 100%;
height: 100%;
min-height: 100%;
text-align: center;
}
.vertical-obj .vertical-obj-cont {
display: table-cell;
vertical-align: middle;
}
.main-box {
position: relative;
display: inline-block;
background-color: #f4f7f7;
box-shadow: 0 0 80px rgba(0,0,0,.05);
}
.main-box p {
position: absolute;
display: block;
width: 100%;
text-align: center;
top:50%;
left: 0;
}
.main-box p span {
display: block;
color: #999;
font-size: 12px;
padding-top: 40px;
}
.main-box p a {
display: inline-block;
padding: 0 30px;
height: 30px;
background-color: #f7cf89;
color: #fff;
text-align: center;
line-height: 30px;
text-decoration: none;
font-size: 12px;
margin-top: 30px;
}
.main-box p a:hover {
background-color: #f6c269;
color: #fff;
}
.main-box img {
max-width: 690px;
}
</style>
</head>
<body>
<div class="vertical-obj">
<div class="vertical-obj-cont">
<div class="main-box">
<img src="img/404.jpg">
<p>
<span>页面没找到</span>
<a href="#">回首页</a>
</p>
</div>
</div>
</div>
</body>
</html>
\ No newline at end of file
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