Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tl_estate
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
hujun
tl_estate
Commits
14ffdd95
Commit
14ffdd95
authored
Jan 31, 2019
by
hujun
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'test'
parents
bbc4053c
95ef2ab4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
BrokerService.php
application/api_broker/service/BrokerService.php
+1
-1
CallPhoneService.php
application/api_broker/service/CallPhoneService.php
+5
-0
Member.php
application/index/controller/Member.php
+1
-1
No files found.
application/api_broker/service/BrokerService.php
View file @
14ffdd95
...
...
@@ -71,7 +71,7 @@ class BrokerService
if
(
$item
[
"is_forbidden"
]
==
0
)
{
return
true
;
}
elseif
(
$item
[
"is_forbidden"
]
==
1
)
{
//已存在申请关系
big_log
(
'已存在申请关系:'
.
$device_id
);
//
big_log('已存在申请关系:'.$device_id);
$is_exits
=
true
;
}
...
...
application/api_broker/service/CallPhoneService.php
View file @
14ffdd95
...
...
@@ -77,6 +77,11 @@ class CallPhoneService
public
function
bindAXB
(
$phone_a
,
$phone_b
,
$record
=
true
,
int
$user_id
,
$agent_id
,
string
$agent_name
,
int
$landlord
,
int
$house_id
)
{
$result
[
'status'
]
=
'failed'
;
//过年期间不能打电话
$result
[
'msg'
]
=
'过年期间不能打电话,具体等通知!'
;
return
$result
;
$type
=
''
;
if
(
strlen
(
$phone_a
)
!=
11
)
{
$result
[
'msg'
]
=
'本机号码格式错误,请重新编辑!'
;
...
...
application/index/controller/Member.php
View file @
14ffdd95
...
...
@@ -323,7 +323,7 @@ class Member extends Basic{
}
}
big_log
(
json_encode
(
$where
));
//
big_log(json_encode($where));
$fields
=
'a.id,a.user_nick,a.create_time,a.user_name,a.user_phone,a.user_pic,a.create_time,a.user_pswd,a.referrer_id,a.user_label,
a.user_name,a.status,a.first_login_time,a.last_login_time,a.agent_id,a.vip,a.price_demand,a.industry_type,a.area_demand,a.user_status,a.source'
;
...
...
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