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
84517679
Commit
84517679
authored
Oct 31, 2016
by
杨培
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
parents
02a13c10
309cbc76
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
41 additions
and
20 deletions
+41
-20
UserCenterController.php
src/frontend/controllers/UserCenterController.php
+1
-1
SignupForm.php
src/frontend/models/SignupForm.php
+3
-2
main.php
src/frontend/views/layouts/main.php
+1
-1
userCenter.php
src/frontend/views/layouts/userCenter.php
+5
-2
signup.php
src/frontend/views/site/signup.php
+1
-2
tokenInput.php
src/frontend/views/site/tokenInput.php
+1
-1
login.css
src/frontend/web/css/login.css
+10
-6
main.css
src/frontend/web/css/main.css
+0
-3
style.css
src/frontend/web/css/style.css
+17
-0
logo.png
src/frontend/web/img/logo.png
+0
-0
logo_white.png
src/frontend/web/img/logo_white.png
+0
-0
video.vue
src/frontend/web/js/home/components/video.vue
+2
-2
No files found.
src/frontend/controllers/UserCenterController.php
View file @
84517679
...
...
@@ -144,7 +144,7 @@ class UserCenterController extends Controller
$msg
=
""
;
if
(
Utils
::
getStringLen
(
$username
)
>
20
)
{
$status
=
FALSE
;
$msg
=
'昵称
超过长度限制
'
;
$msg
=
'昵称
请保持在10个汉字以内
'
;
}
else
{
$user
=
Yii
::
$app
->
user
->
identity
;
$oldAvatar
=
FALSE
;
//标记是否进行资源清理
...
...
src/frontend/models/SignupForm.php
View file @
84517679
...
...
@@ -21,6 +21,7 @@ class SignupForm extends Model
public
$rePassword
;
public
$from
;
public
$verifyCode
;
public
$token
;
/**
* @inheritdoc
...
...
@@ -29,7 +30,7 @@ class SignupForm extends Model
{
return
[
[
'telephone'
,
'trim'
],
[[
'telephone'
,
'from'
],
'required'
],
[[
'telephone'
,
'from'
,
'token'
],
'required'
],
[
'telephone'
,
'unique'
,
'targetClass'
=>
'\common\models\User'
,
'message'
=>
'该电话号码已经被注册'
],
[
'telephone'
,
'validateTelephone'
],
[[
'password'
,
'rePassword'
],
'required'
],
...
...
@@ -38,7 +39,7 @@ class SignupForm extends Model
[
'rePassword'
,
'compare'
,
'compareAttribute'
=>
'password'
],
[
'from'
,
'integer'
],
[
'verifyCode'
,
'required'
],
[
'verifyCode'
,
'captcha'
]
[
'verifyCode'
,
'captcha'
,
'message'
=>
'验证码不正确'
]
];
}
...
...
src/frontend/views/layouts/main.php
View file @
84517679
...
...
@@ -28,7 +28,7 @@ $baseUrl = \yii\helpers\Url::base();
<?php
if
(
Yii
::
$app
->
user
->
isGuest
)
:
?>
<div
class=
"navbar-main navbar-static-top clearfix"
>
<div
id=
"main-logo"
class=
"logo pull-left logo-home"
><a
href=
"
<?=
$baseUrl
.
"/user-center/"
?>
"
></a></div>
<div
id=
"main-logo"
class=
"logo pull-left logo-home"
><a
href=
"
<?=
$baseUrl
.
"/user-center/"
?>
"
>
云涯
</a></div>
<!--
<ul class="c-menu-item pull-left">
<li class="active"><a href="#">首页</a></li>
...
...
src/frontend/views/layouts/userCenter.php
View file @
84517679
...
...
@@ -11,8 +11,11 @@ $this->beginContent('@app/views/layouts/center.php');
?>
<div
class=
"tp-sidebar"
>
<div
class=
"logo"
><a
href=
"
<?=
\yii\helpers\Url
::
base
()
?>
"
><img
src=
"
<?=
AppAsset
::
getStaticUrl
(
'img/logo.png'
)
?>
"
></a></div>
<div
class=
"logo"
>
<a
href=
"
<?=
\yii\helpers\Url
::
base
()
?>
"
>
<span
class=
"clearfix"
><img
src=
"
<?=
AppAsset
::
getStaticUrl
(
'img/logo.png'
)
?>
"
>
<b>
云涯
</b></span>
</a>
</div>
<div
class=
"side-menu"
>
<!-- 左侧菜单 -->
...
...
src/frontend/views/site/signup.php
View file @
84517679
...
...
@@ -34,7 +34,7 @@ $this->registerJsFile('http://static.geetest.com/static/tools/gt.js');
</div>
<div
class=
"v-code input-wrapper"
>
<input
id=
"token"
name=
"token"
type=
"text"
class=
""
placeholder=
"验证码"
>
<input
id=
"token"
name=
"token"
type=
"text"
value=
"
<?=
$model
->
token
?>
"
class=
""
placeholder=
"验证码"
>
<span
id=
"token_tips"
class=
"tips tip-vcode"
>
<?=
$model
->
getFirstError
(
'token'
)
?>
</span>
<button
class=
"btn btn-get-vcode"
id=
"send_msg"
>
获取验证码
</button>
</div>
...
...
@@ -47,7 +47,6 @@ $this->registerJsFile('http://static.geetest.com/static/tools/gt.js');
<div
class=
"check-password input-wrapper"
>
<input
id=
"repassword"
name=
"rePassword"
type=
"password"
class=
""
placeholder=
"再次输入密码"
required=
""
>
<span
class=
"tips tip-vcode"
>
<?=
$model
->
getFirstError
(
'rePassword'
)
?>
</span>
<span
id=
"repassword_tips"
class=
"tips"
>
<?=
$model
->
getFirstError
(
'rePassword'
)
?>
</span>
</div>
<div
class=
"verify-code-box input-wrapper last-wrapper"
>
...
...
src/frontend/views/site/tokenInput.php
View file @
84517679
...
...
@@ -37,7 +37,7 @@ $this->registerJsFile('http://static.geetest.com/static/tools/gt.js');
<div
class=
"reg-box"
>
<div
class=
"phone input-wrapper"
>
<input
name=
"token"
type=
"text"
class=
""
value=
"
<?=
$model
->
token
?>
"
placeholder=
"请输入6位验证码"
required=
""
autofocus=
""
>
<input
name=
"token"
type=
"text"
class=
""
value=
"
<?=
$model
->
token
?>
"
placeholder=
"请输入6位
短信
验证码"
required=
""
autofocus=
""
>
<span
class=
"tips"
>
<?=
$model
->
getFirstError
(
'token'
)
?>
</span>
</div>
<div
class=
"verify-code-box input-wrapper last-wrapper"
"
>
...
...
src/frontend/web/css/login.css
View file @
84517679
...
...
@@ -20,9 +20,13 @@ a,a:hover,a:link {
}
.logo-home
a
{
display
:
block
;
width
:
12
0px
;
width
:
8
0px
;
height
:
60px
;
background
:
url(../img/logo_white.png)
left
top
no-repeat
;
font-size
:
14px
;
line-height
:
60px
;
text-indent
:
35px
;
color
:
#107fbd
;
}
.yun-login-btn
{
margin-right
:
30px
;
...
...
@@ -125,14 +129,14 @@ a,a:hover,a:link {
}
.form-register
{
width
:
30
0px
;
width
:
29
0px
;
display
:
inline-block
;
border
:
1px
solid
#d5d5d5
;
border-radius
:
3px
;
background-color
:
#fff
;
}
.reg-box
{
width
:
30
0px
;
width
:
29
0px
;
display
:
inline-block
;
border
:
1px
solid
#d5d5d5
;
border-radius
:
3px
;
...
...
@@ -208,7 +212,7 @@ a,a:hover,a:link {
}
.btn-reg
{
width
:
30
0px
;
width
:
29
0px
;
height
:
44px
;
line-height
:
44px
;
padding
:
0
;
...
...
@@ -221,7 +225,7 @@ a,a:hover,a:link {
}
.btn-log
{
width
:
30
0px
;
width
:
29
0px
;
height
:
44px
;
line-height
:
44px
;
padding
:
0
;
...
...
@@ -233,7 +237,7 @@ a,a:hover,a:link {
color
:
#fff
;
}
.part-wap
{
width
:
30
0px
;
width
:
29
0px
;
margin
:
20px
auto
0
;
text-align
:
left
;
}
...
...
src/frontend/web/css/main.css
View file @
84517679
...
...
@@ -964,9 +964,6 @@ a,a:hover,a:link {
.video-js
.vjs-play-progress
{
background-color
:
#f12b24
!important
;
}
.video-js
.vjs-load-progress
{
}
src/frontend/web/css/style.css
View file @
84517679
...
...
@@ -86,6 +86,23 @@ a:link, a:active, a:visited {
display
:
inline-block
;
}
.logo
a
span
{
display
:
inline-block
;
height
:
60px
;
}
.logo
a
span
img
{
float
:
left
;
}
.logo
a
span
b
{
float
:
left
;
font-weight
:
normal
;
display
:
inline-block
;
height
:
60px
;
line-height
:
60px
;
color
:
#fff
;
padding-left
:
10px
;
}
.accordion
,
.accordion
li
{
...
...
src/frontend/web/img/logo.png
View replaced file @
02a13c10
View file @
84517679
2.13 KB
|
W:
|
H:
1.61 KB
|
W:
|
H:
2-up
Swipe
Onion skin
src/frontend/web/img/logo_white.png
View replaced file @
02a13c10
View file @
84517679
2.2 KB
|
W:
|
H:
1.62 KB
|
W:
|
H:
2-up
Swipe
Onion skin
src/frontend/web/js/home/components/video.vue
View file @
84517679
...
...
@@ -91,7 +91,7 @@
})
//没购买显示
if
(
this
.
videoInfo
.
isShop
==
false
)
{
myPlayer
.
bigPlayButton
.
on
(
'click
'
,
function
()
{
myPlayer
.
on
(
'play
'
,
function
()
{
self
.
showTips
=
false
;
});
...
...
@@ -103,7 +103,7 @@
});
});
}
else
if
(
this
.
videoInfo
.
isMe
){
myPlayer
.
bigPlayButton
.
on
(
'click'
,
function
()
{
myPlayer
.
on
(
'play'
,
function
()
{
self
.
showIsMeTips
=
false
;
});
}
...
...
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