Commit 2ed5de71 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 1cac73a7
...@@ -11,7 +11,7 @@ $this->beginContent('@app/views/layouts/center.php'); ...@@ -11,7 +11,7 @@ $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="javascript:;"><?= Yii::$app->controller->classStatus['name'] ?></a> <a href="/classes-info"><?= Yii::$app->controller->classStatus['name'] ?></a>
<?php } ?> <?php } ?>
</div> </div>
<div class="side-menu"> <div class="side-menu">
......
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