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

src/common/models/Classes.php

@@ -89,7 +89,7 @@ class Classes extends ActiveRecord
 
     public static function getUserClass($userId)
     {
-        return self::find()->select('id, status')->where(['user_id'=>$userId])->asArray()->one();
+        return self::find()->select('id, status, name')->where(['user_id'=>$userId])->asArray()->one();
     }
 
     /**

src/frontend/controllers/MyIncomeController.php

@@ -19,6 +19,7 @@ class MyIncomeController extends \yii\web\Controller
 {
 
     public $layout = 'classCenter';
+    public $classStatus;
 
     /**
      * @inheritdoc
@@ -28,7 +29,6 @@ class MyIncomeController extends \yii\web\Controller
         return [
             'access' => [
                 'class' => AccessControl::className(),
-                //'only' => ['index', 'publish', 'submit'],
                 'rules' => [
                     [
                         'allow' => true,
@@ -36,8 +36,7 @@ class MyIncomeController extends \yii\web\Controller
                     ]
                 ],
                 'except' => ['wxbind-request', 'wxbind-callback']
-            ],
-            'classes' => [
+            ], [
                 'class' => ClassesFilter::className()
             ]
         ];

src/frontend/controllers/MyMemberController.php

@@ -3,12 +3,35 @@
 namespace frontend\controllers;
 
 use common\models\Member;
+use frontend\components\ClassesFilter;
 use Yii;
+use yii\filters\AccessControl;
 
 class MyMemberController extends \yii\web\Controller
 {
 
     public $layout = 'classCenter';
+    public $classStatus;
+
+    /**
+     * @inheritdoc
+     */
+    public function behaviors()
+    {
+        return [
+            'access' => [
+                'class' => AccessControl::className(),
+                'rules' => [
+                    [
+                        'allow' => true,
+                        'roles' => ['@']
+                    ]
+                ]
+            ], [
+                'class' => ClassesFilter::className()
+            ]
+        ];
+    }
 
     /**
      * 我的会员

src/frontend/views/classes-info/index.php

@@ -22,10 +22,7 @@ $this->title = '我的课堂';
     <div role="tabpanel" class="tab-pane active" id="home">
         <div class="class-name m-t-50">
             <span class="nomal-class-name"><?=$model->name?><!-- <a href="#"><i class="icon-mode_edit"></i></a>--></span>
-
             <div class="edit"><a href="#" title="课堂设置"><i class="icon-mode_edit"></i></a></div>
-
-
             <span class="edit-class-name" style="display: none"><input type="text" class="input-r-control"> <button class="btn btn-default">保存</button>  <button class="btn btn-default">取消</button></span>
         </div>
         <div class="class-intro">

src/frontend/views/layouts/classCenter.php

@@ -9,7 +9,11 @@ $this->beginContent('@app/views/layouts/center.php');
 ?>
 
 <div class="tp-sidebar">
-    <div class="logo"><a href="/"><img src="<?= Yii::$app->assetManager->baseUrl ?>/img/logo.png"></a></div>
+    <div class="logo">
+        <?php if (!empty(Yii::$app->controller->classStatus)) { ?>
+        <a href="<?=\yii\helpers\Url::to(['home/index', 'classId'=>Yii::$app->controller->classStatus['id']])?>" target="_blank"><?=Yii::$app->controller->classStatus['name']?></a>
+        <?php } ?>
+    </div>
     <div class="side-menu">
         <!-- Contenedor -->
         <ul id="accordion" class="accordion" data-route="<?=Yii::$app->controller->id?>_<?=Yii::$app->requestedAction->id?>">

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

@@ -60,7 +60,9 @@ $qiniu = \Yii::$app->qiniu;
                             <?php if ($course['teachers']) { ?>讲师：<?= join(', ', array_column($course['teachers'], 'name')) ?><?php } ?>
                         </div>
 
-                        <div class="description"><?= mb_substr(strip_tags($course['intro']), 0, 250) ?></div>
+                        <div class="teacher clearfix"><span class="pull-left">发布时间：2016-12-11</span> <span class="pull-right">时长：01:23:21</span></div>
+
+                        <!--<div class="description"><?/*= mb_substr(strip_tags($course['intro']), 0, 250) */?></div>-->
 
                         <div class="teacher">
                             <span><?= $course['play_count'] ?> 次播放</span> ·

