1

application/admin/controller/Messages.php

@@ -20,6 +20,17 @@ class Messages extends Base
 
             $where  = [];
             $orwhere  = [];
+
+            //用户账号/昵称
+            if (strlen($param['searchText'])) {
+                if($param['account'] == 'account_name'){
+                    $where['account_name'] = ['like', '%' . $param['searchText'] . '%'];
+                }
+                if($param['account'] == 'nick_name'){
+                    $where['nick_name'] = ['like', '%' . $param['searchText'] . '%'];
+                }
+            }
+
             //用户昵称
             if (strlen($param['searchText'])) {
                 $where['a.nick_name'] = array('like','%'.$param['searchText'].'%');

application/admin/controller/System.php

@@ -657,6 +657,7 @@ class System extends Base
             }
             //客服昵称
             for($i=0;$i<count($users);$i++){
+                $result[$key]['kefu_name'] = '-';
                 if($result[$key]['kf_id'] == $users[$i]['id']){
                     $result[$key]['kefu_name'] = $users[$i]['user_name'];
                 }
@@ -722,6 +723,7 @@ class System extends Base
                 $content = json_decode($chat_log[$c]['content'], true);
                 $chat_log[$c]['time_line'] = date('Y-m-d H:i:s',$chat_log[$c]['time_line']);
                 $result[$key]['detail'] = $result[$key]['detail'].' '.$chat_log[$c]['time_line'].' '.$chat_log[$c]['from_name'];
+                $content['content'] = '';
                 if(!empty($content['text'])){
                     $content['content'] = $content['text'];
                 }

application/admin/view/messages/index.html

@@ -71,7 +71,15 @@
                         </div>
                     </div>
                     <div class="form-group" style="margin-left: 10px;">
-                        <label>昵称:</label>
+                        <div class="input-group col-sm-4 layui-form" style="width: 70px;">
+                            <input type="hidden" id="account" value="account_name"/>
+                            <select lay-verify="required" lay-filter="account">
+                                <option value="account_name">账号</option>
+                                <option value="nick_name">昵称</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="form-group">
                         <input type="text" class="form-control" id="username" name="user_name" style="width: 100px;height: 30px;">
                     </div>
                     <div class="form-group">