Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
my-yaf-project
Project
Project
Details
Activity
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenchuanwen
my-yaf-project
Commits
876bfcde
Commit
876bfcde
authored
Oct 25, 2018
by
liuyuzhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
测试数据
parent
2364b715
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
User.php
application/controllers/User.php
+1
-1
CodeConfig.php
application/models/Error/CodeConfig.php
+1
-1
No files found.
application/controllers/User.php
View file @
876bfcde
...
@@ -33,7 +33,7 @@ class UserController extends \Our\Controller_AbstractIndex {
...
@@ -33,7 +33,7 @@ class UserController extends \Our\Controller_AbstractIndex {
$password
=
$data
[
NameConst
::
password
];
$password
=
$data
[
NameConst
::
password
];
if
(
$this
->
memberService
->
checkUserNamePassWord
(
$mobile
,
$password
)){
if
(
$this
->
memberService
->
checkUserNamePassWord
(
$mobile
,
$password
)){
$member
=
$this
->
memberService
->
getOneByMobileAndPassword
(
$mobile
,
$password
);
$member
=
$this
->
memberService
->
getOneByMobileAndPassword
(
$mobile
,
$password
);
if
(
$member
[
'member_state'
]){
if
(
$member
[
'member_state'
]
==
\Our\ApiConst
::
zero
){
\Error\ErrorModel
::
throwException
(
\Error\CodeConfigModel
::
saveStoreMemberFailed
);
\Error\ErrorModel
::
throwException
(
\Error\CodeConfigModel
::
saveStoreMemberFailed
);
}
}
//第二步保存扫码会员信息
//第二步保存扫码会员信息
...
...
application/models/Error/CodeConfig.php
View file @
876bfcde
...
@@ -459,7 +459,7 @@ class CodeConfigModel {
...
@@ -459,7 +459,7 @@ class CodeConfigModel {
self
::
emptyUserAvatar
=>
'第三方用户头像不能为空'
,
self
::
emptyUserAvatar
=>
'第三方用户头像不能为空'
,
self
::
emptyUserNickname
=>
'第三方用户昵称不能为空'
,
self
::
emptyUserNickname
=>
'第三方用户昵称不能为空'
,
self
::
addMemberMappingError
=>
'添加第三方绑定关系失败'
,
self
::
addMemberMappingError
=>
'添加第三方绑定关系失败'
,
self
::
userAlreadyBind
=>
'当前账号已被其他账号绑定,如需绑定,请先解绑'
,
self
::
userAlreadyBind
=>
'当前
第三方
账号已被其他账号绑定,如需绑定,请先解绑'
,
self
::
emptyPlatformType
=>
'第三方平台类型不能为空'
,
self
::
emptyPlatformType
=>
'第三方平台类型不能为空'
,
self
::
wrongPlatformInfo
=>
'获取平台授权信息错误'
,
self
::
wrongPlatformInfo
=>
'获取平台授权信息错误'
,
self
::
loginBindUserInfoFailed
=>
'登录时绑定用户信息失败'
,
self
::
loginBindUserInfoFailed
=>
'登录时绑定用户信息失败'
,
...
...
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