Commit b7c19b43 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 28aea28a
...@@ -85,16 +85,14 @@ $qiniu = \Yii::$app->qiniu; ...@@ -85,16 +85,14 @@ $qiniu = \Yii::$app->qiniu;
<?php if ($course['status'] == '4'): ?> <?php if ($course['status'] == '4'): ?>
<div class="mask-big"> <div class="mask-big">
<span> <span>
<i class="glyphicon glyphicon-refresh"></i> <i class="glyphicon glyphicon-refresh"></i>视频转码中...
视频转码转码中...
</span></div> </span></div>
<?php endif; ?> <?php endif; ?>
<?php if ($course['status'] == '3'): ?> <?php if ($course['status'] == '3'): ?>
<div class="mask-big"> <div class="mask-big">
<span> <span>
<i class="glyphicon glyphicon-lock"></i> <i class="glyphicon glyphicon-lock"></i>课程被锁定
课程被锁定
</span> </span>
</div> </div>
<?php endif; ?> <?php endif; ?>
......
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