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

src/frontend/views/my-course/index.php

@@ -37,6 +37,26 @@ $qiniu = \Yii::$app->qiniu;
         </div>
     </div>
     <?php } ?>
+
+
+    <div class="col-md-4">
+        <div class="cls-box-main">
+            <div class="video-img-box">
+                <a href="#" target="_blank"><img src="http://dev.qdn.pp.cc/preview/f0/97/a3/f8s68SyefrZj3841.jpg-m.preview"></a>
+                <div class="video-list-cnt">
+                    <div class="tit"><a href="#" target="_blank">课程名称</a></div>
+                    <div class="teacher">讲师：万达</div>
+                    <div class="description">这是一段文章介绍。。</div>
+                    <div class="teacher">提交时间：2016-12-09 18:09</div>
+                </div>
+
+                <!--<span class="video-examine-icon">审</span>-->
+                <span class="video-examine-icon">荐</span>
+
+                <div class="edit"><a href="<?=Url::to(['my-course/edit', 'id'=>$course['id']])?>" title="编辑课程信息"><i class="icon-mode_edit"></i></a></div>
+            </div>
+        </div>
+    </div>
 </div>
 
 <div class="text-center">

src/frontend/views/user-center/favorite.php

@@ -32,7 +32,7 @@ $this->title = '收藏记录';
                                     <?php endif ?>
                                 <?php endforeach; ?>
                             </div>
-                            <div class="price">售价：￥<?=$value['course']['price']?></div>
+                            <div class="teacher">售价：￥<?=$value['course']['price']?></div>
                             <div class="teacher"><b><?=$value['course']['user']['username']?>收藏了该内容</b></div>
                         </div>
 

src/frontend/views/user-center/purchasedCourse.php

@@ -23,7 +23,6 @@ $this->title = '已购课程';
                         <img src="<?= Yii::$app->qiniu->getUrl('public', $value['courseWithTeachers']['preview_pic'].'-m.preview') ?>">
                         <div class="video-list-cnt">
                             <div class="tit"><a href="<?php echo $baseUrl.'/home/video?courseId='.$value['courseWithTeachers']['id'];?>"><?=$value['courseWithTeachers']['name']?></a></div>
-                            <div class="price"><?=$value['courseWithTeachers']['price']?></div>
                             <div class="teacher">
                                 讲师:<?php foreach ($value['courseWithTeachers']['teachers'] as $teaKey => $teaValue): ?>
                                     <?php if ($teaKey > 0): ?>
@@ -33,6 +32,7 @@ $this->title = '已购课程';
                                     <?php endif ?>
                                 <?php endforeach; ?>
                             </div>
+                            <div class="teacher"><?=$value['courseWithTeachers']['price']?></div>
                             <div class="teacher">
                                 <b><span>购买日期：<?=date("Y-m-d H:i:s",$value['updated_at'])?></span></b>
                             </div>

src/frontend/web/css/main.css

@@ -350,7 +350,7 @@ a,a:hover,a:link {
 .v-screen a {
     position: relative;
     display: block;
-    height: 180px;
+    height: 150px;
     overflow: hidden;
 }
 
@@ -812,4 +812,6 @@ a,a:hover,a:link {
     width: 260px!important;
     height: 300px!important;
     border: 1px solid transparent!important;
-}
\ No newline at end of file
+}
+
+

src/frontend/web/css/style.css

@@ -992,6 +992,25 @@ textarea.input-r-control {
     display: inline-block;
 }
 
+
+.video-examine-icon {
+    display: block;
+    position: absolute;
+    width: 30px;
+    height: 30px;
+    text-align: center;
+    line-height: 30px;
+    top: 10px;
+    left: 10px;
+    font-size: 14px;
+    background-color: rgba(0,0,0,.5);
+    color: #fff;
+    border-radius: 100%;
+}
+.video-img-box:hover .video-examine-icon {
+    background-color: red;
+}
+
 .examine-box {
     margin-top: 100px;
 }
@@ -1265,6 +1284,9 @@ textarea.input-r-control {
 .simditor {
     border: 1px solid #f3f3f3!important;
 }
+.simditor-body {
+    text-align: left!important;
+}
 
 
 @media (max-width: 767px) {