Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Z
zuiketang
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
夏彬
zuiketang
Commits
9a5ddf19
Commit
9a5ddf19
authored
Oct 28, 2016
by
xiabin
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
parents
62f4daf2
09e1f72d
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
68 additions
and
17 deletions
+68
-17
Utils.php
src/common/libs/Utils.php
+21
-0
TeacherManagerController.php
src/frontend/controllers/TeacherManagerController.php
+18
-16
edit.php
src/frontend/views/my-course/edit.php
+5
-0
index.php
src/frontend/views/teacher-manager/index.php
+1
-1
avatar-upload.vue
src/frontend/web/js/components/uploader/avatar-upload.vue
+5
-0
edit.js
src/frontend/web/js/my-course/edit.js
+6
-0
publish.js
src/frontend/web/js/my-course/publish.js
+12
-0
No files found.
src/common/libs/Utils.php
View file @
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
...
...
src/frontend/controllers/TeacherManagerController.php
View file @
9a5ddf19
...
@@ -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
);
}
}
}
src/frontend/views/my-course/edit.php
View file @
9a5ddf19
...
@@ -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"
>
...
...
src/frontend/views/teacher-manager/index.php
View file @
9a5ddf19
...
@@ -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>
...
...
src/frontend/web/js/components/uploader/avatar-upload.vue
View file @
9a5ddf19
...
@@ -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
;
},
},
...
@@ -86,6 +87,10 @@ export default {
...
@@ -86,6 +87,10 @@ export default {
}
}
layer
.
alert
(
"图片 "
+
err
.
file
.
name
+
" 上传失败!"
+
msg
,
{
icon
:
5
,
title
:
"上传失败"
});
layer
.
alert
(
"图片 "
+
err
.
file
.
name
+
" 上传失败!"
+
msg
,
{
icon
:
5
,
title
:
"上传失败"
});
},
//队列文件处理完毕后
'UploadComplete'
:
function
(
up
)
{
up
.
disableBrowse
(
false
);
}
}
}
}
});
});
...
...
src/frontend/web/js/my-course/edit.js
View file @
9a5ddf19
...
@@ -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
:
"必须上传缩略图"
}
}
...
...
src/frontend/web/js/my-course/publish.js
View file @
9a5ddf19
...
@@ -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
:
"必须上传缩略图"
},
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment