Commit e222f39b authored by 汪波's avatar 汪波

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

parents 6cfd03ed 2b87efe8
......@@ -4,55 +4,66 @@ use frontend\assets\AppAsset;
/* @var $this \yii\web\View */
/* @var $content string */
$baseUrl = \yii\helpers\Url::base();
$status = \frontend\controllers\UserCenterController::getClassStatus();
$this->beginPage();
$this->beginBody();
$this->beginContent('@app/views/layouts/center.php');
?>
<div class="tp-sidebar">
<div class="logo"><a href="<?= \yii\helpers\Url::base() ?>"><img
src="<?= AppAsset::getStaticUrl('img/logo.png') ?>"></a></div>
<div class="side-menu">
<!-- 左侧菜单 -->
<div class="tp-sidebar">
<div class="logo"><a href="<?= \yii\helpers\Url::base() ?>"><img
src="<?= AppAsset::getStaticUrl('img/logo.png') ?>"></a></div>
<div class="side-menu">
<!-- 左侧菜单 -->
<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>
</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
class="icon-shop"></i>已购课程</a></li>
<li <?= (Yii::$app->controller->id === 'user-center' and Yii::$app->controller->action->id === 'favorite') ? 'class = "active"' : '' ?>>
<a href="<?= $baseUrl . '/user-center/favorite' ?>"><i class="icon-stars"></i>收藏纪录</a>
</li>
<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>
</li>
</ul>
<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>
</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
class="icon-shop"></i>已购课程</a></li>
<li <?= (Yii::$app->controller->id === 'user-center' and Yii::$app->controller->action->id === 'favorite') ? 'class = "active"' : '' ?>>
<a href="<?= $baseUrl . '/user-center/favorite' ?>"><i class="icon-stars"></i>收藏纪录</a>
</li>
<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>
</li>
</ul>
<div class="apply-class">
<button class="btn btn-danger" onclick="location.href='/classes-info/apply';">申请课堂</button>
<button class="btn btn-primary" onclick="location.href='/my-course';">我的课堂</button>
</div>
<div class="apply-class">
<?php if ($status === 0): ?>
<button class="btn btn-danger"
onclick="location.href='/classes-info/apply';">申请课堂
</button>
<?php elseif ($status === 2): ?>
<button class="btn btn-danger"
onclick="location.href='/classes-info/apply';">课堂审核中...
</button>
<?php elseif ($status === 1): ?>
<button class="btn btn-primary"
onclick="location.href='/classes-info';">我的课堂
</button>
<?php endif; ?>
</div>
<a class="loginout" href="<?=$baseUrl .'/site/logout'?>"><i class="icon-power_settings_new"></i>退出登录</a>
<a class="loginout" href="<?= $baseUrl . '/site/logout' ?>"><i class="icon-power_settings_new"></i>退出登录</a>
</div>
</div>
</div>
<div class="auto-main">
<?= $this->render('centerHeader') ?>
<div class="tp-main">
<div class="container">
<?= $content ?>
<div class="auto-main">
<?= $this->render('centerHeader') ?>
<div class="tp-main">
<div class="container">
<?= $content ?>
</div>
</div>
</div>
</div>
<script type='text/javascript'>
$(function () {
$('.menu-btn').click(function () {
$('.tp-sidebar').animate({left:"0"});
$('.tp-sidebar').animate({left: "0"});
});
})
</script>
......
......@@ -34,7 +34,7 @@ $this->title = '密码设置成功';
</div>
<div class="foot-reg-btn">
<button class="btn btn-reg" onclick="window.location.href='<?= \yii\helpers\Url::base() . "/site" ?>'"
<button class="btn btn-reg" onclick="window.location.href='<?= \yii\helpers\Url::base() . "/site/login" ?>'"
type="submit">去登录
</button>
</div>
......
......@@ -7,7 +7,7 @@
<div class="d-i-b" v-if="addFormShow">
<input type="text" class="input-r-control reset-input" placeholder="请输入讲师名称" v-model="newName" v-el:nameInput>
<button type="button" class="btn btn-nobg" @click="addTeacher">保存</button>
<button type="button" class="btn btn-nobg">取消</button>
<button type="button" class="btn btn-nobg" @click="addFormShow=false">取消</button>
</div>
<span class="m-l-10" v-else><a href="javascript:;" @click="showAddForm">+ 添加讲师</a></span>
</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