Commit 28aea28a authored by 汪波's avatar 汪波

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

parents 05ce4d33 3a7eed63
......@@ -6,9 +6,20 @@
*/
use common\models\Course;
use yii\helpers\Url;
use yii\web\View;
use yii\widgets\LinkPager;
$this->title = '课程列表';
$js = <<<JS
$(function () {
turmbw = $('.video-img-box img').width();
turmbh = turmbw * 5 / 9;
$('.video-img-box img').css('height', turmbh);
});
JS;
$this->registerJs($js);
/**
* @var $qiniu common\components\Qiniu;
......@@ -27,7 +38,7 @@ $qiniu = \Yii::$app->qiniu;
<a href="<?= Course::url($course['id']) ?>" target="_blank"><img
src="<?= $qiniu->getUrl('public', $course['preview_pic']) ?>-m.preview"></a>
<?php elseif ($course['status'] == '2' || $course['status'] == '0'): ?>
<a href="javascript:;" target="_blank"><img
<a href="<?= Url::to(['home/preview', 'courseId' => $course['id']]) ?>" target="_blank"><img
src="<?= $qiniu->getUrl('public', $course['preview_pic']) ?>-m.preview"></a>
<?php endif; ?>
......@@ -41,7 +52,7 @@ $qiniu = \Yii::$app->qiniu;
<div class="tit"><a href="<?= Course::url($course['id']) ?>"
target="_blank"><?= $course['name'] ?></a></div>
<?php elseif ($course['status'] == '2' || $course['status'] == '0'): ?>
<div class="tit"><a href="javascript:;"
<div class="tit"><a href="<?= Url::to(['home/preview', 'courseId' => $course['id']]) ?>"
target="_blank"><?= $course['name'] ?></a></div>
<?php endif; ?>
......@@ -66,7 +77,7 @@ $qiniu = \Yii::$app->qiniu;
<?php if ($course['status'] == '0' or $course['status'] == '2'): ?>
<span class="video-examine-icon">审</span>
<?php endif; ?>
<?php if ($course['status'] != '3' && $course['status'] != '4' ): ?>
<?php if ($course['status'] != '3' && $course['status'] != '4'): ?>
<div class="edit"><a href="<?= Url::to(['my-course/edit', 'id' => $course['id']]) ?>"
title="编辑课程信息"><i class="icon-mode_edit"></i></a></div>
<?php endif; ?>
......@@ -101,10 +112,4 @@ $qiniu = \Yii::$app->qiniu;
<?= LinkPager::widget(['pagination' => $pagination]) ?>
</div>
<script type='text/javascript'>
$(function () {
turmbw = $('.video-img-box img').width();
turmbh = turmbw * 5 / 9;
$('.video-img-box img').css('height', turmbh);
})
</script>
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