Commit df236ad2 authored by 汪波's avatar 汪波

Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev

parents 25e71989 9a5ddf19
...@@ -246,6 +246,27 @@ class Utils ...@@ -246,6 +246,27 @@ class Utils
return $str; return $str;
} }
/**
* 将秒数转为 时:分:秒 的格式
*
* @param int $tl
* @return string
*/
public static function formatSeconds($tl)
{
$a = [0, 0, 0];
$i = 2;
foreach ($a as &$v) {
$un = pow(60, $i);
$v = sprintf("%02d", (int)floor($tl/$un));
$tl = fmod($tl, $un);
--$i;
}
return join(':', $a);
}
/** /**
* @param $rootElementName * @param $rootElementName
* @param $ar * @param $ar
......
...@@ -88,6 +88,14 @@ class SiteController extends Controller ...@@ -88,6 +88,14 @@ class SiteController extends Controller
} }
// public function actionError()
// {
// $exception = Yii::$app->errorHandler->exception;
// if ($exception !== null) {
// return $this->render('error', ['exception' => $exception]);
// }
// }
/** /**
* Logs in a user. * Logs in a user.
* *
......
...@@ -49,28 +49,14 @@ class TeacherManagerController extends \yii\web\Controller ...@@ -49,28 +49,14 @@ class TeacherManagerController extends \yii\web\Controller
public function actionAdd() public function actionAdd()
{ {
/** $avatarUploadToken = $this->getAvatarUploadToken();
* @var $qiniu Qiniu
*/
$qiniu = Yii::$app->qiniu;
$path = 'avatar/'.$qiniu->generateRandomFilePath();
$avatarUploadToken = $qiniu->getUploadToken("public", $path);
return $this->render('add', compact('model', 'avatarUploadToken')); return $this->render('add', compact('model', 'avatarUploadToken'));
} }
public function actionEdit($id) public function actionEdit($id)
{ {
$teacher = Teacher::findOne($id); $teacher = Teacher::findOne($id);
$avatarUploadToken = $this->getAvatarUploadToken();
/**
* @var $qiniu Qiniu
*/
$qiniu = Yii::$app->qiniu;
$path = 'avatar/'.$qiniu->generateRandomFilePath();
$avatarUploadToken = $qiniu->getUploadToken("public", $path);
$avatar = $teacher ? User::getAvatarUrl($teacher->avatar) : ''; $avatar = $teacher ? User::getAvatarUrl($teacher->avatar) : '';
return $this->render('edit', compact('teacher', 'avatarUploadToken', 'avatar')); return $this->render('edit', compact('teacher', 'avatarUploadToken', 'avatar'));
...@@ -172,4 +158,20 @@ class TeacherManagerController extends \yii\web\Controller ...@@ -172,4 +158,20 @@ class TeacherManagerController extends \yii\web\Controller
Utils::ajaxResponse(true); Utils::ajaxResponse(true);
} }
/**
* 获取头像的上传 Token
*
* @return string
*/
private function getAvatarUploadToken()
{
/**
* @var $qiniu Qiniu
*/
$qiniu = Yii::$app->qiniu;
$path = 'avatar/'.$qiniu->generateRandomFilePath('$(min)$(sec)$(ext)', 16);
return $qiniu->getUploadToken('public', $path);
}
} }
...@@ -75,10 +75,8 @@ class UserCenterController extends Controller ...@@ -75,10 +75,8 @@ class UserCenterController extends Controller
public function actionInfo() public function actionInfo()
{ {
$qiniu = Yii::$app->qiniu; $qiniu = Yii::$app->qiniu;
//图片上传Token //图片上传Token
$imgPath = 'avatar/' . $qiniu->generateRandomFilePath('$(ext)', 10); $imgPath = 'avatar/' . $qiniu->generateRandomFilePath('$(min)$(sec)$(ext)', 12);
$publicToken = $qiniu->getUploadToken('public', $imgPath); $publicToken = $qiniu->getUploadToken('public', $imgPath);
return $this->render('info', compact('publicToken')); return $this->render('info', compact('publicToken'));
} }
......
...@@ -27,6 +27,11 @@ AppAsset::addCss($this, '@web/assets/css/course_publish.css'); ...@@ -27,6 +27,11 @@ AppAsset::addCss($this, '@web/assets/css/course_publish.css');
<teachers init-teachers="<?=join(',', $teacherIds)?>"></teachers> <teachers init-teachers="<?=join(',', $teacherIds)?>"></teachers>
</div> </div>
<div class="cls-part">
<div class="tit">更换视频<span class="required">*</span></div>
<video-upload uptoken="<?=$videoToken?>"></video-upload>
</div>
<div class="cls-part"> <div class="cls-part">
<div class="tit">规则设定</div> <div class="tit">规则设定</div>
<div class="clearfix"> <div class="clearfix">
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
use yii\helpers\Html; use yii\helpers\Html;
$this->layout = FALSE;
$this->title = $name; $this->title = $name;
?> ?>
<div class="container"> <div class="container">
......
...@@ -13,7 +13,7 @@ AppAsset::addScript($this, '@web/assets/teacher_manager.js'); ...@@ -13,7 +13,7 @@ AppAsset::addScript($this, '@web/assets/teacher_manager.js');
<div class="teacher-box"> <div class="teacher-box">
<img src="<?=\common\models\User::getAvatarUrl($row['avatar'])?>"> <img src="<?=\common\models\User::getAvatarUrl($row['avatar'])?>">
<h3><?=$row['name']?></h3> <h3><?=$row['name']?></h3>
<p><?=$row['intro']?></p> <p><?=mb_substr(strip_tags($row['intro']), 0, 255)?></p>
<a class="edit" href="<?=\yii\helpers\Url::to(['teacher-manager/edit', 'id'=>$row['id']])?>" title="编辑讲师信息"><i class="icon-mode_edit"></i></a> <a class="edit" href="<?=\yii\helpers\Url::to(['teacher-manager/edit', 'id'=>$row['id']])?>" title="编辑讲师信息"><i class="icon-mode_edit"></i></a>
<a href="javascript:;" class="delete" title="删除该讲师"><i class="icon-trash"></i></a> <a href="javascript:;" class="delete" title="删除该讲师"><i class="icon-trash"></i></a>
</div> </div>
......
...@@ -58,6 +58,7 @@ export default { ...@@ -58,6 +58,7 @@ export default {
init: { init: {
'FilesAdded': function(up, files) { 'FilesAdded': function(up, files) {
up.start(); up.start();
up.disableBrowse();
self.text = "上传中.."; self.text = "上传中..";
self.uploadState = true; self.uploadState = true;
}, },
...@@ -88,8 +89,8 @@ export default { ...@@ -88,8 +89,8 @@ export default {
layer.alert("图片 " + err.file.name + " 上传失败!" + msg, {icon:5, title:"上传失败"}); layer.alert("图片 " + err.file.name + " 上传失败!" + msg, {icon:5, title:"上传失败"});
}, },
//队列文件处理完毕后 //队列文件处理完毕后
'UploadComplete': function() { 'UploadComplete': function(up) {
uploader.disableBrowse(); up.disableBrowse(false);
} }
} }
}); });
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<div v-else class="has-icon-part"> <div v-else class="has-icon-part">
<p> <p>
<a href="#"><span class="icon-play"></span></a> <a @click="pay" href="javascript:;"><span class="icon-play"></span></a>
<span>本课程为付费课程,{{videoInfo.price}} <a @click="pay" href="javascript:;">立即购买</a></span> <span>本课程为付费课程,{{videoInfo.price}} <a @click="pay" href="javascript:;">立即购买</a></span>
</p> </p>
</div> </div>
......
...@@ -39,6 +39,9 @@ var vm = new Vue({ ...@@ -39,6 +39,9 @@ var vm = new Vue({
name: { name: {
required: true required: true
}, },
price: {
min: 0.01
},
preview: { preview: {
required: true required: true
} }
...@@ -47,6 +50,9 @@ var vm = new Vue({ ...@@ -47,6 +50,9 @@ var vm = new Vue({
name: { name: {
required: "请填写标题" required: "请填写标题"
}, },
price: {
min: "必须设置一个价格"
},
preview: { preview: {
required: "必须上传缩略图" required: "必须上传缩略图"
} }
......
...@@ -48,6 +48,12 @@ var vm = new Vue({ ...@@ -48,6 +48,12 @@ var vm = new Vue({
required: true, required: true,
courseName:true courseName:true
}, },
price: {
min: 0.01
},
intro: {
required: true
},
preview: { preview: {
required: true required: true
}, },
...@@ -60,6 +66,12 @@ var vm = new Vue({ ...@@ -60,6 +66,12 @@ var vm = new Vue({
required: "请填写标题", required: "请填写标题",
courseName:'课堂名称不允许出现“云涯”二字。' courseName:'课堂名称不允许出现“云涯”二字。'
}, },
price: {
min: "必须设置一个价格"
},
intro: {
required: "必须填写课程介绍"
},
preview: { preview: {
required: "必须上传缩略图" required: "必须上传缩略图"
}, },
......
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