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
e222f39b
Commit
e222f39b
authored
Oct 26, 2016
by
汪波
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
parents
6cfd03ed
2b87efe8
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
46 additions
and
35 deletions
+46
-35
userCenter.php
src/frontend/views/layouts/userCenter.php
+44
-33
resetPasswordSuccess.php
src/frontend/views/site/resetPasswordSuccess.php
+1
-1
teacher-quick-list.vue
...ontend/web/js/my-course/components/teacher-quick-list.vue
+1
-1
No files found.
src/frontend/views/layouts/userCenter.php
View file @
e222f39b
...
@@ -4,13 +4,13 @@ use frontend\assets\AppAsset;
...
@@ -4,13 +4,13 @@ use frontend\assets\AppAsset;
/* @var $this \yii\web\View */
/* @var $this \yii\web\View */
/* @var $content string */
/* @var $content string */
$baseUrl
=
\yii\helpers\Url
::
base
();
$baseUrl
=
\yii\helpers\Url
::
base
();
$status
=
\frontend\controllers\UserCenterController
::
getClassStatus
();
$this
->
beginPage
();
$this
->
beginPage
();
$this
->
beginBody
();
$this
->
beginBody
();
$this
->
beginContent
(
'@app/views/layouts/center.php'
);
$this
->
beginContent
(
'@app/views/layouts/center.php'
);
?>
?>
<div
class=
"tp-sidebar"
>
<div
class=
"tp-sidebar"
>
<div
class=
"logo"
><a
href=
"
<?=
\yii\helpers\Url
::
base
()
?>
"
><img
<div
class=
"logo"
><a
href=
"
<?=
\yii\helpers\Url
::
base
()
?>
"
><img
src=
"
<?=
AppAsset
::
getStaticUrl
(
'img/logo.png'
)
?>
"
></a></div>
src=
"
<?=
AppAsset
::
getStaticUrl
(
'img/logo.png'
)
?>
"
></a></div>
<div
class=
"side-menu"
>
<div
class=
"side-menu"
>
...
@@ -32,27 +32,38 @@ $this->beginContent('@app/views/layouts/center.php');
...
@@ -32,27 +32,38 @@ $this->beginContent('@app/views/layouts/center.php');
</ul>
</ul>
<div
class=
"apply-class"
>
<div
class=
"apply-class"
>
<button
class=
"btn btn-danger"
onclick=
"location.href='/classes-info/apply';"
>
申请课堂
</button>
<?php
if
(
$status
===
0
)
:
?>
<button
class=
"btn btn-primary"
onclick=
"location.href='/my-course';"
>
我的课堂
</button>
<button
class=
"btn btn-danger"
onclick=
"location.href='/classes-info/apply';"
>
申请课堂
</button>
<?php
elseif
(
$status
===
2
)
:
?>
<button
class=
"btn btn-danger"
onclick=
"location.href='/classes-info/apply';"
>
课堂审核中...
</button>
<?php
elseif
(
$status
===
1
)
:
?>
<button
class=
"btn btn-primary"
onclick=
"location.href='/classes-info';"
>
我的课堂
</button>
<?php
endif
;
?>
</div>
</div>
<a
class=
"loginout"
href=
"
<?=
$baseUrl
.
'/site/logout'
?>
"
><i
class=
"icon-power_settings_new"
></i>
退出登录
</a>
<a
class=
"loginout"
href=
"
<?=
$baseUrl
.
'/site/logout'
?>
"
><i
class=
"icon-power_settings_new"
></i>
退出登录
</a>
</div>
</div>
</div>
</div>
<div
class=
"auto-main"
>
<div
class=
"auto-main"
>
<?=
$this
->
render
(
'centerHeader'
)
?>
<?=
$this
->
render
(
'centerHeader'
)
?>
<div
class=
"tp-main"
>
<div
class=
"tp-main"
>
<div
class=
"container"
>
<div
class=
"container"
>
<?=
$content
?>
<?=
$content
?>
</div>
</div>
</div>
</div>
</div>
</div>
<script
type=
'text/javascript'
>
<script
type=
'text/javascript'
>
$
(
function
()
{
$
(
function
()
{
$
(
'.menu-btn'
).
click
(
function
()
{
$
(
'.menu-btn'
).
click
(
function
()
{
$
(
'.tp-sidebar'
).
animate
({
left
:
"0"
});
$
(
'.tp-sidebar'
).
animate
({
left
:
"0"
});
});
});
})
})
</script>
</script>
...
...
src/frontend/views/site/resetPasswordSuccess.php
View file @
e222f39b
...
@@ -34,7 +34,7 @@ $this->title = '密码设置成功';
...
@@ -34,7 +34,7 @@ $this->title = '密码设置成功';
</div>
</div>
<div
class=
"foot-reg-btn"
>
<div
class=
"foot-reg-btn"
>
<button
class=
"btn btn-reg"
onclick=
"window.location.href='
<?=
\yii\helpers\Url
::
base
()
.
"/site"
?>
'"
<button
class=
"btn btn-reg"
onclick=
"window.location.href='
<?=
\yii\helpers\Url
::
base
()
.
"/site
/login
"
?>
'"
type=
"submit"
>
去登录
type=
"submit"
>
去登录
</button>
</button>
</div>
</div>
...
...
src/frontend/web/js/my-course/components/teacher-quick-list.vue
View file @
e222f39b
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
<div
class=
"d-i-b"
v-if=
"addFormShow"
>
<div
class=
"d-i-b"
v-if=
"addFormShow"
>
<input
type=
"text"
class=
"input-r-control reset-input"
placeholder=
"请输入讲师名称"
v-model=
"newName"
v-el:nameInput
>
<input
type=
"text"
class=
"input-r-control reset-input"
placeholder=
"请输入讲师名称"
v-model=
"newName"
v-el:nameInput
>
<button
type=
"button"
class=
"btn btn-nobg"
@
click=
"addTeacher"
>
保存
</button>
<button
type=
"button"
class=
"btn btn-nobg"
@
click=
"addTeacher"
>
保存
</button>
<button
type=
"button"
class=
"btn btn-nobg"
>
取消
</button>
<button
type=
"button"
class=
"btn btn-nobg"
@
click=
"addFormShow=false"
>
取消
</button>
</div>
</div>
<span
class=
"m-l-10"
v-else
><a
href=
"javascript:;"
@
click=
"showAddForm"
>
+ 添加讲师
</a></span>
<span
class=
"m-l-10"
v-else
><a
href=
"javascript:;"
@
click=
"showAddForm"
>
+ 添加讲师
</a></span>
</div>
</div>
...
...
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