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
c7181066
Commit
c7181066
authored
Oct 27, 2016
by
杨培
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
parents
c2904c88
3f361c70
Changes
12
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
160 additions
and
32 deletions
+160
-32
SiteController.php
src/frontend/controllers/SiteController.php
+2
-2
classCenter.php
src/frontend/views/layouts/classCenter.php
+10
-10
index.php
src/frontend/views/my-income/index.php
+1
-1
main.css
src/frontend/web/css/main.css
+6
-0
reset.css
src/frontend/web/css/reset.css
+45
-0
style.css
src/frontend/web/css/style.css
+62
-16
icomoon.eot
src/frontend/web/fonts/icomoon.eot
+0
-0
icomoon.svg
src/frontend/web/fonts/icomoon.svg
+15
-0
icomoon.ttf
src/frontend/web/fonts/icomoon.ttf
+0
-0
icomoon.woff
src/frontend/web/fonts/icomoon.woff
+0
-0
video-upload.vue
src/frontend/web/js/components/uploader/video-upload.vue
+7
-0
video-play.vue
src/frontend/web/js/home/components/video-play.vue
+12
-3
No files found.
src/frontend/controllers/SiteController.php
View file @
c7181066
...
@@ -280,13 +280,13 @@ function actionResetPasswordSuccess()
...
@@ -280,13 +280,13 @@ function actionResetPasswordSuccess()
/**
/**
* 设置登录后回调url
* 设置登录后回调url
* @param $url
* @throws \yii\web\ForbiddenHttpException
* @throws \yii\web\ForbiddenHttpException
*/
*/
public
public
function
actionSetReturnUrl
(
$url
)
function
actionSetReturnUrl
()
{
{
if
(
Yii
::
$app
->
request
->
isAjax
)
{
if
(
Yii
::
$app
->
request
->
isAjax
)
{
$url
=
Yii
::
$app
->
request
->
post
(
'returnUrl'
);
Yii
::
$app
->
user
->
setReturnUrl
(
$url
);
Yii
::
$app
->
user
->
setReturnUrl
(
$url
);
Utils
::
ajaxResponse
(
TRUE
);
Utils
::
ajaxResponse
(
TRUE
);
}
else
{
}
else
{
...
...
src/frontend/views/layouts/classCenter.php
View file @
c7181066
...
@@ -18,29 +18,29 @@ $this->beginContent('@app/views/layouts/center.php');
...
@@ -18,29 +18,29 @@ $this->beginContent('@app/views/layouts/center.php');
<!-- Contenedor -->
<!-- Contenedor -->
<ul
id=
"accordion"
class=
"accordion"
data-route=
"
<?=
Yii
::
$app
->
controller
->
id
?>
_
<?=
Yii
::
$app
->
requestedAction
->
id
?>
"
>
<ul
id=
"accordion"
class=
"accordion"
data-route=
"
<?=
Yii
::
$app
->
controller
->
id
?>
_
<?=
Yii
::
$app
->
requestedAction
->
id
?>
"
>
<li>
<li>
<div
class=
"link"
>
<i
class=
"icon-school"
></i>
我的课堂
<i
class=
"icon-navigate_next"
></i
></div>
<div
class=
"link"
>
我的课堂
<!--<i class="icon-navigate_next"></i>--
>
</div>
<ul
class=
"submenu"
>
<ul
class=
"submenu"
>
<li
class=
"RT_classes-info_index"
><a
href=
"/classes-info"
>
课堂概况
</a></li>
<li
class=
"RT_classes-info_index"
><a
href=
"/classes-info"
>
<i
class=
"icon-school"
></i>
课堂概况
</a></li>
<li
class=
"RT_teacher-manager_index RT_teacher-manager_edit RT_teacher-manager_add"
><a
href=
"/teacher-manager"
>
讲师管理
</a></li>
<li
class=
"RT_teacher-manager_index RT_teacher-manager_edit RT_teacher-manager_add"
><a
href=
"/teacher-manager"
>
<i
class=
"icon-folder_shared"
></i>
讲师管理
</a></li>
</ul>
</ul>
</li>
</li>
<li>
<li>
<div
class=
"link"
>
<i
class=
"icon-play_circle_outline"
></i>
我的课程
<i
class=
"icon-navigate_next"
></i>
</div>
<div
class=
"link"
>
我的课程
</div>
<ul
class=
"submenu"
>
<ul
class=
"submenu"
>
<li
class=
"RT_my-course_publish RT_my-course_edit"
><a
href=
"/my-course/publish"
>
发布课程
</a></li>
<li
class=
"RT_my-course_publish RT_my-course_edit"
><a
href=
"/my-course/publish"
>
<i
class=
"icon-create_new_folder"
></i>
发布课程
</a></li>
<li
class=
"RT_my-course_index"
><a
href=
"/my-course"
>
课程列表
</a></li>
<li
class=
"RT_my-course_index"
><a
href=
"/my-course"
>
<i
class=
"icon-assignment"
></i>
课程列表
</a></li>
</ul>
</ul>
</li>
</li>
<li>
<li>
<div
class=
"link"
>
<i
class=
"icon-person_pin"
></i>
我的会员
<i
class=
"icon-navigate_next"
></i>
</div>
<div
class=
"link"
>
我的会员
</div>
<ul
class=
"submenu"
>
<ul
class=
"submenu"
>
<li
class=
"RT_my-member_index"
><a
href=
"/my-member"
>
会员列表
</a></li>
<li
class=
"RT_my-member_index"
><a
href=
"/my-member"
>
<i
class=
"icon-person_pin"
></i>
会员列表
</a></li>
</ul>
</ul>
</li>
</li>
<li>
<li>
<div
class=
"link"
>
<i
class=
"icon-layers"
></i>
知识有价
<i
class=
"icon-navigate_next"
></i>
</div>
<div
class=
"link"
>
知识有价
</div>
<ul
class=
"submenu"
>
<ul
class=
"submenu"
>
<li
class=
"RT_my-income_index"
><a
href=
"/my-income"
>
购买记录
</a></li>
<li
class=
"RT_my-income_index"
><a
href=
"/my-income"
>
<i
class=
"icon-shop"
></i>
购买记录
</a></li>
</ul>
</ul>
</li>
</li>
</ul>
</ul>
...
...
src/frontend/views/my-income/index.php
View file @
c7181066
...
@@ -21,7 +21,7 @@ AppAsset::addScript($this, '@web/assets/my_income.js');
...
@@ -21,7 +21,7 @@ AppAsset::addScript($this, '@web/assets/my_income.js');
<div
class=
"clearfix"
>
<div
class=
"clearfix"
>
<div
class=
"band-wx-info pull-left"
><img
src=
"
<?=
SettleAccountWeixin
::
headResize
(
$account
[
'headimgurl'
],
SettleAccountWeixin
::
HEAD_SIZE_S
)
?>
"
>
<div
class=
"band-wx-info pull-left"
><img
src=
"
<?=
SettleAccountWeixin
::
headResize
(
$account
[
'headimgurl'
],
SettleAccountWeixin
::
HEAD_SIZE_S
)
?>
"
>
<span>
<?=
Html
::
encode
(
$account
[
'nickname'
])
?>
</span></div>
<span>
<?=
Html
::
encode
(
$account
[
'nickname'
])
?>
</span></div>
<button
class=
"btn btn-
default
pull-left"
@
click=
"weixinUnbindClick"
>
取消绑定
</button>
<button
class=
"btn btn-
link
pull-left"
@
click=
"weixinUnbindClick"
>
取消绑定
</button>
</div>
</div>
<?php
}
else
{
?>
<?php
}
else
{
?>
<button
type=
"button"
class=
"btn btn-save"
@
click=
"weixinBindClick"
>
绑定
</button>
<button
type=
"button"
class=
"btn btn-save"
@
click=
"weixinBindClick"
>
绑定
</button>
...
...
src/frontend/web/css/main.css
View file @
c7181066
...
@@ -826,6 +826,12 @@ a,a:hover,a:link {
...
@@ -826,6 +826,12 @@ a,a:hover,a:link {
border-top
:
1px
solid
#f3f3f3
;
border-top
:
1px
solid
#f3f3f3
;
z-index
:
10
z-index
:
10
}
}
.logo
{
margin-left
:
15px
;
}
.avatar
{
padding-right
:
15px
;
}
}
}
/*分享样式修改*/
/*分享样式修改*/
...
...
src/frontend/web/css/reset.css
View file @
c7181066
...
@@ -255,15 +255,39 @@ i, em {
...
@@ -255,15 +255,39 @@ i, em {
.icon-zan-full
:before
{
.icon-zan-full
:before
{
content
:
"\e905"
;
content
:
"\e905"
;
}
}
.icon-alarm
:before
{
content
:
"\e855"
;
}
.icon-access_alarms
:before
{
content
:
"\e191"
;
}
.icon-account_box
:before
{
content
:
"\e851"
;
}
.icon-add
:before
{
.icon-add
:before
{
content
:
"\e145"
;
content
:
"\e145"
;
}
}
.icon-add_to_queue
:before
{
content
:
"\e05c"
;
}
.icon-alarm_on
:before
{
content
:
"\e858"
;
}
.icon-arrow_drop_down
:before
{
.icon-arrow_drop_down
:before
{
content
:
"\e5c5"
;
content
:
"\e5c5"
;
}
}
.icon-arrow_drop_up
:before
{
.icon-arrow_drop_up
:before
{
content
:
"\e5c7"
;
content
:
"\e5c7"
;
}
}
.icon-assignment
:before
{
content
:
"\e85d"
;
}
.icon-assignment_ind
:before
{
content
:
"\e85e"
;
}
.icon-assignment_turned_in
:before
{
content
:
"\e862"
;
}
.icon-chat
:before
{
.icon-chat
:before
{
content
:
"\e0b7"
;
content
:
"\e0b7"
;
}
}
...
@@ -285,9 +309,15 @@ i, em {
...
@@ -285,9 +309,15 @@ i, em {
.icon-cloud_download
:before
{
.icon-cloud_download
:before
{
content
:
"\e2c0"
;
content
:
"\e2c0"
;
}
}
.icon-cloud_queue
:before
{
content
:
"\e2c2"
;
}
.icon-palette
:before
{
.icon-palette
:before
{
content
:
"\e40a"
;
content
:
"\e40a"
;
}
}
.icon-contacts
:before
{
content
:
"\e0ba"
;
}
.icon-mode_edit
:before
{
.icon-mode_edit
:before
{
content
:
"\e254"
;
content
:
"\e254"
;
}
}
...
@@ -306,6 +336,18 @@ i, em {
...
@@ -306,6 +336,18 @@ i, em {
.icon-fingerprint
:before
{
.icon-fingerprint
:before
{
content
:
"\e90d"
;
content
:
"\e90d"
;
}
}
.icon-folder_shared
:before
{
content
:
"\e2c9"
;
}
.icon-lock2
:before
{
content
:
"\e897"
;
}
.icon-local_cafe
:before
{
content
:
"\e541"
;
}
.icon-local_florist
:before
{
content
:
"\e545"
;
}
.icon-ondemand_video
:before
{
.icon-ondemand_video
:before
{
content
:
"\e63a"
;
content
:
"\e63a"
;
}
}
...
@@ -342,6 +384,9 @@ i, em {
...
@@ -342,6 +384,9 @@ i, em {
.icon-verified_user
:before
{
.icon-verified_user
:before
{
content
:
"\e8e8"
;
content
:
"\e8e8"
;
}
}
.icon-zoom_out_map
:before
{
content
:
"\e56b"
;
}
.icon-eye
:before
{
.icon-eye
:before
{
content
:
"\e000"
;
content
:
"\e000"
;
}
}
...
...
src/frontend/web/css/style.css
View file @
c7181066
...
@@ -29,6 +29,9 @@ a:link,a:active,a:visited {
...
@@ -29,6 +29,9 @@ a:link,a:active,a:visited {
.tit
{
.tit
{
font-size
:
16px
;
font-size
:
16px
;
}
}
.btn
{
outline
:
none
;
}
/*side bar*/
/*side bar*/
...
@@ -66,12 +69,12 @@ a:link,a:active,a:visited {
...
@@ -66,12 +69,12 @@ a:link,a:active,a:visited {
width
:
100%
;
width
:
100%
;
}
}
.accordion
.link
{
.accordion
.link
{
cursor
:
pointer
;
display
:
block
;
display
:
block
;
padding
:
15px
15px
15px
42
px
;
padding
:
15px
15px
5px
10
px
;
color
:
#7fa6ad
;
color
:
#7fa6ad
;
font-size
:
1
4
px
;
font-size
:
1
2
px
;
position
:
relative
;
position
:
relative
;
-webkit-transition
:
all
0.4s
ease
;
-webkit-transition
:
all
0.4s
ease
;
-o-transition
:
all
0.4s
ease
;
-o-transition
:
all
0.4s
ease
;
...
@@ -82,16 +85,6 @@ a:link,a:active,a:visited {
...
@@ -82,16 +85,6 @@ a:link,a:active,a:visited {
.accordion
li
:last-child
.link
{
.accordion
li
:last-child
.link
{
border-bottom
:
0
;
border-bottom
:
0
;
}
}
.accordion
li
i
{
position
:
absolute
;
top
:
16px
;
left
:
12px
;
font-size
:
18px
;
color
:
#7fa6ad
;
-webkit-transition
:
all
0.4s
ease
;
-o-transition
:
all
0.4s
ease
;
transition
:
all
0.4s
ease
;
}
.accordion
li
i
.icon-navigate_next
{
.accordion
li
i
.icon-navigate_next
{
right
:
12px
;
right
:
12px
;
...
@@ -125,17 +118,33 @@ a:link,a:active,a:visited {
...
@@ -125,17 +118,33 @@ a:link,a:active,a:visited {
}
}
.submenu
li
{
.submenu
li
{
position
:
relative
;
width
:
100%
;
width
:
100%
;
}
}
.submenu
li
a
{
border-left
:
2px
solid
transparent
;
}
.submenu
li
i
{
position
:
absolute
;
top
:
14px
;
left
:
14px
;
font-size
:
18px
;
color
:
#7fa6ad
;
-webkit-transition
:
all
0.4s
ease
;
-o-transition
:
all
0.4s
ease
;
transition
:
all
0.4s
ease
;
}
.submenu
li
.active
a
{
.submenu
li
.active
a
{
color
:
#7fc1fc
;
background-color
:
#313a46
;
border-left
:
2px
solid
#607ca1
;
color
:
#fff
;
}
}
.submenu
a
{
.submenu
a
{
display
:
block
;
display
:
block
;
text-decoration
:
none
;
text-decoration
:
none
;
color
:
#fff
;
color
:
#fff
;
padding
:
12px
12px
12px
42
px
;
padding
:
12px
12px
12px
38
px
;
-webkit-transition
:
all
0.25s
ease
;
-webkit-transition
:
all
0.25s
ease
;
-o-transition
:
all
0.25s
ease
;
-o-transition
:
all
0.25s
ease
;
transition
:
all
0.25s
ease
;
transition
:
all
0.25s
ease
;
...
@@ -868,7 +877,7 @@ textarea.input-r-control {
...
@@ -868,7 +877,7 @@ textarea.input-r-control {
font-size
:
12px
;
font-size
:
12px
;
padding-top
:
8px
;
padding-top
:
8px
;
}
}
.upload-ready
i
{
.upload-ready
>
i
{
position
:
absolute
;
position
:
absolute
;
left
:
0
;
left
:
0
;
bottom
:
0
;
bottom
:
0
;
...
@@ -878,6 +887,43 @@ textarea.input-r-control {
...
@@ -878,6 +887,43 @@ textarea.input-r-control {
border-radius
:
0
0
0
3px
;
border-radius
:
0
0
0
3px
;
background-color
:
#4285f4
;
background-color
:
#4285f4
;
}
}
.upload-ready
a
.delete
{
position
:
absolute
;
right
:
5px
;
top
:
5px
;
display
:
inline-block
;
width
:
20px
;
height
:
20px
;
border-radius
:
100%
;
color
:
#666
;
text-align
:
center
;
line-height
:
20px
;
}
.upload-ready
a
.delete
i
{
color
:
#999
;
font-size
:
12px
;
}
.upload-ready
a
.delete
:hover
i
{
color
:
#333
;
}
.upload-ready
.tip-upload-rdy
{
position
:
absolute
;
left
:
0
;
top
:
0
;
background-color
:
rgba
(
255
,
133
,
0
,
.8
);
color
:
#fff
;
display
:
inline-block
;
width
:
300px
;
height
:
90px
;
font-size
:
12px
;
border-radius
:
3px
;
text-align
:
center
;
}
.upload-ready
.tip-upload-rdy
i
{
font-size
:
18px
;
display
:
block
;
padding
:
20px
0
10px
5px
;
}
.cls-intro-textarea
{
.cls-intro-textarea
{
margin-top
:
10px
;
margin-top
:
10px
;
}
}
...
...
src/frontend/web/fonts/icomoon.eot
View file @
c7181066
No preview for this file type
src/frontend/web/fonts/icomoon.svg
View file @
c7181066
This diff is collapsed.
Click to expand it.
src/frontend/web/fonts/icomoon.ttf
View file @
c7181066
No preview for this file type
src/frontend/web/fonts/icomoon.woff
View file @
c7181066
No preview for this file type
src/frontend/web/js/components/uploader/video-upload.vue
View file @
c7181066
...
@@ -16,6 +16,13 @@
...
@@ -16,6 +16,13 @@
<div
class=
"time pull-right"
>
大约还剩
<span
class=
"upload-info-remain"
>
{{
remain
}}
</span></div>
<div
class=
"time pull-right"
>
大约还剩
<span
class=
"upload-info-remain"
>
{{
remain
}}
</span></div>
</div>
</div>
<i
class=
"upload-progress"
v-bind:style=
"
{width:progress + '%'}">
</i>
<i
class=
"upload-progress"
v-bind:style=
"
{width:progress + '%'}">
</i>
<!--上传完成-->
<!--
<span
class=
"tip-upload-rdy"
><i
class=
"icon-check"
></i>
上传完成
</span>
-->
<a
href=
"#"
class=
"delete"
><i
class=
"icon-cross"
></i></a>
</div>
</div>
</div>
</div>
</
template
>
</
template
>
...
...
src/frontend/web/js/home/components/video-play.vue
View file @
c7181066
...
@@ -199,10 +199,19 @@
...
@@ -199,10 +199,19 @@
window.location.href = url;
window.location.href = url;
}
,
}
,
login(){
login(){
var returnUrl = __BASE_URL__ + 'home/video?courseId=' + this.coursewareInfo.course_id + '&pay=1';
var returnUrl = __BASE_URL__ + 'home/video?pay=1&courseId=' + this.coursewareInfo.course_id;
returnUrl = encodeURI(returnUrl);
var url = __BASE_URL__ + 'site/set-return-url?url=' + returnUrl;
var url = __BASE_URL__ + 'site/set-return-url?url=' + returnUrl;
$.getJSON(url, function () {
$.ajax({
type:'POST',
url:url,
data: {
returnUrl:returnUrl
}
,
dataType: "
json
",
success:function () {
window.location.href = __BASE_URL__ + 'site/login';
window.location.href = __BASE_URL__ + 'site/login';
}
}
).error(function () {
}
).error(function () {
layer.alert('设置登录回调url错误', {'icon': 2, 'title': '提示'
}
)
layer.alert('设置登录回调url错误', {'icon': 2, 'title': '提示'
}
)
}
);
}
);
...
...
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