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

application/admin/view/kfnotice/add.html

@@ -181,6 +181,7 @@
         laydate.render({
             elem: '#sendtime'
             , type: 'datetime'
+            ,btns: ['clear', 'confirm']
         });
     });
 

application/service/controller/History.php

@@ -57,11 +57,11 @@ class History extends Common
             $endTime     = strtotime(date('Y-m-d').'+1 day');
             if (strlen($start) && strlen($end) ) {
                 $startTime = strtotime($start);
-                $endTime   = strtotime($end);
+                $endTime   = strtotime($end.'+1 day');
             }
 
             if (strlen($userName)) {
-                $serviceLogWhere['user_name'] = $userName;
+                $serviceLogWhere['user_name'] = ['like', '%' . $userName . '%'];
             }
 
             $serviceLogWhere['start_time'] = [

vendor/GatewayWorker_windows/Applications/whisper/Events.php

@@ -665,7 +665,7 @@ class Events
         $user_info = self::$redis->hgetall(self::getKfServiceKey($uid));
         if (!empty($user_info)) {
             foreach ($user_info as $val => $serverid) {
-                self::MySendMsg($val, json_encode(['message_type' => 'serviceoffline', 'msg' => '客户人员下线!'], 256));
+                self::MySendMsg($val, json_encode(['message_type' => 'serviceoffline', 'msg' => '客服人员下线!'], 256));
             }
         }
         echo "客服退出： " . $uid . "\n";
@@ -698,7 +698,7 @@ class Events
             foreach ($user_info as $val => $serverid) {
                 self::insertServerLog($serverid, 4);
                 self::$redis->hdel(self::SERVICELOG, intval($serverid));
-                self::MySendMsg($val, json_encode(['message_type' => 'serviceoffline', 'msg' => '客户人员下线!'], 256));
+                self::MySendMsg($val, json_encode(['message_type' => 'serviceoffline', 'msg' => '客服人员下线!'], 256));
                 Gateway::closeClient($val);
             }
         }
@@ -908,7 +908,6 @@ class Events
             if ($last) {
                 $userInfo = json_decode(self::$redis->hget(self::USERINFOKEY, $uid), true);
                 self::BeginOldTalk(self::getkfuid($last['kf_id']), $uid, $last['group_id'], $last['servicelog_id']);
-                print_r([$client_id, $userInfo['client_id']]);
                 if ($client_id == $userInfo['client_id']) {
                     // 查询工单历史会话.
                     $serviceid = $last['servicelog_id'];