Merge branch 'master' of http://git.bocai108.com:10180/Ethan/Customer-Service

application/admin/controller/Words.php

@@ -23,7 +23,7 @@ class Words extends Base
 
             $where['user_id'] = $param['type'] == 1? 0 : ['neq',0];
             if (strlen($param['searchText'])) {
-                $where['content'] = $param['searchText'];
+                $where['content'] = ['like', '%' . $param['searchText'] . '%'];
             }
 
             $result = db('words')

application/admin/view/report/index.html

@@ -483,7 +483,6 @@
             elem: '#daterang'
             , range: ','
         });
-
     });
 </script>
 </body>

application/admin/view/system/wordslog.html

@@ -55,7 +55,7 @@
                         </div>
                     </div>
                     <div class="form-group">
-                        <label>访客名称：</label>
+                        <label>访客账号：</label>
                         <input type="text" class="form-control" id="username" name="user_name" style="width: 120px;">
                     </div>
                     <div class="form-group">

public/static/admin/js/layui/css/myLayui.css

@@ -1,5 +1,37 @@
 
 
+@font-face {
+    font-family: layui-icon;
+    src: url(../font/iconfont.eot?v=1.0.7);
+    src: url(../font/iconfont.eot?v=1.0.7#iefix) format('embedded-opentype'), url(../font/iconfont.woff?v=1.0.7) format('woff'), url(../font/iconfont.ttf?v=1.0.7) format('truetype'), url(../font/iconfont.svg?v=1.0.7#iconfont) format('svg')
+}
+
+.layui-icon {
+    font-family: layui-icon !important;
+    font-size: 16px;
+    font-style: normal;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale
+}
+
+.layui-box, .layui-box * {
+    -webkit-box-sizing: content-box !important;
+    -moz-box-sizing: content-box !important;
+    box-sizing: content-box !important
+}
+
+.layui-border-box, .layui-border-box * {
+    -webkit-box-sizing: border-box !important;
+    -moz-box-sizing: border-box !important;
+    box-sizing: border-box !important
+}
+
+
+
+
+
+
+
 .layui-icon {
     font-family: layui-icon !important;
     font-size: 16px;

vendor/GatewayWorker_windows/Applications/whisper/Events.php

@@ -1835,10 +1835,10 @@ class Events
         $noResponse = strtotime('-' . (self::$global->noResponse['systemconfig_data']) . ' second');
         foreach ($serviceLog as $k => $v) {
             // 会话超时关闭.
-            if ($v['start_time'] <= $overtime) {
+            /*if ($v['start_time'] <= $overtime) {
                 $servicelog_id = $v['servicelog_id'];
                 self::$db->query("update `ws_service_log` set `servicelog_close_type` = 2 where `servicelog_id`= '$servicelog_id'");
-                self::serverClose($v['client_id'], $servicelog_id, $v['user_id'], 'KF' . $v['kf_id'], $v['group_id']);
+                self::serverClose($v['client_id'], $servicelog_id, $v['user_id'], 'KF'.$v['kf_id'], $v['group_id']);
                 // 如果小于设定时间前一分钟则给出提示.
             } elseif ($v['start_time'] <= $setOvertime) {
                 $chat_message = [
@@ -1848,15 +1848,13 @@ class Events
                     ]
                 ];
                 Gateway::sendToClient($v['client_id'], json_encode($chat_message, 256));
-            }
-
-            // 访客静默超时.
-            // 如果没有说一句话.
+            }*/
+            // 无效会话关闭.如果没有说一句话.
             if (!strlen(array_search($v['servicelog_id'], array_column($chatLog, 'servicelog_id')))) {
                 if ($v['start_time'] <= $unoperated) {
                     $servicelog_id = $v['servicelog_id'];
                     self::$db->query("update `ws_service_log` set `servicelog_close_type` = 1 where `servicelog_id`= '$servicelog_id'");
-                    self::serverClose($v['client_id'], $servicelog_id, $v['user_id'], 'KF' . $v['kf_id'], $v['group_id']);
+                    self::serverClose($v['client_id'], $servicelog_id, $v['user_id'], 'KF'.$v['kf_id'], $v['group_id']);
                     // 如果小于设定时间前一分钟则给出提示.
                 } elseif ($v['start_time'] <= $setUnoperated) {
                     $chat_message = [
@@ -1869,16 +1867,16 @@ class Events
                 }
             }
         }
-        // 访客静默超时.如果说了话
+        // 双方静默超时.
         foreach ($chatLog as $k => $v) {
             // 如果对话为客服的最后一次对话且时间小于设定时间则结束工单.
-            if ($v['time_line'] <= $unoperated) {
+            if ($v['time_line'] <= $overtime) {
                 $found_key = array_search($v['servicelog_id'], array_column($serviceLog, 'servicelog_id'));
                 $servicelog_id = $v['servicelog_id'];
-                self::$db->query("update `ws_service_log` set `servicelog_close_type` = 1 where `servicelog_id`= '$servicelog_id'");
-                self::serverClose($serviceLog[$found_key]['client_id'], $servicelog_id, $serviceLog[$found_key]['user_id'], 'KF' . $serviceLog[$found_key]['kf_id'], $serviceLog[$found_key]['group_id']);
+                self::$db->query("update `ws_service_log` set `servicelog_close_type` = 2 where `servicelog_id`= '$servicelog_id'");
+                self::serverClose($serviceLog[$found_key]['client_id'], $servicelog_id, $serviceLog[$found_key]['user_id'], 'KF'.$serviceLog[$found_key]['kf_id'], $serviceLog[$found_key]['group_id']);
                 // 如果对话为客服的最后一次对话且时间小于设定时间前一分钟则给出提示.
-            } elseif ($v['time_line'] <= $setUnoperated) {
+            } elseif ($v['time_line'] <= $setOvertime) {
                 $chat_message = [
                     'message_type' => 'overtime',
                     'data' => [