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
184f919f
Commit
184f919f
authored
Nov 27, 2018
by
liuyuzhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
小程序登录问题
parent
c1fe5a73
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
Common.php
application/library/Our/Common.php
+1
-1
Member.php
application/models/DAO/Member.php
+6
-1
No files found.
application/library/Our/Common.php
View file @
184f919f
...
@@ -267,7 +267,7 @@ class Common
...
@@ -267,7 +267,7 @@ class Common
return
false
;
return
false
;
}
}
if
(
!
preg_match
(
'/^1[345789]\d{9}$/'
,
$phone
)
){
if
(
!
preg_match
(
'/^1[345
6
789]\d{9}$/'
,
$phone
)
){
return
false
;
return
false
;
}
}
...
...
application/models/DAO/Member.php
View file @
184f919f
...
@@ -541,7 +541,12 @@ class MemberModel extends \DAO\AbstractModel
...
@@ -541,7 +541,12 @@ class MemberModel extends \DAO\AbstractModel
$orders
=
array
(
'member_mobile'
=>
'desc'
,
'member_id'
=>
'desc'
);
$orders
=
array
(
'member_mobile'
=>
'desc'
,
'member_id'
=>
'desc'
);
$memberList
=
$this
->
getList
(
$memberCon
,
$this
->
availMemberColumn
,
$orders
);
$memberList
=
$this
->
getList
(
$memberCon
,
$this
->
availMemberColumn
,
$orders
);
if
(
$memberList
){
if
(
$memberList
){
$member
=
$memberList
[
0
];
foreach
(
$memberList
as
$tempMember
){
if
(
$tempMember
[
'member_mobile'
]
&&
\Our\Common
::
checkMobilePhone
(
$tempMember
[
'member_mobile'
])){
$member
=
$tempMember
;
break
;
}
}
$memberAvatarUrl
=
$this
->
getMemberAvatarUrl
(
$member
[
'member_id'
],
$member
[
'member_avatar'
]);
$memberAvatarUrl
=
$this
->
getMemberAvatarUrl
(
$member
[
'member_id'
],
$member
[
'member_avatar'
]);
$member
[
'memberAvatarUrl'
]
=
$memberAvatarUrl
;
$member
[
'memberAvatarUrl'
]
=
$memberAvatarUrl
;
}
}
...
...
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