Commit e756e2d8 authored by 杨培's avatar 杨培

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

# Conflicts:
#	src/common/models/Classes.php
parents 5c616ff0 f210652e
...@@ -31,4 +31,6 @@ phpunit.phar ...@@ -31,4 +31,6 @@ phpunit.phar
# vagrant runtime # vagrant runtime
/.vagrant /.vagrant
# *-local.php
*-local.php
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
namespace common\models; namespace common\models;
use Yii;
use yii\behaviors\TimestampBehavior; use yii\behaviors\TimestampBehavior;
use yii\data\Pagination; use yii\data\Pagination;
use yii\redis\ActiveRecord; use yii\redis\ActiveRecord;
......
...@@ -5,7 +5,6 @@ namespace common\models; ...@@ -5,7 +5,6 @@ namespace common\models;
use common\libs\Utils; use common\libs\Utils;
use Yii; use Yii;
use yii\behaviors\TimestampBehavior; use yii\behaviors\TimestampBehavior;
use yii\data\Pagination;
use yii\db\ActiveRecord; use yii\db\ActiveRecord;
/** /**
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
namespace common\models; namespace common\models;
use Yii;
use yii\behaviors\TimestampBehavior; use yii\behaviors\TimestampBehavior;
use yii\db\ActiveRecord; use yii\db\ActiveRecord;
......
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
namespace common\models; namespace common\models;
use Yii;
/** /**
* This is the model class for table "consume". * This is the model class for table "consume".
* *
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
namespace common\models; namespace common\models;
use Yii;
use yii\behaviors\TimestampBehavior; use yii\behaviors\TimestampBehavior;
use yii\data\Pagination; use yii\data\Pagination;
use yii\helpers\HtmlPurifier; use yii\helpers\HtmlPurifier;
......
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
namespace common\models; namespace common\models;
use Yii;
/** /**
* This is the model class for table "course_teacher". * This is the model class for table "course_teacher".
* *
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
namespace common\models; namespace common\models;
use Yii;
use yii\behaviors\TimestampBehavior; use yii\behaviors\TimestampBehavior;
use yii\db\ActiveRecord; use yii\db\ActiveRecord;
...@@ -14,6 +13,8 @@ use yii\db\ActiveRecord; ...@@ -14,6 +13,8 @@ use yii\db\ActiveRecord;
* @property integer $course_id * @property integer $course_id
* @property integer $type * @property integer $type
* @property string $name * @property string $name
* @property string $src_stand
* @property string $src_free
* @property integer $status * @property integer $status
* @property string $size * @property string $size
* @property int $time * @property int $time
...@@ -52,6 +53,7 @@ class Courseware extends ActiveRecord ...@@ -52,6 +53,7 @@ class Courseware extends ActiveRecord
[['user_id', 'course_id', 'type', 'status', 'size', 'time'], 'integer'], [['user_id', 'course_id', 'type', 'status', 'size', 'time'], 'integer'],
[['name'], 'string', 'max' => 128], [['name'], 'string', 'max' => 128],
[['format'], 'string', 'max' => 16], [['format'], 'string', 'max' => 16],
[['src_stand', 'src_free'], 'default', 'value' => ''],
[['comment_count', 'favorite_count', 'support_count', 'play_count'], 'default', 'value' => 0], [['comment_count', 'favorite_count', 'support_count', 'play_count'], 'default', 'value' => 0],
]; ];
...@@ -68,6 +70,8 @@ class Courseware extends ActiveRecord ...@@ -68,6 +70,8 @@ class Courseware extends ActiveRecord
'course_id' => 'Course ID', 'course_id' => 'Course ID',
'type' => '课件类型 默认0', 'type' => '课件类型 默认0',
'name' => 'Name', 'name' => 'Name',
'src_stand' => 'Src Stand',
'src_free' => 'Src Free',
'status' => '0 未审核 1 审核通过 2 审核不通过 3 锁定 ', 'status' => '0 未审核 1 审核通过 2 审核不通过 3 锁定 ',
'size' => '文件大小 kb', 'size' => '文件大小 kb',
'time' => '视频时间 秒', 'time' => '视频时间 秒',
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
namespace common\models; namespace common\models;
use Yii;
use yii\behaviors\TimestampBehavior; use yii\behaviors\TimestampBehavior;
use yii\data\Pagination; use yii\data\Pagination;
use yii\db\ActiveRecord; use yii\db\ActiveRecord;
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
namespace common\models; namespace common\models;
use Yii;
use yii\behaviors\TimestampBehavior; use yii\behaviors\TimestampBehavior;
use yii\data\Pagination; use yii\data\Pagination;
use yii\redis\ActiveRecord; use yii\redis\ActiveRecord;
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
namespace common\models; namespace common\models;
use Yii;
use yii\behaviors\TimestampBehavior; use yii\behaviors\TimestampBehavior;
use yii\data\Pagination; use yii\data\Pagination;
use yii\db\ActiveRecord; use yii\db\ActiveRecord;
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
namespace common\models; namespace common\models;
use Yii;
use yii\behaviors\TimestampBehavior; use yii\behaviors\TimestampBehavior;
use yii\data\Pagination; use yii\data\Pagination;
use yii\db\ActiveRecord; use yii\db\ActiveRecord;
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
namespace common\models; namespace common\models;
use Yii;
use yii\behaviors\TimestampBehavior; use yii\behaviors\TimestampBehavior;
use yii\db\ActiveRecord; use yii\db\ActiveRecord;
......
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
namespace common\models; namespace common\models;
use Yii;
/** /**
* This is the model class for table "settle_orders". * This is the model class for table "settle_orders".
* *
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
namespace common\models; namespace common\models;
use Yii;
use yii\behaviors\TimestampBehavior; use yii\behaviors\TimestampBehavior;
use yii\redis\ActiveRecord; use yii\redis\ActiveRecord;
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
namespace common\models; namespace common\models;
use Yii;
use yii\behaviors\TimestampBehavior; use yii\behaviors\TimestampBehavior;
use yii\data\ActiveDataProvider; use yii\data\ActiveDataProvider;
use yii\db\ActiveRecord; use yii\db\ActiveRecord;
......
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
namespace common\models; namespace common\models;
use Yii;
/** /**
* This is the model class for table "weixin". * This is the model class for table "weixin".
* *
......
...@@ -20,6 +20,8 @@ class m160927_121625_courseware_init extends Migration ...@@ -20,6 +20,8 @@ class m160927_121625_courseware_init extends Migration
'course_id' => $this->integer()->notNull()->unsigned(), 'course_id' => $this->integer()->notNull()->unsigned(),
'type' => $this->smallInteger()->notNull()->defaultValue(0)->unsigned()->comment('课件类型 默认0'), 'type' => $this->smallInteger()->notNull()->defaultValue(0)->unsigned()->comment('课件类型 默认0'),
'name' => $this->string(128)->notNull(), 'name' => $this->string(128)->notNull(),
'src_stand' => $this->string(128)->notNull(),
'src_free' => $this->string(128)->notNull(),
'status' => $this->smallInteger()->notNull()->defaultValue(0)->comment('0 未审核, 1 审核通过, 2 审核不通过, 3 锁定'), 'status' => $this->smallInteger()->notNull()->defaultValue(0)->comment('0 未审核, 1 审核通过, 2 审核不通过, 3 锁定'),
'size' => $this->integer(10)->notNull()->unsigned()->comment('文件大小/bytes'), 'size' => $this->integer(10)->notNull()->unsigned()->comment('文件大小/bytes'),
'time' => $this->smallInteger(8)->unsigned()->notNull()->comment('视频时间/秒'), 'time' => $this->smallInteger(8)->unsigned()->notNull()->comment('视频时间/秒'),
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
namespace frontend\controllers; namespace frontend\controllers;
use common\libs\alipay\AliPay; use common\libs\alipay\AliPay;
use common\libs\Utils;
use common\libs\WeixinPay; use common\libs\WeixinPay;
use common\models\BrowseRecord; use common\models\BrowseRecord;
use common\models\Classes; use common\models\Classes;
...@@ -14,14 +15,11 @@ use common\models\Orders; ...@@ -14,14 +15,11 @@ use common\models\Orders;
use common\models\Support; use common\models\Support;
use common\models\User; use common\models\User;
use dosamigos\qrcode\QrCode; use dosamigos\qrcode\QrCode;
use GuzzleHttp\Client;
use Yii; use Yii;
use common\libs\Utils;
use yii\base\InvalidParamException; use yii\base\InvalidParamException;
use yii\filters\AccessControl; use yii\filters\AccessControl;
use yii\helpers\ArrayHelper; use yii\helpers\ArrayHelper;
use yii\helpers\Html; use yii\helpers\Html;
use yii\helpers\Url;
use yii\web\ForbiddenHttpException; use yii\web\ForbiddenHttpException;
class HomeController extends \yii\web\Controller class HomeController extends \yii\web\Controller
...@@ -135,20 +133,30 @@ class HomeController extends \yii\web\Controller ...@@ -135,20 +133,30 @@ class HomeController extends \yii\web\Controller
$coursewareInfo['intro'] = $course->intro; $coursewareInfo['intro'] = $course->intro;
$coursewareInfo['courseName'] = $course->name; $coursewareInfo['courseName'] = $course->name;
$coursewareInfo['teachers'] = ArrayHelper::toArray($teachers); $coursewareInfo['teachers'] = ArrayHelper::toArray($teachers);
$coursewareInfo['videoUrl'] = Yii::$app->qiniu->getUrl('video', $coursewareInfo['name']);
$coursewareInfo['isGuest'] = Yii::$app->user->isGuest; $coursewareInfo['isGuest'] = Yii::$app->user->isGuest;
$coursewareInfo['isSupport'] = (Support::findByUserIdAndCoursewareId($userId, $coursewareInfo['id']) === NULL ? FALSE : TRUE); $coursewareInfo['isSupport'] = (Support::findByUserIdAndCoursewareId($userId, $coursewareInfo['id']) === NULL ? FALSE : TRUE);
$coursewareInfo['isFavorite'] = (Favorite::findByUserIdAndCoursewareId($userId, $coursewareInfo['id']) === NULL ? FALSE : TRUE); $coursewareInfo['isFavorite'] = (Favorite::findByUserIdAndCoursewareId($userId, $coursewareInfo['id']) === NULL ? FALSE : TRUE);
$coursewareInfo['isShop'] = FALSE;
if (!Yii::$app->user->isGuest) { if (!Yii::$app->user->isGuest) {
$coursewareInfo['userAvatar'] = User::getAvatarUrl(Yii::$app->user->identity->avatar); $coursewareInfo['userAvatar'] = User::getAvatarUrl(Yii::$app->user->identity->avatar);
$order = Orders::findByUserIdAndCourseId($userId, $courseId); $order = Orders::findByUserIdAndCourseId($userId, $courseId);
$coursewareInfo['isShop'] = ($order !== NULL and $order->status === Orders::PAID ? TRUE : FALSE); $coursewareInfo['isShop'] = ($order !== NULL and $order->status === Orders::PAID ? TRUE : FALSE);
} }
if($coursewareInfo['isShop']){
$coursewareInfo['videoUrl'] = Yii::$app->qiniu->getUrl('video', $coursewareInfo['src_stand']);
}else{
$coursewareInfo['videoUrl'] = Yii::$app->qiniu->getUrl('video', $coursewareInfo['src_free']);
}
unset($coursewareInfo['src_stand']);
unset($coursewareInfo['src_free']);
$coursewareInfo['price'] = $course->price; $coursewareInfo['price'] = $course->price;
$coursewareInfo['classId'] = $course->class_id; $coursewareInfo['classId'] = $course->class_id;
$coursewareInfo['className'] = Classes::findOne(['id' => $course->class_id])->name; $coursewareInfo['className'] = Classes::findOne(['id' => $course->class_id])->name;
$coursewareInfo['isMobile'] = Yii::$app->deviceDetect->isMobile(); $coursewareInfo['isMobile'] = Yii::$app->deviceDetect->isMobile();
//处理讲师头像
foreach ($coursewareInfo['teachers'] as $key => $value){
$coursewareInfo['teachers'][$key]['avatar'] = User::getAvatarUrl($value['avatar']);
}
return $this->render('video', [ return $this->render('video', [
'coursewareInfo' => $coursewareInfo 'coursewareInfo' => $coursewareInfo
]); ]);
...@@ -402,7 +410,7 @@ class HomeController extends \yii\web\Controller ...@@ -402,7 +410,7 @@ class HomeController extends \yii\web\Controller
"out_trade_no" => $number,//订单号 "out_trade_no" => $number,//订单号
"subject" => "购买课程-{$courseBaseInfo['name']}",//订单名称 "subject" => "购买课程-{$courseBaseInfo['name']}",//订单名称
"total_fee" => $price,//付款金额 "total_fee" => $price,//付款金额
"body" => '云崖购买',//商品描述 "body" => '云崖',//商品描述
'return_url' => Yii::$app->request->hostInfo . '/pay/alipay-return-url' 'return_url' => Yii::$app->request->hostInfo . '/pay/alipay-return-url'
); );
......
...@@ -17,7 +17,6 @@ use common\models\Course; ...@@ -17,7 +17,6 @@ use common\models\Course;
use common\models\Income; use common\models\Income;
use common\models\Member; use common\models\Member;
use common\models\Orders; use common\models\Orders;
use dosamigos\qrcode\formats\Wifi;
use GuzzleHttp\Client; use GuzzleHttp\Client;
use yii\log\Logger; use yii\log\Logger;
use yii\web\Controller; use yii\web\Controller;
...@@ -186,7 +185,7 @@ class PayController extends Controller ...@@ -186,7 +185,7 @@ class PayController extends Controller
'device_info' => "WEB", 'device_info' => "WEB",
'nonce_str' => $data['nonce_str'], 'nonce_str' => $data['nonce_str'],
'sign' => '', 'sign' => '',
'body' => '最课堂-课程购买', 'body' => '云涯-课程购买',
'out_trade_no' => $order_id, 'out_trade_no' => $order_id,
'total_fee' => $order->credit * 100, 'total_fee' => $order->credit * 100,
'spbill_create_ip' => $_SERVER['SERVER_ADDR'], 'spbill_create_ip' => $_SERVER['SERVER_ADDR'],
......
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
*/ */
namespace frontend\controllers; namespace frontend\controllers;
use common\models\UploadPools;
use Yii; use Yii;
use yii\web\Response; use yii\web\Response;
use common\models\UploadPools;
class QiniuCallbackController extends \yii\web\Controller class QiniuCallbackController extends \yii\web\Controller
{ {
......
<?php <?php
namespace frontend\controllers; namespace frontend\controllers;
use common\libs\Geetest;
use common\libs\Message; use common\libs\Message;
use common\libs\Utils; use common\libs\Utils;
use common\models\User; use frontend\models\ContactForm;
use frontend\models\TokenInputForm;
use Yii;
use yii\base\InvalidParamException;
use yii\helpers\HtmlPurifier;
use yii\web\BadRequestHttpException;
use yii\web\Controller;
use yii\filters\VerbFilter;
use yii\filters\AccessControl;
use frontend\models\LoginForm; use frontend\models\LoginForm;
use frontend\models\PasswordResetRequestForm; use frontend\models\PasswordResetRequestForm;
use frontend\models\ResetPasswordForm; use frontend\models\ResetPasswordForm;
use frontend\models\SignupForm; use frontend\models\SignupForm;
use frontend\models\ContactForm; use frontend\models\TokenInputForm;
use Yii;
use yii\filters\AccessControl;
use yii\helpers\HtmlPurifier;
use yii\web\Controller;
/** /**
* Site controller * Site controller
...@@ -85,7 +80,7 @@ class SiteController extends Controller ...@@ -85,7 +80,7 @@ class SiteController extends Controller
'maxLength' => 6, 'maxLength' => 6,
'minLength' => 6, 'minLength' => 6,
'transparent' => TRUE, 'transparent' => TRUE,
'padding' => 10, 'padding' => 5,
], ],
]; ];
......
...@@ -11,8 +11,6 @@ namespace frontend\controllers; ...@@ -11,8 +11,6 @@ namespace frontend\controllers;
use common\libs\Utils; use common\libs\Utils;
use GuzzleHttp\Client; use GuzzleHttp\Client;
use GuzzleHttp\Psr7\Request;
use yii\log\Logger;
use yii\web\Controller; use yii\web\Controller;
class TestController extends Controller class TestController extends Controller
......
...@@ -15,13 +15,10 @@ use common\models\BrowseRecord; ...@@ -15,13 +15,10 @@ use common\models\BrowseRecord;
use common\models\Favorite; use common\models\Favorite;
use common\models\Orders; use common\models\Orders;
use common\models\UploadPools; use common\models\UploadPools;
use common\models\User; use Yii;
use yii\base\ErrorException;
use yii\base\Exception;
use yii\filters\AccessControl; use yii\filters\AccessControl;
use yii\helpers\Html; use yii\helpers\Html;
use yii\web\Controller; use yii\web\Controller;
use Yii;
class UserCenterController extends Controller class UserCenterController extends Controller
{ {
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
namespace frontend\models; namespace frontend\models;
use common\libs\Utils; use common\libs\Utils;
use common\models\User;
use Yii; use Yii;
use yii\base\Model; use yii\base\Model;
use common\models\User;
/** /**
* Login form * Login form
......
...@@ -3,9 +3,9 @@ namespace frontend\models; ...@@ -3,9 +3,9 @@ namespace frontend\models;
use common\libs\Message; use common\libs\Message;
use common\libs\SendMsg; use common\libs\SendMsg;
use common\models\User;
use Yii; use Yii;
use yii\base\Model; use yii\base\Model;
use common\models\User;
use yii\log\Logger; use yii\log\Logger;
/** /**
......
<?php <?php
namespace frontend\models; namespace frontend\models;
use yii\base\Model;
use yii\base\InvalidParamException;
use common\models\User; use common\models\User;
use yii\base\Model;
/** /**
* Password reset form * Password reset form
......
...@@ -3,9 +3,9 @@ namespace frontend\models; ...@@ -3,9 +3,9 @@ namespace frontend\models;
use common\libs\Utils; use common\libs\Utils;
use common\models\Member; use common\models\Member;
use common\models\User;
use Yii; use Yii;
use yii\base\Model; use yii\base\Model;
use common\models\User;
use yii\log\Logger; use yii\log\Logger;
/** /**
......
<?php <?php
use frontend\assets\AppAsset;
use yii\helpers\Html; use yii\helpers\Html;
use yii\web\View; use yii\web\View;
use frontend\assets\AppAsset;
/* @var $this \yii\web\View */ /* @var $this \yii\web\View */
/* @var $content string */ /* @var $content string */
......
...@@ -8,5 +8,5 @@ ...@@ -8,5 +8,5 @@
?> ?>
<div class="tp-head navbar-fixed-top clearfix"> <div class="tp-head navbar-fixed-top clearfix">
<div class="menu-btn fl"><a href="javascript:;"><i class="icon-menu"></i></a></div> <div class="menu-btn fl"><a href="javascript:;"><i class="icon-menu"></i></a></div>
<div class="avatar fr"><a href="<?= \yii\helpers\Url::base() . 'user-center'?>"><img src="<?=\common\models\User::getAvatarUrl(Yii::$app->user->identity->avatar) ?>"></a></div> <div class="avatar fr"><a href="<?= \yii\helpers\Url::base() . 'user-center/'?>"><img src="<?=\common\models\User::getAvatarUrl(Yii::$app->user->identity->avatar) ?>"></a></div>
</div> </div>
<?php <?php
use yii\helpers\Html;
use yii\web\View;
use frontend\assets\AppAsset;
/* @var $this \yii\web\View */ /* @var $this \yii\web\View */
/* @var $content string */ /* @var $content string */
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
/* @var $this \yii\web\View */ /* @var $this \yii\web\View */
/* @var $content string */ /* @var $content string */
use yii\helpers\Html;
use frontend\assets\AppAsset; use frontend\assets\AppAsset;
use yii\helpers\Html;
AppAsset::register($this); AppAsset::register($this);
$baseUrl = \yii\helpers\Url::base(); $baseUrl = \yii\helpers\Url::base();
...@@ -47,8 +47,8 @@ $baseUrl = \yii\helpers\Url::base(); ...@@ -47,8 +47,8 @@ $baseUrl = \yii\helpers\Url::base();
<?php else : ?> <?php else : ?>
<div class="navbar-main navbar-static-top clearfix"> <div class="navbar-main navbar-static-top clearfix">
<div id="main-logo" class="logo pull-left"><a href="<?= $baseUrl . "/user-center" ?>">云崖</a></div> <div id="main-logo" class="logo pull-left"><a href="<?= $baseUrl . "/user-center/" ?>">云崖</a></div>
<div class="avatar pull-right"><a href="user-center"><img src="<?=\common\models\User::getAvatarUrl(Yii::$app->user->identity->avatar) ?>"></a></div> <div class="avatar pull-right"><a href="<?= \yii\helpers\Url::base() . '/user-center/'?>"><img src="<?=\common\models\User::getAvatarUrl(Yii::$app->user->identity->avatar) ?>"></a></div>
</div> </div>
<?php endif; ?> <?php endif; ?>
......
<?php <?php
use yii\helpers\Html;
use yii\web\View;
use frontend\assets\AppAsset; use frontend\assets\AppAsset;
/* @var $this \yii\web\View */ /* @var $this \yii\web\View */
......
...@@ -13,7 +13,7 @@ $this->title = '编辑课程信息'; ...@@ -13,7 +13,7 @@ $this->title = '编辑课程信息';
AppAsset::addScript($this, '@web/assets/course_edit.js'); AppAsset::addScript($this, '@web/assets/course_edit.js');
AppAsset::addCss($this, '@web/assets/css/course_publish.css'); AppAsset::addCss($this, '@web/assets/css/course_publish.css');
?> ?>
<div class="send-class" id="publishMain" xmlns:v-el="http://www.w3.org/1999/xhtml"> <div class="send-class" id="publishMain">
<div class="tit">编辑课程信息</div> <div class="tit">编辑课程信息</div>
<form method="post" name="courseEdit"> <form method="post" name="courseEdit">
......
...@@ -13,7 +13,7 @@ $this->title = '发布课程'; ...@@ -13,7 +13,7 @@ $this->title = '发布课程';
AppAsset::addScript($this, '@web/assets/course_publish.js'); AppAsset::addScript($this, '@web/assets/course_publish.js');
AppAsset::addCss($this, '@web/assets/css/course_publish.css'); AppAsset::addCss($this, '@web/assets/css/course_publish.css');
?> ?>
<div class="send-class" id="publishMain" xmlns:v-el="http://www.w3.org/1999/xhtml"> <div class="send-class" id="publishMain">
<div class="tit">发布课程</div> <div class="tit">发布课程</div>
<form method="post" name="coursePublish"> <form method="post" name="coursePublish">
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
/* @var $form yii\bootstrap\ActiveForm */ /* @var $form yii\bootstrap\ActiveForm */
/* @var $model \frontend\models\ResetPasswordForm */ /* @var $model \frontend\models\ResetPasswordForm */
use yii\helpers\Html;
use yii\bootstrap\ActiveForm; use yii\bootstrap\ActiveForm;
$this->title = 'Reset password'; $this->title = 'Reset password';
......
...@@ -6,8 +6,6 @@ ...@@ -6,8 +6,6 @@
* Time: 下午5:08 * Time: 下午5:08
*/ */
use yii\helpers\Html;
$this->title = '密码设置成功'; $this->title = '密码设置成功';
......
...@@ -7,9 +7,8 @@ ...@@ -7,9 +7,8 @@
*/ */
use yii\captcha\Captcha;
use yii\helpers\Html;
use yii\bootstrap\ActiveForm; use yii\bootstrap\ActiveForm;
use yii\captcha\Captcha;
$this->title = '输入验证码'; $this->title = '输入验证码';
\frontend\assets\AppAsset::addScript($this, '@web/assets/token_input.js'); \frontend\assets\AppAsset::addScript($this, '@web/assets/token_input.js');
......
...@@ -5,8 +5,9 @@ ...@@ -5,8 +5,9 @@
* Date: 2016/9/29 * Date: 2016/9/29
* Time: 上午9:59 * Time: 上午9:59
*/ */
use \frontend\assets\AppAsset; use frontend\assets\AppAsset;
use yii\widgets\LinkPager; use yii\widgets\LinkPager;
$baseUrl = \yii\helpers\Url::base(); $baseUrl = \yii\helpers\Url::base();
$this->title = '浏览记录'; $this->title = '浏览记录';
......
...@@ -9,20 +9,20 @@ ...@@ -9,20 +9,20 @@
</div> </div>
</div> </div>
<div v-show="videoShow" class="video-main"> <div class="video-main">
<video id="my-video-play" class="video-js vjs-default-skin vjs-big-play-centered" <video id="my-video-play" class="video-js vjs-default-skin vjs-big-play-centered"
controls preload="auto"> controls preload="auto">
<source :src="coursewareInfo.videoUrl" type="video/mp4"/> <source :src="coursewareInfo.videoUrl"/>
</video> </video>
</div> </div>
<div class="video-detail-info"> <div class="video-detail-info">
<div v-for="(index,item) in coursewareInfo.teachers" class="video-teacher"> <div v-for="(index,item) in coursewareInfo.teachers" class="video-teacher">
<a data-toggle="modal" data-target="{{{'#teacherInfo'+index}}}"><img <a data-toggle="modal" data-target="{{{'#teacherInfo'+index}}}"><img
:src="getFullPic(item.avatar)"></a> :src="item.avatar"></a>
<p><a href="javascript:;" data-toggle="modal" data-target="#myModal2">{{item.name}}</a></p> <p><a href="javascript:;" data-toggle="modal" data-target="#myModal2">{{item.name}}</a></p>
</div> </div>
<div class="video-sm-info pull-right"> <div class="video-sm-info pull-right" style="width:100%">
<p class="mb-right"> <p class="mb-right">
<a href="javascript:;"><i class="icon-comment-empty"></i>{{coursewareInfo.comment_count}}</a> <a href="javascript:;"><i class="icon-comment-empty"></i>{{coursewareInfo.comment_count}}</a>
<a @click="favorite" href="javascript:;"><i <a @click="favorite" href="javascript:;"><i
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="teacher-info text-center"> <div class="teacher-info text-center">
<img :src="getFullPic(item.avatar)"> <img :src="item.avatar">
<h3>{{item.name}}</h3> <h3>{{item.name}}</h3>
<p class="teacher-detail">{{{item.intro}}}</p> <p class="teacher-detail">{{{item.intro}}}</p>
</div> </div>
...@@ -248,12 +248,13 @@ ...@@ -248,12 +248,13 @@
this.isMobile = this.coursewareInfo.isMobile; this.isMobile = this.coursewareInfo.isMobile;
this.isWeixin = Utils.isWeixin(); this.isWeixin = Utils.isWeixin();
videojs("my-video-play", { videojs("my-video-play", {
"techOrder": ['html5','flash'],
"controls": true, "controls": true,
"autoplay": false, "autoplay": false,
"language": "zh-CN", "language": "zh-CN",
poster: this.coursewareInfo.previewUrl poster: this.coursewareInfo.previewUrl
}).ready(function () { }).ready(function () {
var myPlayer = this; self.videoShow = true;
var rate = 9 / 16; var rate = 9 / 16;
$('#my-video-play').css('width', '100%'); $('#my-video-play').css('width', '100%');
var wVideo = $('.video-detail-info').width(); var wVideo = $('.video-detail-info').width();
...@@ -264,11 +265,15 @@ ...@@ -264,11 +265,15 @@
var hVideo = wVideo * rate; var hVideo = wVideo * rate;
$('#my-video-play').css('height', hVideo); $('#my-video-play').css('height', hVideo);
}; };
self.videoShow = true;
}); });
} }
} }
</script> </script>
...@@ -7,7 +7,7 @@ var courseLists = require('./components/course-lists.vue'); ...@@ -7,7 +7,7 @@ var courseLists = require('./components/course-lists.vue');
var classInfo = JSON.parse($('#class-info').val()); var classInfo = JSON.parse($('#class-info').val());
//logo定制 //logo定制
var html = '<a href="' + __BASE_URL__ + 'user-center'+'">' + classInfo.name + '</a>' var html = '<a href="' + __BASE_URL__ + 'user-center/'+'">' + classInfo.name + '</a>'
$('#main-logo').empty().html(html); $('#main-logo').empty().html(html);
//注册定制 //注册定制
var href = $('#main-sign').attr("href") var href = $('#main-sign').attr("href")
......
...@@ -75,7 +75,7 @@ var config = { ...@@ -75,7 +75,7 @@ var config = {
// {from: __dirname + '/resource', to: 'resource'}, // {from: __dirname + '/resource', to: 'resource'},
{from: lib_dir + '/layer', to: 'layer'}, {from: lib_dir + '/layer', to: 'layer'},
{from: img_dir, to: 'img'}, {from: img_dir, to: 'img'},
{from: lib_dir + '/videojs/video-js.swf', to: 'libs/videojs/'}, {from: lib_dir + '/videojs/video-js.swf', to: 'videojs/'},
{from: lib_dir + '/plupload', to: 'plupload'}, {from: lib_dir + '/plupload', to: 'plupload'},
// {from: manage_dir + '/dist', to: 'manage/dist'}, // {from: manage_dir + '/dist', to: 'manage/dist'},
// {from: manage_dir + '/plugins', to: 'manage/plugins'}, // {from: manage_dir + '/plugins', to: 'manage/plugins'},
......
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