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
2ccbd2a7
Commit
2ccbd2a7
authored
Oct 14, 2016
by
杨培
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改讲师
合并添加与修改讲师后端与前端脚本 调整路由参数,防止类似 my-course 无法应用到路由中的问题
parent
4ef20052
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
145 additions
and
58 deletions
+145
-58
main.php
src/common/config/main.php
+2
-2
TeacherManagerController.php
src/frontend/controllers/TeacherManagerController.php
+67
-27
add.php
src/frontend/views/teacher-manager/add.php
+4
-4
edit.php
src/frontend/views/teacher-manager/edit.php
+32
-0
index.php
src/frontend/views/teacher-manager/index.php
+1
-1
avatar-upload.vue
src/frontend/web/js/components/uploader/avatar-upload.vue
+27
-18
form.js
src/frontend/web/js/teacher-manager/form.js
+11
-5
webpack.config.js
src/frontend/web/webpack.config.js
+1
-1
No files found.
src/common/config/main.php
View file @
2ccbd2a7
...
@@ -44,8 +44,8 @@ return [
...
@@ -44,8 +44,8 @@ return [
'enableStrictParsing'
=>
FALSE
,
'enableStrictParsing'
=>
FALSE
,
'showScriptName'
=>
FALSE
,
'showScriptName'
=>
FALSE
,
'rules'
=>
[
'rules'
=>
[
'<controller:
\w
+>s'
=>
'<controller>/index'
,
'<controller:
[\w\-]
+>s'
=>
'<controller>/index'
,
'<controller:
\w+>/<action:\w
+>/<id:\d+>'
=>
'<controller>/<action>'
,
'<controller:
[\w\-]+>/<action:[\w\-]
+>/<id:\d+>'
=>
'<controller>/<action>'
,
],
],
],
],
'qiniu'
=>
[
'qiniu'
=>
[
...
...
src/frontend/controllers/TeacherManagerController.php
View file @
2ccbd2a7
...
@@ -5,8 +5,8 @@ namespace frontend\controllers;
...
@@ -5,8 +5,8 @@ namespace frontend\controllers;
use
common\components\Qiniu
;
use
common\components\Qiniu
;
use
common\libs\Utils
;
use
common\libs\Utils
;
use
common\models\Teacher
;
use
common\models\Teacher
;
use
common\models\ClassesTeacher
;
use
common\models\UploadPools
;
use
common\models\UploadPools
;
use
common\models\User
;
use
frontend\components\ClassesFilter
;
use
frontend\components\ClassesFilter
;
use
Yii
;
use
Yii
;
use
yii\filters\AccessControl
;
use
yii\filters\AccessControl
;
...
@@ -47,48 +47,88 @@ class TeacherManagerController extends \yii\web\Controller
...
@@ -47,48 +47,88 @@ class TeacherManagerController extends \yii\web\Controller
return
$this
->
render
(
'index'
,
compact
(
'data'
));
return
$this
->
render
(
'index'
,
compact
(
'data'
));
}
}
public
function
actionAdd
()
{
/**
* @var $qiniu Qiniu
*/
$qiniu
=
Yii
::
$app
->
qiniu
;
$path
=
'avatar/'
.
$qiniu
->
generateRandomFilePath
();
$avatarUploadToken
=
$qiniu
->
getUploadToken
(
"public"
,
$path
);
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
);
$avatar
=
$teacher
?
User
::
getAvatarUrl
(
$teacher
->
avatar
)
:
''
;
return
$this
->
render
(
'edit'
,
compact
(
'teacher'
,
'avatarUploadToken'
,
'avatar'
));
}
/**
/**
* 添加讲师
* 添加讲师
*
*
* @return string
* @return string
*/
*/
public
function
action
Add
()
public
function
action
Save
()
{
{
$model
=
new
Teacher
();
if
(
!
Yii
::
$app
->
request
->
getIsPost
())
{
Utils
::
ajaxResponse
(
false
,
'未提交任何数据'
);
return
;
}
$id
=
Yii
::
$app
->
request
->
post
(
'id'
);
$model
=
$id
?
Teacher
::
findOne
(
$id
)
:
new
Teacher
();
$oldAvatar
=
''
;
if
(
$model
->
id
)
{
if
(
$model
->
class_id
!=
$this
->
classStatus
[
'id'
])
{
Utils
::
ajaxResponse
(
false
,
'无权修改该讲师'
);
return
;
}
$oldAvatar
=
$model
->
avatar
;
}
if
(
Yii
::
$app
->
request
->
getIsPost
())
{
$model
->
load
(
Yii
::
$app
->
request
->
post
());
$model
->
load
(
Yii
::
$app
->
request
->
post
());
$model
->
class_id
=
$this
->
classStatus
[
'id'
];
$model
->
class_id
=
$this
->
classStatus
[
'id'
];
//认领头像文件
//认领头像文件
if
(
$model
->
avatar
)
{
if
(
$model
->
avatar
)
{
//值是 @avatar 代表继续保持以前的头像
if
(
$model
->
avatar
==
'@avatar'
)
{
$model
->
avatar
=
$oldAvatar
;
}
else
{
$avatar
=
UploadPools
::
claimFile
(
$model
->
avatar
);
$avatar
=
UploadPools
::
claimFile
(
$model
->
avatar
);
if
(
$avatar
)
{
if
(
$avatar
)
{
$model
->
avatar
=
$avatar
[
'key'
];
$model
->
avatar
=
$avatar
[
'key'
];
}
else
{
}
else
{
$model
->
addError
(
'avatar'
,
'上传的头像不存在'
);
$model
->
addError
(
'avatar'
,
'上传的头像不存在'
);
}
}
}
}
}
if
(
$model
->
validate
()
&&
$model
->
save
())
{
if
(
$model
->
validate
()
&&
$model
->
save
())
{
//移除旧头像
if
(
$oldAvatar
&&
$oldAvatar
!=
$model
->
avatar
)
{
UploadPools
::
deleteFile
(
'public:'
.
$oldAvatar
);
}
Utils
::
ajaxResponse
(
true
,
null
,
$model
->
toArray
());
Utils
::
ajaxResponse
(
true
,
null
,
$model
->
toArray
());
}
else
{
}
else
{
Utils
::
ajaxResponse
(
false
,
Utils
::
fetchErrorFirst
(
$model
->
errors
));
Utils
::
ajaxResponse
(
false
,
Utils
::
fetchErrorFirst
(
$model
->
errors
));
}
}
return
;
}
/**
* @var $qiniu Qiniu
*/
$qiniu
=
Yii
::
$app
->
qiniu
;
$path
=
'avatar/'
.
$qiniu
->
generateRandomFilePath
();
$avatarUploadToken
=
$qiniu
->
getUploadToken
(
"public"
,
$path
);
return
$this
->
render
(
'add'
,
compact
(
'model'
,
'avatarUploadToken'
));
}
}
public
function
actionSimpleTeacherList
()
public
function
actionSimpleTeacherList
()
...
...
src/frontend/views/teacher-manager/add.php
View file @
2ccbd2a7
...
@@ -6,7 +6,7 @@ use frontend\assets\AppAsset;
...
@@ -6,7 +6,7 @@ use frontend\assets\AppAsset;
$this
->
title
=
'添加讲师'
;
$this
->
title
=
'添加讲师'
;
AppAsset
::
addScript
(
$this
,
'@web/assets/teacher_
add
.js'
);
AppAsset
::
addScript
(
$this
,
'@web/assets/teacher_
form
.js'
);
?>
?>
<div
class=
"add-box"
>
<div
class=
"add-box"
>
<div
class=
"add-box-main"
>
<div
class=
"add-box-main"
>
...
@@ -26,8 +26,8 @@ AppAsset::addScript($this, '@web/assets/teacher_add.js');
...
@@ -26,8 +26,8 @@ AppAsset::addScript($this, '@web/assets/teacher_add.js');
<input
type=
"hidden"
name=
"avatar"
value=
"{{avatar}}"
>
<input
type=
"hidden"
name=
"avatar"
value=
"{{avatar}}"
>
<div
class=
"btn-box"
>
<div
class=
"btn-box"
>
<button
class=
"btn btn-nobg
"
>
取消
</button>
<button
type=
"submit"
class=
"btn btn-nobg"
@
click=
"cancelClick
"
>
取消
</button>
<button
class=
"btn btn-save m-l-10"
>
保存
</button>
<button
type=
"submit"
class=
"btn btn-save m-l-10"
>
保存
</button>
</div>
</div>
</form>
</form>
</div>
</div>
...
...
src/frontend/views/teacher-manager/edit.php
0 → 100644
View file @
2ccbd2a7
<?php
use
frontend\assets\AppAsset
;
$this
->
title
=
'修改讲师信息'
;
AppAsset
::
addScript
(
$this
,
'@web/assets/teacher_form.js'
);
?>
<div
class=
"add-box"
>
<div
class=
"add-box-main"
>
<div
class=
"tit"
>
<?=
$this
->
title
?>
</div>
<form
method=
"post"
name=
"teacher"
id=
"teacherForm"
>
<avatar-upload
avatar=
"
<?=
$avatar
?>
"
uptoken=
"
<?=
$avatarUploadToken
?>
"
></avatar-upload>
<div
class=
"type-name"
>
<input
type=
"text"
name=
"name"
placeholder=
"请输入讲师名称..."
value=
"
<?=
$teacher
->
name
?>
"
>
</div>
<div
class=
"teacher-info"
>
<textarea
name=
"intro"
placeholder=
"请输入讲师介绍..."
>
<?=
$teacher
->
intro
?>
</textarea>
<p
class=
"text-number"
>
20 / 500
</p>
</div>
<input
type=
"hidden"
name=
"id"
value=
"
<?=
$teacher
->
id
?>
"
>
<input
type=
"hidden"
name=
"avatar"
value=
"{{avatar}}"
>
<div
class=
"btn-box"
>
<button
type=
"button"
class=
"btn btn-nobg"
@
click=
"cancelClick"
>
取消
</button>
<button
type=
"submit"
class=
"btn btn-save m-l-10"
>
保存
</button>
</div>
</form>
</div>
</div>
src/frontend/views/teacher-manager/index.php
View file @
2ccbd2a7
...
@@ -10,7 +10,7 @@ $this->title = '讲师管理';
...
@@ -10,7 +10,7 @@ $this->title = '讲师管理';
<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>
<?=
$row
[
'intro'
]
?>
</p>
<a
href=
"
#
"
><i
class=
"icon-mode_edit"
></i></a>
<a
href=
"
<?=
\yii\helpers\Url
::
to
([
'teacher-manager/edit'
,
'id'
=>
$row
[
'id'
]])
?>
"
><i
class=
"icon-mode_edit"
></i></a>
</div>
</div>
</div>
</div>
<?php
}
?>
<?php
}
?>
...
...
src/frontend/web/js/components/uploader/avatar-upload.vue
View file @
2ccbd2a7
<
template
>
<
template
>
<div
class=
"upload-avatar"
:id=
"uploaderId"
style=
"cursor:pointer;"
>
<div
class=
"upload-avatar"
:id=
"uploaderId"
style=
"cursor:pointer;"
>
<template
v-if=
"!uploadState && avatar != ''"
>
<img
:src=
"avatar"
>
<div
class=
"upload-avatar-mask"
>
上传头像
</div>
</
template
>
<
template
v-else
>
<i
class=
"icon-image"
></i>
<i
class=
"icon-image"
></i>
<p>
{{
text
}}
</p>
<p>
{{
text
}}
</p>
</
template
>
</div>
</div>
</template>
</template>
<
style
>
.upload-avatar
:hover
.upload-avatar-mask
{
display
:
block
;}
.upload-avatar-mask
{
height
:
30px
;
display
:
none
;
line-height
:
30px
;
color
:
#CCC
;
background-color
:
rgba
(
0
,
0
,
0
,
0.3
);
position
:
absolute
;
z-index
:
3
;
top
:
35px
;
width
:
100%
;}
</
style
>
<
script
>
<
script
>
import
layer
from
"layer-js"
;
import
layer
from
"layer-js"
;
import
str
from
"../../utils/string"
;
import
str
from
"../../utils/string"
;
...
@@ -15,17 +25,26 @@ export default {
...
@@ -15,17 +25,26 @@ export default {
data
()
{
data
()
{
return
{
return
{
uploaderId
:
"avatarUploader"
+
str
.
rand
(
10
),
uploaderId
:
"avatarUploader"
+
str
.
rand
(
10
),
state
:
"ready
"
,
text
:
"
"
,
text
:
""
uploadState
:
true
}
}
},
},
props
:
{
props
:
{
uptoken
:
String
uptoken
:
String
,
avatar
:
{
type
:
String
,
required
:
false
,
default
:
""
}
},
},
ready
()
{
ready
()
{
var
self
=
this
;
var
self
=
this
;
this
.
text
=
defaultText
;
this
.
text
=
defaultText
;
if
(
this
.
avatar
!=
""
)
{
this
.
uploadState
=
false
;
}
var
uploader
=
new
qiniu
.
Uploader
({
var
uploader
=
new
qiniu
.
Uploader
({
browse_button
:
self
.
uploaderId
,
browse_button
:
self
.
uploaderId
,
drop_element
:
self
.
uploaderId
,
drop_element
:
self
.
uploaderId
,
...
@@ -42,14 +61,9 @@ export default {
...
@@ -42,14 +61,9 @@ export default {
auto_start
:
true
,
auto_start
:
true
,
init
:
{
init
:
{
'FilesAdded'
:
function
(
up
,
files
)
{
'FilesAdded'
:
function
(
up
,
files
)
{
plupload
.
each
(
files
,
function
(
file
)
{
// self.videoSize = filesize(file.origSize, {fixed:2, spacer:' '}).human('si');
// self.videoName = file.name;
});
self
.
state
=
'uploading'
;
up
.
start
();
up
.
start
();
self
.
text
=
"上传中.."
;
self
.
text
=
"上传中.."
;
self
.
uploadState
=
true
;
},
},
//每个文件上传前
//每个文件上传前
'BeforeUpload'
:
function
(
up
,
file
)
{
'BeforeUpload'
:
function
(
up
,
file
)
{
...
@@ -61,12 +75,9 @@ export default {
...
@@ -61,12 +75,9 @@ export default {
'FileUploaded'
:
function
(
up
,
file
,
info
)
{
'FileUploaded'
:
function
(
up
,
file
,
info
)
{
self
.
text
=
"上传完成"
;
self
.
text
=
"上传完成"
;
setTimeout
(
function
()
{
self
.
text
=
file
.
name
;
},
1000
);
var
response
=
$
.
parseJSON
(
info
.
response
);
var
response
=
$
.
parseJSON
(
info
.
response
);
$
(
"#"
+
self
.
uploaderId
).
html
(
'<img src="'
+
response
.
src
+
'-m.avatar">'
);
self
.
avatar
=
response
.
src
+
"-m.avatar"
;
self
.
uploadState
=
false
;
self
.
$dispatch
(
"avatar-uploaded"
,
file
.
name
,
response
);
self
.
$dispatch
(
"avatar-uploaded"
,
file
.
name
,
response
);
},
},
...
@@ -79,11 +90,9 @@ export default {
...
@@ -79,11 +90,9 @@ export default {
}
}
layer
.
alert
(
"图片 "
+
err
.
file
.
name
+
" 上传失败!"
+
msg
,
{
icon
:
5
,
title
:
"上传失败"
});
layer
.
alert
(
"图片 "
+
err
.
file
.
name
+
" 上传失败!"
+
msg
,
{
icon
:
5
,
title
:
"上传失败"
});
self
.
state
=
"error"
;
},
},
//队列文件处理完毕后
//队列文件处理完毕后
'UploadComplete'
:
function
()
{
'UploadComplete'
:
function
()
{
self
.
state
=
'completed'
;
uploader
.
disableBrowse
();
uploader
.
disableBrowse
();
}
}
}
}
...
...
src/frontend/web/js/teacher-manager/
add
.js
→
src/frontend/web/js/teacher-manager/
form
.js
View file @
2ccbd2a7
...
@@ -7,11 +7,16 @@ var avatarUploader = require('../components/uploader/avatar-upload.vue');
...
@@ -7,11 +7,16 @@ var avatarUploader = require('../components/uploader/avatar-upload.vue');
var
vm
=
new
Vue
({
var
vm
=
new
Vue
({
el
:
"#teacherForm"
,
el
:
"#teacherForm"
,
data
:
{
data
:
{
avatar
:
""
avatar
:
"
@avatar
"
},
},
components
:
{
components
:
{
"avatar-upload"
:
avatarUploader
"avatar-upload"
:
avatarUploader
},
},
methods
:
{
cancelClick
:
function
()
{
history
.
back
();
}
},
ready
:
function
()
{
ready
:
function
()
{
var
self
=
this
;
var
self
=
this
;
var
form
=
document
.
forms
[
"teacher"
];
var
form
=
document
.
forms
[
"teacher"
];
...
@@ -27,19 +32,20 @@ var vm = new Vue({
...
@@ -27,19 +32,20 @@ var vm = new Vue({
var
idx
=
layer
.
msg
(
"正在提交.."
,
{
icon
:
16
,
shade
:[
0.2
,
'#000'
],
time
:
0
});
var
idx
=
layer
.
msg
(
"正在提交.."
,
{
icon
:
16
,
shade
:[
0.2
,
'#000'
],
time
:
0
});
$
.
post
(
"/teacher-manager/
add
"
,
$
(
form
).
serialize
(),
function
(
t
)
{
$
.
post
(
"/teacher-manager/
save
"
,
$
(
form
).
serialize
(),
function
(
t
)
{
layer
.
close
(
idx
);
layer
.
close
(
idx
);
if
(
t
.
status
)
{
if
(
t
.
status
)
{
layer
.
msg
(
'
添加
成功'
,
{
layer
.
msg
(
'
保存
成功'
,
{
time
:
2000
,
time
:
2000
,
icon
:
1
,
end
:
function
()
{
icon
:
1
,
end
:
function
()
{
location
.
href
=
"/teacher-manager/"
;
location
.
href
=
"/teacher-manager/"
;
},
},
shade
:[
0.2
,
'#000'
]
shade
:[
0.2
,
'#000'
]
});
});
}
else
{
}
else
{
layer
.
alert
(
t
.
message
,
{
icon
:
5
,
title
:
"
添加
失败"
});
layer
.
alert
(
t
.
message
,
{
icon
:
5
,
title
:
"
保存
失败"
});
}
}
},
"json"
);
},
"json"
);
...
...
src/frontend/web/webpack.config.js
View file @
2ccbd2a7
...
@@ -22,7 +22,7 @@ var entry = {
...
@@ -22,7 +22,7 @@ var entry = {
user_center_purchased_course
:
[
js_dir
+
'/user-center/purchased_course.js'
],
user_center_purchased_course
:
[
js_dir
+
'/user-center/purchased_course.js'
],
home_index
:
[
js_dir
+
'/home/index.js'
],
home_index
:
[
js_dir
+
'/home/index.js'
],
course_publish
:
[
js_dir
+
'/my-course/publish.js'
],
course_publish
:
[
js_dir
+
'/my-course/publish.js'
],
teacher_
add
:
[
js_dir
+
'/teacher-manager/add
.js'
]
teacher_
form
:
[
js_dir
+
'/teacher-manager/form
.js'
]
};
};
var
config
=
{
var
config
=
{
...
...
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