src/frontend/web/css/main.css

@@ -840,6 +840,7 @@ a,a:hover,a:link {
 
 /*审核中视频样式*/
 .video-main {
+    position: relative;
     height: 500px;
     width: 100%;
     background-color: #444;
@@ -857,4 +858,30 @@ a,a:hover,a:link {
     line-height: 1.8;
 }
 
+.play-mask-box {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    text-align: center;
+    background-color: rgba(0,0,0,.4);
+}
+.look-video {
+    position: absolute;
+    left: 0;
+    width: 100%;
+    height: 110px;
+    top: 60%;
+}
+.look-video p {
+    margin-top: 10px;
+}
+.look-video a {
+    color: #f7b940;
+}
+.vjs-big-play-centered .vjs-big-play-button {
+    z-index: 2!important;
+}
+
 

src/frontend/web/js/home/components/course-lists.vue

@@ -16,6 +16,11 @@
                         <span v-if="item.teachers.length > 0">讲师：{{getTeachers(index)}}</span>
                     </div>
 
+                    <div class="v-teacher-list clearfix">
+                        <span class="pull-left">发布时间：2016-08-04</span>
+                        <span class="pull-right">时长：01:28:21</span>
+                    </div>
+
                     <div class="v-foot">
                         <div class="v-price">
                             <small>￥</small>

src/frontend/web/js/home/components/video.vue

@@ -4,6 +4,17 @@
                controls preload="auto">
             <source :src="videoUrl"/>
         </video>
+
+        <!-- 付费视频的样式
+        <img src="http://deimg.c.pp.cc/preview/f0/97/a3/f8s68SyefrZj3841.jpg" width="100%" height="auto">
+
+        <div class="play-mask-box">
+            <div class="look-video">
+                <p>本课程为付费课程，价格￥108.00 <a href="#">立即购买</a></p>
+                &lt;!&ndash;<p>本课程可试看2分钟</p>&ndash;&gt;
+            </div>
+        </div>
+        -->
     </div>
 </template>
 

src/frontend/web/webpack.config.js

@@ -103,7 +103,7 @@ if (process.env.NODE_ENV === 'production') {
         new webpack.DefinePlugin({
             __BASE_URL__: JSON.stringify('http://c.pp.cc/'),
             __CDN_URL__: JSON.stringify('http://c.pp.cc/'),
-            __QINIU_URL__: JSON.stringify('http://of805nn40.bkt.clouddn.com/'),
+            __QINIU_URL__: JSON.stringify('http://img.c.pp.cc/'),
         }),
         new webpack.optimize.UglifyJsPlugin({
             compress: {
@@ -117,7 +117,7 @@ if (process.env.NODE_ENV === 'production') {
         new webpack.DefinePlugin({
             __BASE_URL__: JSON.stringify('http://dev.zuiketang.com/'),
             __CDN_URL__: JSON.stringify('http://dev.zuiketang.com/'),
-            __QINIU_URL__: JSON.stringify('http://dev.qdn.pp.cc/'),
+            __QINIU_URL__: JSON.stringify('http://deimg.c.pp.cc/'),
         }),
         new webpack.optimize.UglifyJsPlugin({
             compress: {
@@ -125,14 +125,13 @@ if (process.env.NODE_ENV === 'production') {
             }
         }),
         new webpack.optimize.OccurenceOrderPlugin()
-    ])
-    ;
+    ]);
 } else {
     config.plugins = config.plugins.concat([
         new webpack.DefinePlugin({
             __BASE_URL__: JSON.stringify('http://dev.zuiketang.com/'),
             __CDN_URL__: JSON.stringify('http://dev.zuiketang.com/'),
-            __QINIU_URL__: JSON.stringify('http://dev.qdn.pp.cc/'),
+            __QINIU_URL__: JSON.stringify('http://deimg.c.pp.cc/'),
         }),
     ]);
     // config.devtool = 'source-map'