后台业务员列表筛选修改

@@ -15,33 +15,28 @@ class SalesmanController extends AdminBaseController{
         $where = [
             'a.status' => 2
         ];
-        if(!empty($param['start_time']) && !empty($param['end_time'])){
-            $start_time = strtotime($param['start_time']);
-            $end_time = strtotime($param['end_time']);
-            $where['audit_time'] = [['>=',$start_time],['<=',$end_time]];
-        }
+//        if(!empty($param['start_time']) && !empty($param['end_time'])){
+//            $start_time = strtotime($param['start_time']);
+//            $end_time = strtotime($param['end_time']);
+//            $where['audit_time'] = [['>=',$start_time],['<=',$end_time]];
+//        }
         if(!empty($param['keyword'])){
             $keyword = $param['keyword'];
-            $where['b.phone'] = $keyword;
+            $where['b.phone|u.user_nickname'] = ['like','%'.$keyword.'%'];
+        }
+        if(!empty($param['id'])){
+            $where['a.id'] = ['eq',$param['id']];
         }
         $data = Db::name('my_user')->alias('a')
-            ->field("a.uid,a.id,a.balance,a.audit_time,a.is_pro,b.phone")
+            ->field("a.uid,a.id,a.balance,a.audit_time,a.is_pro,b.phone,u.user_nickname")
+            ->join('user u','a.uid = u.id','LEFT')
             ->join('sale_audit b','a.uid = b.uid','LEFT')
-            ->where('a.status',2)
+            ->where($where)
             ->group('a.id')
             ->order(['a.balance'=>'DESC','a.create_time'=>'DESC'])
             ->paginate(12);
 
         $data_arr = $data -> toArray();
-   /*     array(1) {
-            [0] => array(5) {
-                ["uid"] => int(1)
-                ["balance"] => string(6) "100.00"
-                ["audit_time"] => int(1558509018)
-                ["is_pro"] => int(1)
-                ["phone"] => string(11) "18602699971"
-  }
-}*/
         $data_money = Db::name('money_ratio') -> find();
         foreach ($data_arr['data'] as $key => $val){
             $data_user = Db::name('user') -> where('id',$val['uid']) -> find();
@@ -55,6 +50,9 @@ class SalesmanController extends AdminBaseController{
         }
         $this -> assign('data_arr',$data_arr['data']);
         $this -> assign('data',$data);
+        $this->assign('user_nickname',!empty($param['user_nickname']) ? $param['user_nickname'] : '');
+        $this->assign('keyword',!empty($param['keyword']) ? $param['keyword'] : '');
+        $this->assign('id',!empty($param['id']) ? $param['id'] : '');
         return $this -> fetch();
 
     }

@@ -12,16 +12,19 @@
         <li class="active"><a href="#">业务员列表</a></li>
     </ul>
     <form class="well form-inline margin-top-20" method="post" action="{:url('Salesman/salesman_list')}">
-        时间:
-        <input type="text" class="form-control js-bootstrap-datetime" name="start_time"
-               value="{$start_time|default=''}"
-               style="width: 140px;" autocomplete="off">-
-        <input type="text" class="form-control js-bootstrap-datetime" name="end_time"
-               value="{$end_time|default=''}"
-               style="width: 140px;" autocomplete="off"> &nbsp; &nbsp;
+<!--        时间:-->
+<!--        <input type="text" class="form-control js-bootstrap-datetime" name="start_time"-->
+<!--               value="{$start_time|default=''}"-->
+<!--               style="width: 140px;" autocomplete="off">- -->
+<!--        <input type="text" class="form-control js-bootstrap-datetime" name="end_time"-->
+<!--               value="{$end_time|default=''}"-->
+<!--               style="width: 140px;" autocomplete="off"> &nbsp; &nbsp;-->
+        序号:
+        <input type="text" class="form-control" name="id" style="width: 200px;"
+               value="{$id|default=''}" placeholder="请输入序号">
         关键字:
         <input type="text" class="form-control" name="keyword" style="width: 200px;"
-               value="{$keyword|default=''}" placeholder="请输入手机号...">
+               value="{$keyword|default=''}" placeholder="请输入手机号/微信昵称">
         <input type="submit" class="btn btn-primary" value="搜索"/>
         <a class="btn btn-danger" href="{:url('Salesman/salesman_list')}">清空</a>
     </form>