正在显示
2 个修改的文件
包含
11 行增加
和
10 行删除
@@ -52,16 +52,17 @@ class WithdrawalController extends AdminBaseController{ | @@ -52,16 +52,17 @@ class WithdrawalController extends AdminBaseController{ | ||
52 | $where['a.create_time'] = [['>=',$start_time],['<=',$end_time]]; | 52 | $where['a.create_time'] = [['>=',$start_time],['<=',$end_time]]; |
53 | } | 53 | } |
54 | if(!empty($param['keyword'])){ | 54 | if(!empty($param['keyword'])){ |
55 | - $where['b.phone'] = ['like','%'.trim($param['keyword']).'%']; | ||
56 | - } | ||
57 | - $data = Db::name('money_expend') -> alias('a') -> field('a.*,b.phone') -> join('my_user b','a.uid=b.uid','LEFT') -> where($where) -> order("a.create_time desc") -> paginate(12); | 55 | + $where['b.phone|u.user_nickname'] = ['like','%'.trim($param['keyword']).'%']; |
56 | + } | ||
57 | + $data = Db::name('money_expend') | ||
58 | + ->alias('a') | ||
59 | + ->field('a.*,b.phone,u.user_nickname as name') | ||
60 | + ->join('my_user b','a.uid=b.uid','LEFT') | ||
61 | + ->join('user u','a.uid=u.id','LEFT') | ||
62 | + ->where($where) | ||
63 | + ->order("a.create_time desc") | ||
64 | + ->paginate(12); | ||
58 | $data_arr = $data -> toArray(); | 65 | $data_arr = $data -> toArray(); |
59 | - if(!empty($data_arr)){ | ||
60 | - foreach($data_arr['data'] as $key => $val){ | ||
61 | - $name = Db::name('user') -> where('id',$val['uid']) -> find(); | ||
62 | - $data_arr['data'][$key]['name'] = $name['user_nickname']; | ||
63 | - } | ||
64 | - } | ||
65 | $this->assign('start_time',!empty($param['start_time']) ? $param['start_time'] : ''); | 66 | $this->assign('start_time',!empty($param['start_time']) ? $param['start_time'] : ''); |
66 | $this->assign('end_time',!empty($param['end_time']) ? $param['end_time'] : ''); | 67 | $this->assign('end_time',!empty($param['end_time']) ? $param['end_time'] : ''); |
67 | $this->assign('keyword',!empty($param['keyword']) ? trim($param['keyword']) : ''); | 68 | $this->assign('keyword',!empty($param['keyword']) ? trim($param['keyword']) : ''); |
@@ -21,7 +21,7 @@ | @@ -21,7 +21,7 @@ | ||
21 | style="width: 140px;" autocomplete="off"> | 21 | style="width: 140px;" autocomplete="off"> |
22 | 关键字: | 22 | 关键字: |
23 | <input type="text" class="form-control" name="keyword" style="width: 200px;" | 23 | <input type="text" class="form-control" name="keyword" style="width: 200px;" |
24 | - value="{$keyword|default=''}" placeholder="请输入手机号..."> | 24 | + value="{$keyword|default=''}" placeholder="请输入手机号/微信昵称"> |
25 | <input type="submit" class="btn btn-primary" value="搜索"/> | 25 | <input type="submit" class="btn btn-primary" value="搜索"/> |
26 | <a class="btn btn-danger" href="{:url('Withdrawal/withd_list')}">清空</a> | 26 | <a class="btn btn-danger" href="{:url('Withdrawal/withd_list')}">清空</a> |
27 | </form> | 27 | </form> |
-
请 注册 或 登录 后发表评论