Commit 9a5ddf19 authored by xiabin's avatar xiabin

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

parents 62f4daf2 09e1f72d
......@@ -246,6 +246,27 @@ class Utils
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 $ar
......
......@@ -49,28 +49,14 @@ class TeacherManagerController extends \yii\web\Controller
public function actionAdd()
{
/**
* @var $qiniu Qiniu
*/
$qiniu = Yii::$app->qiniu;
$path = 'avatar/'.$qiniu->generateRandomFilePath();
$avatarUploadToken = $qiniu->getUploadToken("public", $path);
$avatarUploadToken = $this->getAvatarUploadToken();
return $this->render('add', compact('model', 'avatarUploadToken'));
}
public function actionEdit($id)
{
$teacher = Teacher::findOne($id);
/**
* @var $qiniu Qiniu
*/
$qiniu = Yii::$app->qiniu;
$path = 'avatar/'.$qiniu->generateRandomFilePath();
$avatarUploadToken = $qiniu->getUploadToken("public", $path);
$avatarUploadToken = $this->getAvatarUploadToken();
$avatar = $teacher ? User::getAvatarUrl($teacher->avatar) : '';
return $this->render('edit', compact('teacher', 'avatarUploadToken', 'avatar'));
......@@ -172,4 +158,20 @@ class TeacherManagerController extends \yii\web\Controller
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);
}
}
......@@ -27,6 +27,11 @@ AppAsset::addCss($this, '@web/assets/css/course_publish.css');
<teachers init-teachers="<?=join(',', $teacherIds)?>"></teachers>
</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="tit">规则设定</div>
<div class="clearfix">
......
......@@ -13,7 +13,7 @@ AppAsset::addScript($this, '@web/assets/teacher_manager.js');
<div class="teacher-box">
<img src="<?=\common\models\User::getAvatarUrl($row['avatar'])?>">
<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 href="javascript:;" class="delete" title="删除该讲师"><i class="icon-trash"></i></a>
</div>
......
......@@ -58,6 +58,7 @@ export default {
init: {
'FilesAdded': function(up, files) {
up.start();
up.disableBrowse();
self.text = "上传中..";
self.uploadState = true;
},
......@@ -86,6 +87,10 @@ export default {
}
layer.alert("图片 " + err.file.name + " 上传失败!" + msg, {icon:5, title:"上传失败"});
},
//队列文件处理完毕后
'UploadComplete': function(up) {
up.disableBrowse(false);
}
}
});
......
......@@ -39,6 +39,9 @@ var vm = new Vue({
name: {
required: true
},
price: {
min: 0.01
},
preview: {
required: true
}
......@@ -47,6 +50,9 @@ var vm = new Vue({
name: {
required: "请填写标题"
},
price: {
min: "必须设置一个价格"
},
preview: {
required: "必须上传缩略图"
}
......
......@@ -48,6 +48,12 @@ var vm = new Vue({
required: true,
courseName:true
},
price: {
min: 0.01
},
intro: {
required: true
},
preview: {
required: true
},
......@@ -60,6 +66,12 @@ var vm = new Vue({
required: "请填写标题",
courseName:'课堂名称不允许出现“云涯”二字。'
},
price: {
min: "必须设置一个价格"
},
intro: {
required: "必须填写课程介绍"
},
preview: {
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