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
309cbc76
Commit
309cbc76
authored
Oct 31, 2016
by
汪波
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
parents
6bd70f43
1e8209de
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
UserCenterController.php
src/frontend/controllers/UserCenterController.php
+1
-1
SignupForm.php
src/frontend/models/SignupForm.php
+3
-2
signup.php
src/frontend/views/site/signup.php
+1
-2
tokenInput.php
src/frontend/views/site/tokenInput.php
+1
-1
No files found.
src/frontend/controllers/UserCenterController.php
View file @
309cbc76
...
@@ -144,7 +144,7 @@ class UserCenterController extends Controller
...
@@ -144,7 +144,7 @@ class UserCenterController extends Controller
$msg
=
""
;
$msg
=
""
;
if
(
Utils
::
getStringLen
(
$username
)
>
20
)
{
if
(
Utils
::
getStringLen
(
$username
)
>
20
)
{
$status
=
FALSE
;
$status
=
FALSE
;
$msg
=
'昵称
超过长度限制
'
;
$msg
=
'昵称
请保持在10个汉字以内
'
;
}
else
{
}
else
{
$user
=
Yii
::
$app
->
user
->
identity
;
$user
=
Yii
::
$app
->
user
->
identity
;
$oldAvatar
=
FALSE
;
//标记是否进行资源清理
$oldAvatar
=
FALSE
;
//标记是否进行资源清理
...
...
src/frontend/models/SignupForm.php
View file @
309cbc76
...
@@ -21,6 +21,7 @@ class SignupForm extends Model
...
@@ -21,6 +21,7 @@ class SignupForm extends Model
public
$rePassword
;
public
$rePassword
;
public
$from
;
public
$from
;
public
$verifyCode
;
public
$verifyCode
;
public
$token
;
/**
/**
* @inheritdoc
* @inheritdoc
...
@@ -29,7 +30,7 @@ class SignupForm extends Model
...
@@ -29,7 +30,7 @@ class SignupForm extends Model
{
{
return
[
return
[
[
'telephone'
,
'trim'
],
[
'telephone'
,
'trim'
],
[[
'telephone'
,
'from'
],
'required'
],
[[
'telephone'
,
'from'
,
'token'
],
'required'
],
[
'telephone'
,
'unique'
,
'targetClass'
=>
'\common\models\User'
,
'message'
=>
'该电话号码已经被注册'
],
[
'telephone'
,
'unique'
,
'targetClass'
=>
'\common\models\User'
,
'message'
=>
'该电话号码已经被注册'
],
[
'telephone'
,
'validateTelephone'
],
[
'telephone'
,
'validateTelephone'
],
[[
'password'
,
'rePassword'
],
'required'
],
[[
'password'
,
'rePassword'
],
'required'
],
...
@@ -38,7 +39,7 @@ class SignupForm extends Model
...
@@ -38,7 +39,7 @@ class SignupForm extends Model
[
'rePassword'
,
'compare'
,
'compareAttribute'
=>
'password'
],
[
'rePassword'
,
'compare'
,
'compareAttribute'
=>
'password'
],
[
'from'
,
'integer'
],
[
'from'
,
'integer'
],
[
'verifyCode'
,
'required'
],
[
'verifyCode'
,
'required'
],
[
'verifyCode'
,
'captcha'
]
[
'verifyCode'
,
'captcha'
,
'message'
=>
'验证码不正确'
]
];
];
}
}
...
...
src/frontend/views/site/signup.php
View file @
309cbc76
...
@@ -34,7 +34,7 @@ $this->registerJsFile('http://static.geetest.com/static/tools/gt.js');
...
@@ -34,7 +34,7 @@ $this->registerJsFile('http://static.geetest.com/static/tools/gt.js');
</div>
</div>
<div
class=
"v-code input-wrapper"
>
<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>
<span
id=
"token_tips"
class=
"tips tip-vcode"
>
<?=
$model
->
getFirstError
(
'token'
)
?>
</span>
<button
class=
"btn btn-get-vcode"
id=
"send_msg"
>
获取验证码
</button>
<button
class=
"btn btn-get-vcode"
id=
"send_msg"
>
获取验证码
</button>
</div>
</div>
...
@@ -47,7 +47,6 @@ $this->registerJsFile('http://static.geetest.com/static/tools/gt.js');
...
@@ -47,7 +47,6 @@ $this->registerJsFile('http://static.geetest.com/static/tools/gt.js');
<div
class=
"check-password input-wrapper"
>
<div
class=
"check-password input-wrapper"
>
<input
id=
"repassword"
name=
"rePassword"
type=
"password"
class=
""
placeholder=
"再次输入密码"
required=
""
>
<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>
<span
id=
"repassword_tips"
class=
"tips"
>
<?=
$model
->
getFirstError
(
'rePassword'
)
?>
</span>
</div>
</div>
<div
class=
"verify-code-box input-wrapper last-wrapper"
>
<div
class=
"verify-code-box input-wrapper last-wrapper"
>
...
...
src/frontend/views/site/tokenInput.php
View file @
309cbc76
...
@@ -37,7 +37,7 @@ $this->registerJsFile('http://static.geetest.com/static/tools/gt.js');
...
@@ -37,7 +37,7 @@ $this->registerJsFile('http://static.geetest.com/static/tools/gt.js');
<div
class=
"reg-box"
>
<div
class=
"reg-box"
>
<div
class=
"phone input-wrapper"
>
<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>
<span
class=
"tips"
>
<?=
$model
->
getFirstError
(
'token'
)
?>
</span>
</div>
</div>
<div
class=
"verify-code-box input-wrapper last-wrapper"
"
>
<div
class=
"verify-code-box input-wrapper last-wrapper"
"
>
...
...
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