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
0e801efd
Commit
0e801efd
authored
Jul 09, 2019
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
0f18c375
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
Client.php
application/api_broker/controller/Client.php
+1
-0
UserService.php
application/index/service/UserService.php
+7
-1
No files found.
application/api_broker/controller/Client.php
View file @
0e801efd
...
...
@@ -58,6 +58,7 @@ class Client extends Basic
$this
->
msg
=
$result
[
'msg'
];
}
}
else
{
$user_data
=
$user_service
->
getUserData
(
$this
->
params
[
'id'
]);
$data
[
'start'
]
=
$user_data
[
'data'
];
}
...
...
application/index/service/UserService.php
View file @
0e801efd
...
...
@@ -294,7 +294,7 @@ class UserService
,a.entrust_type,a.weixin_nick,a.concrete_industry,a.user_status"
;
try
{
$data
=
$this
->
user
->
getClient
(
$field
,
[
'id'
=>
$user_id
]);
$data
=
$this
->
user
->
getClient
(
$field
,
[
'
a.
id'
=>
$user_id
]);
if
(
empty
(
$data
[
'user_pic'
]))
{
$data
[
'user_pic'
]
=
$data
[
'other_pic'
];
...
...
@@ -313,10 +313,16 @@ class UserService
$data
[
'referrer_user'
]
=
$referrer_user
[
'user_name'
]
.
'-'
.
$user_phone
;
}
//客方
$s_user_agent
=
new
UserAgentService
();
$user_agent_res
=
$s_user_agent
->
selectUserAgent
(
$user_id
);
$data
[
'customer_relegation_list'
]
=
$user_agent_res
?
$user_agent_res
:
null
;
$result
[
'data'
]
=
$data
;
$result
[
'msg'
]
=
''
;
$result
[
'status'
]
=
'successful'
;
}
catch
(
\Exception
$e
)
{
$result
[
'msg'
]
=
$e
->
getMessage
();
$result
[
'status'
]
=
'fail'
;
}
...
...
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