Commit 794ad345 authored by 杨培's avatar 杨培

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

parents bae9eb62 6573c249
...@@ -185,7 +185,7 @@ class Course extends \yii\db\ActiveRecord ...@@ -185,7 +185,7 @@ class Course extends \yii\db\ActiveRecord
public static function getRecommendByClassId($classID) public static function getRecommendByClassId($classID)
{ {
$recommend = self::RECOMMEDN; $recommend = self::RECOMMEDN;
return self::find()->select('id,name,intro,preview_pic,recommend,created_at')->where("class_id=:class_id and recommend = $recommend", [':class_id' => $classID])->asArray()->all(); return self::find()->select('id,name,intro,preview_pic,recommend,created_at')->where("class_id=:class_id and recommend = $recommend and status = :status", [':class_id' => $classID,':status'=> self::STATUS_OK])->asArray()->all();
} }
/** /**
......
...@@ -108,6 +108,6 @@ class Favorite extends \yii\db\ActiveRecord ...@@ -108,6 +108,6 @@ class Favorite extends \yii\db\ActiveRecord
*/ */
public function getCourse() public function getCourse()
{ {
return $this->hasOne(Course::className(), ['id' => 'course_id'])->with('teachers')->with('user')->select('id,user_id,name,price,preview_pic'); return $this->hasOne(Course::className(), ['id' => 'course_id'])->with('teachers')->with('user')->select('id,user_id,name,price,preview_pic,favorite_count');
} }
} }
...@@ -10,34 +10,42 @@ use yii\widgets\LinkPager; ...@@ -10,34 +10,42 @@ use yii\widgets\LinkPager;
$baseUrl = \yii\helpers\Url::base(); $baseUrl = \yii\helpers\Url::base();
$this->title = '收藏记录'; $this->title = '收藏记录';
\frontend\assets\AppAsset::addScript($this, '@web/assets/user_favorite.js') \frontend\assets\AppAsset::addScript($this, '@web/assets/user_favorite.js');
?> ?>
<?php if($favorite['count'] > 0):?> <?php if ($favorite['count'] > 0): ?>
<div class="cls-list-box clearfix"> <div class="cls-list-box clearfix">
<?php foreach ($favorite['data'] as $key => $value): ?> <?php foreach ($favorite['data'] as $key => $value): ?>
<div class="col-md-4"> <div class="col-md-4">
<div class="cls-box-main sm-box"> <div class="cls-box-main sm-box">
<div class="video-img-box"> <div class="video-img-box">
<img src="<?= Yii::$app->qiniu->getUrl('public', $value['course']['preview_pic'].'-m.preview') ?>"> <img
src="<?= Yii::$app->qiniu->getUrl('public', $value['course']['preview_pic'] . '-m.preview') ?>">
<div class="video-list-cnt"> <div class="video-list-cnt">
<div class="tit"><a href="<?php echo $baseUrl.'/home/video?courseId='.$value['course']['id'];?>"><?=$value['course']['name']?></a></div> <div class="tit"><a
href="<?php echo $baseUrl . '/home/video?courseId=' . $value['course']['id']; ?>"><?= $value['course']['name'] ?></a>
</div>
<div class="teacher"> <div class="teacher">
讲师:<?php foreach ($value['course']['teachers'] as $teaKey => $teaValue): ?> 讲师:<?php foreach ($value['course']['teachers'] as $teaKey => $teaValue): ?>
<?php if ($teaKey > 0): ?> <?php if ($teaKey > 0): ?>
,<?= $teaValue['name']?> ,<?= $teaValue['name'] ?>
<?php else: ?> <?php else: ?>
<?= $teaValue['name']?> <?= $teaValue['name'] ?>
<?php endif ?> <?php endif ?>
<?php endforeach; ?> <?php endforeach; ?>
</div> </div>
<div class="teacher">售价:¥<?=$value['course']['price']?></div> <div class="teacher">售价:¥<?= $value['course']['price'] ?></div>
<div class="teacher"><b><?=$value['course']['user']['username']?>收藏了该内容</b></div> <?php if ($value['course']['favorite_count'] == 1): ?>
<div class="teacher"><b>独具慧眼,仅有你收藏了该内容</b></div>
<?php else: ?>
<div class="teacher"><b>还有<?php echo $value['course']['favorite_count'] ?>人和您品味相投</b>
</div>
<?php endif; ?>
</div> </div>
<div class="play-mask"> <div class="play-mask">
<a href="<?php echo $baseUrl.'/home/video?courseId='.$value['course']['id'];?>"><i class="glyphicon glyphicon-play"></i></a> <a href="<?php echo $baseUrl . '/home/video?courseId=' . $value['course']['id']; ?>"><i
class="glyphicon glyphicon-play"></i></a>
</div> </div>
</div> </div>
...@@ -53,8 +61,8 @@ $this->title = '收藏记录'; ...@@ -53,8 +61,8 @@ $this->title = '收藏记录';
'pagination' => $favorite['pagination'], 'pagination' => $favorite['pagination'],
]); ?> ]); ?>
</div> </div>
<?php else:?> <?php else: ?>
<div class="empty-data"> <div class="empty-data">
您没有任何收藏记录! 您没有任何收藏记录!
</div> </div>
<?php endif;?> <?php endif; ?>
...@@ -267,3 +267,12 @@ a,a:hover,a:link { ...@@ -267,3 +267,12 @@ a,a:hover,a:link {
color: #34bf49; color: #34bf49;
padding-bottom: 20px; padding-bottom: 20px;
} }
@media (max-width: 767px) {
.logo {
margin-left: 15px;
}
.yun-login-btn {
margin-right: 15px;
}
}
...@@ -845,6 +845,9 @@ a,a:hover,a:link { ...@@ -845,6 +845,9 @@ a,a:hover,a:link {
.avatar { .avatar {
padding-right: 15px; padding-right: 15px;
} }
.yun-login-btn {
padding-right: 15px;
}
} }
/*分享样式修改*/ /*分享样式修改*/
......
...@@ -25,6 +25,7 @@ var Utils = { ...@@ -25,6 +25,7 @@ var Utils = {
result.push(this.pad(min,2)); result.push(this.pad(min,2));
result.push(this.pad(sec,2)); result.push(this.pad(sec,2));
}else{ }else{
result.push('00');
result.push(this.pad(sec,2)); result.push(this.pad(sec,2));
} }
return result.join(':'); return result.join(':');
......
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