Commit 4e04cea2 authored by hujun's avatar hujun

user_nick to user_name

parent 3becaf95
...@@ -197,17 +197,17 @@ class Broker extends Basic ...@@ -197,17 +197,17 @@ class Broker extends Basic
$user = new Users(); $user = new Users();
// 查询数据集 // 查询数据集
$user_res =$user ->where('user_nick|user_phone','like',"%$phone_or_name%") $user_res =$user ->where('user_name|user_phone','like',"%$phone_or_name%")
//->where('create_time','< time',$Two_days_ago)//小于两天前,即排除48小时内受保护的客户 //->where('create_time','< time',$Two_days_ago)//小于两天前,即排除48小时内受保护的客户
// ->whereOr('agent_id',$user_id) // ->whereOr('agent_id',$user_id)
->limit($pagesize) ->limit($pagesize)
->page($pagenum) ->page($pagenum)
->field('id as user_id,sex,user_nick,user_phone') ->field('id as user_id,sex,user_name,user_phone')
->select(); ->select();
// echo $user->getLastSql(); // echo $user->getLastSql();
//$user_res =$user->user_search($phone_or_name,$Two_days_ago,$user_id,$pagesize,$pagenum); //$user_res =$user->user_search($phone_or_name,$Two_days_ago,$user_id,$pagesize,$pagenum);
$total =$user ->where('user_nick|user_phone','like',"%$phone_or_name%") $total =$user ->where('user_name|user_phone','like',"%$phone_or_name%")
//->where('create_time','< time',$Two_days_ago) //->where('create_time','< time',$Two_days_ago)
// ->whereOr('agent_id',$user_id) // ->whereOr('agent_id',$user_id)
->count(); ->count();
...@@ -216,7 +216,7 @@ class Broker extends Basic ...@@ -216,7 +216,7 @@ class Broker extends Basic
$user_res=json_decode(json_encode($user_res),true);//对象转数组 $user_res=json_decode(json_encode($user_res),true);//对象转数组
foreach($user_res as $k=>$v){ foreach($user_res as $k=>$v){
//dump($v);exit; //dump($v);exit;
$user_res[$k]['user_nick']=$v['user_nick']?$v['user_nick']:'未知'; $user_res[$k]['user_name']=$v['user_name']?$v['user_name']:'未知';
} }
/*dump($total); /*dump($total);
var_dump($user_res); var_dump($user_res);
......
...@@ -44,7 +44,7 @@ class Client extends Basic ...@@ -44,7 +44,7 @@ class Client extends Basic
public function editClient() { public function editClient() {
header('Access-Control-Allow-Origin:*'); header('Access-Control-Allow-Origin:*');
if (!empty($this->params['user_nick']) || !empty($this->params['id'])) { if (!empty($this->params['user_name']) || !empty($this->params['id'])) {
$data = []; $data = [];
if ($this->request->isPost()) { if ($this->request->isPost()) {
if (!empty($this->params['id'])) { if (!empty($this->params['id'])) {
...@@ -86,7 +86,7 @@ class Client extends Basic ...@@ -86,7 +86,7 @@ class Client extends Basic
} }
} else { } else {
$this->code = 101; $this->code = 101;
$this->msg = 'user_nick or user_phone or id is null'; $this->msg = 'user_name or user_phone or id is null';
} }
return $this->response($this->code, $this->msg,$data); return $this->response($this->code, $this->msg,$data);
...@@ -154,7 +154,7 @@ class Client extends Basic ...@@ -154,7 +154,7 @@ class Client extends Basic
//条件 //条件
//time_minute_diff 时间差(分)48小时内增加的【拥有经纪人】的客户为--受保护客户 //time_minute_diff 时间差(分)48小时内增加的【拥有经纪人】的客户为--受保护客户
$field = ['id as user_id','user_nick','user_phone','agent_id','referrer_id','create_time',"TIMESTAMPDIFF(MINUTE,create_time,'{$time}')as time_minute_diff"]; $field = ['id as user_id','user_name','user_phone','agent_id','referrer_id','create_time',"TIMESTAMPDIFF(MINUTE,create_time,'{$time}')as time_minute_diff"];
$where = " agent_id in({$params['agent_id']}) and user_status={$type}"; $where = " agent_id in({$params['agent_id']}) and user_status={$type}";
if(!empty($params['search'])){ if(!empty($params['search'])){
...@@ -162,7 +162,7 @@ class Client extends Basic ...@@ -162,7 +162,7 @@ class Client extends Basic
// $where = " (agent_id in(0,{$params['agent_id']}) or agent_id is null or TIMESTAMPDIFF(MINUTE,create_time,'{$time}') > 2880 ) // $where = " (agent_id in(0,{$params['agent_id']}) or agent_id is null or TIMESTAMPDIFF(MINUTE,create_time,'{$time}') > 2880 )
// and ( user_nick like '%{$params['search']}%' or user_phone like '%{$params['search']}%' ) "; // and ( user_nick like '%{$params['search']}%' or user_phone like '%{$params['search']}%' ) ";
$where = "agent_id in({$params['agent_id']} ) $where = "agent_id in({$params['agent_id']} )
and ( user_nick like '%{$params['search']}%' or user_phone like '%{$params['search']}%' ) "; and ( user_name like '%{$params['search']}%' or user_phone like '%{$params['search']}%' ) ";
$data['search'] = $params['search']; $data['search'] = $params['search'];
} }
...@@ -273,7 +273,7 @@ class Client extends Basic ...@@ -273,7 +273,7 @@ class Client extends Basic
//客户电话 //客户电话
$conditions['user_phone'] = ['LIKE', $phone_or_name.'%']; $conditions['user_phone'] = ['LIKE', $phone_or_name.'%'];
}elseif ($search_type == '1'){//客户 }elseif ($search_type == '1'){//客户
$conditions['user_nick'] = ['LIKE', $phone_or_name.'%']; $conditions['user_name'] = ['LIKE', $phone_or_name.'%'];
} }
if ($search_type != '2') if ($search_type != '2')
...@@ -303,7 +303,7 @@ class Client extends Basic ...@@ -303,7 +303,7 @@ class Client extends Basic
foreach($user_res as $k=>$v) foreach($user_res as $k=>$v)
{ {
$label = []; $label = [];
$user_res[$k]['user_nick'] = $v['user_nick']?$v['user_nick']:'未知'; $user_res[$k]['user_name'] = $v['user_name']?$v['user_name']:'未知';
if($user_id == $v['agent_id']) if($user_id == $v['agent_id'])
{ {
$label[] = '我的'; $label[] = '我的';
......
...@@ -71,7 +71,7 @@ class User extends Basic ...@@ -71,7 +71,7 @@ class User extends Basic
"pageNo" => 1, "pageNo" => 1,
"pageSize" => 15 "pageSize" => 15
);*/ );*/
$field = "id as user_id,sex,user_nick,user_phone,user_status,agent_id,create_time,industry_type,price_demand,area_demand"; $field = "id as user_id,sex,user_name,user_phone,user_status,agent_id,create_time,industry_type,price_demand,area_demand";
$conditions = []; $conditions = [];
......
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