Commit 0e801efd authored by zhuwei's avatar zhuwei

1

parent 0f18c375
...@@ -58,6 +58,7 @@ class Client extends Basic ...@@ -58,6 +58,7 @@ class Client extends Basic
$this->msg = $result['msg']; $this->msg = $result['msg'];
} }
} else { } else {
$user_data = $user_service->getUserData($this->params['id']); $user_data = $user_service->getUserData($this->params['id']);
$data['start'] = $user_data['data']; $data['start'] = $user_data['data'];
} }
......
...@@ -294,7 +294,7 @@ class UserService ...@@ -294,7 +294,7 @@ class UserService
,a.entrust_type,a.weixin_nick,a.concrete_industry,a.user_status"; ,a.entrust_type,a.weixin_nick,a.concrete_industry,a.user_status";
try { try {
$data = $this->user->getClient($field, ['id'=>$user_id]); $data = $this->user->getClient($field, ['a.id'=>$user_id]);
if (empty($data['user_pic'])) { if (empty($data['user_pic'])) {
$data['user_pic'] = $data['other_pic']; $data['user_pic'] = $data['other_pic'];
...@@ -313,10 +313,16 @@ class UserService ...@@ -313,10 +313,16 @@ class UserService
$data['referrer_user'] = $referrer_user['user_name'] . '-' . $user_phone; $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['data'] = $data;
$result['msg'] = ''; $result['msg'] = '';
$result['status'] = 'successful'; $result['status'] = 'successful';
} catch (\Exception $e) { } catch (\Exception $e) {
$result['msg'] = $e->getMessage(); $result['msg'] = $e->getMessage();
$result['status'] = 'fail'; $result['status'] = 'fail';
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment