Эхлэл Бүгдийг харах Тусламж
Бүртгүүлэх Нэвтрэх
aqm
/
Customer-Service
3
0
Салаа 0
Файлууд Асуудлууд 0 Хуулах хүсэлтүүд 0 Мэдлэгийн сан
Эх сурвалжийг харах

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

vali 6 жил өмнө
parent
f5ffea7dfd 001c66794e
commit
2c167b7606
7 өөрчлөгдсөн 69 нэмэгдсэн , 10 устгасан
Өөрчлөлтийг ялгаж харах Өөрчлөлтийн статистик харах
  1. 1 0
      application/admin/controller/System.php
  2. 2 1
      application/admin/view/index.html
  3. 3 3
      application/admin/view/index/index.html
  4. 51 0
      application/admin/view/login/aaaa.html
  5. 7 1
      application/admin/view/system/basics.html
  6. 2 2
      application/index/controller/Index.php
  7. 3 3
      vendor/GatewayWorker_windows/Applications/whisper/Events.php

+ 1 - 0
application/admin/controller/System.php
Файл харах 

@@ -31,6 +31,7 @@ class System extends Base
 
                 if (empty($param['logo_img']) === false) {
 
                     $updateinfo['logo'] = $param['logo_img'];
 
                 }
 
+                $updateinfo['enterprise_name'] = $param['enterprise_name'];
 
 
                 $updateAstData['advertisement_url']    = $param['advertisementUrl'];
 
                 $updateAstData['advertisement_status'] = $param['status'];

+ 2 - 1
application/admin/view/index.html
Файл харах 

@@ -28,7 +28,8 @@
 
             <ul class="nav" id="side-menu">
 
                 <li class="nav-header">
 
                     <div class="dropdown profile-element">
 
-                        <span><img alt="image" height="50px" class="" src="{$settings['logo']}"/></span>
 
+                        <span><img alt="image" height="48px" class="" src="{$settings['logo']}"/></span>
 
+                        <span style="font-size:25px;position:absolute;margin:8px 5px;">{$settings['enterprise_name']}</span>
 
                         <a data-toggle="dropdown" class="dropdown-toggle" href="#">
 
                             <span class="clear">
 
                                 <span style="font-size: 18px; margin-top: 20px" onclick="change()" class="block m-t-xs">欢迎您 · <strong class="font-bold"></strong>{$admin['user_name']}</span>

+ 3 - 3
application/admin/view/index/index.html
Файл харах 

@@ -373,9 +373,9 @@
 
     };
 
 
     socket.onclose = function(res) {
 
-      layer.alert('实时监控断开', {
 
-        title: '友情提示', icon: 1, closeBtn: 0
 
-      }, function(){});
 
+      layer.alert('实时监控连接失败', {
 
+        title: '错误提示', icon: 2, closeBtn: 0
 
+      }, '');
 
     };

+ 51 - 0
application/admin/view/login/aaaa.html
Файл харах 

@@ -0,0 +1,51 @@
 
+<!DOCTYPE html>
 
+<html>
 
+<head>
 
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
+    <meta http-equiv="Pragma" content="no-cache">
 
+    <meta http-equiv="Cache-Control" content="no-cache">
 
+    <meta http-equiv="Expires" content="0">
 
+    <title>后台登录</title>
 
+    <link href="__CSS__/login.css" type="text/css" rel="stylesheet">
 
+    <link rel="shortcut icon" href="__IMG__/favicon.ico">
 
+</head>
 
+<body>
 
+aaaaaaaaaaaaaaaaaaaaaaa
 
+<script src="__JS__/jquery.min.js" type="text/javascript"></script>
 
+<script src="__JS__/layui/layui.js" type="text/javascript"></script>
 
+
 
+<script>
 
+  let config = {
 
+    socket: '{$socket}',
 
+  };
 
+  var accounts = JSON.stringify({$accounts});
 
+  var accounts = JSON.parse(accounts);
 
+  console.log(accounts);
 
+  var i = 0;
 
+  var n = -1;
 
+  let time = 0;
 
+  for (i;i<=100;i++) {
 
+    time += 2000;
 
+    var t=setTimeout("aaaa()",time);
 
+  }
 
+  function aaaa() {
 
+    let socket = new WebSocket('ws://' + config.socket);
 
+    socket.onopen = function(res) {
 
+      n++;
 
+      console.log('--------------',accounts[n]['account_name'])
 
+      // 登录
 
+      let login_data = JSON.stringify({
 
+        type: 'userInit',
 
+        data:  {
 
+          uid: accounts[n]['id'],
 
+          name: accounts[n]['account_name'],
 
+          avatar: '',
 
+          group: 1,
 
+        }
 
+      });
 
+      socket.send(login_data);
 
+    }
 
+  }
 
+</script>
 
+</body>
 
+</html>

+ 7 - 1
application/admin/view/system/basics.html
Файл харах 

@@ -72,6 +72,12 @@
 
                         <h4 style="margin-bottom: 10px; margin-top: 40px">企业logo设置</h4>
 
                         <div class="ibox-title">
 
                         </div>
 
+                        <div class="form-group">
 
+                            <label class="col-sm-3 control-label">企业名称：</label>
 
+                            <div class="input-group col-sm-4">
 
+                                <input type="text" class="form-control" name="enterprise_name" required="" aria-required="true" value="{$settings['enterprise_name']}" placeholder="不超过8个字符">
 
+                            </div>
 
+                        </div>
 
                         <div class="form-group layui-form-item form-inline" style="height: 60px;">
 
                             <input type="hidden" name="logo_img" id="logo_img"/>
 
                             <label class="col-sm-3 control-label">企业logo：</label>
 
@@ -79,7 +85,7 @@
 
                                 <button type="button" class="layui-btn layui-btn-small" id="up-logo">
 
                                     <i class="layui-icon"></i>上传logo</button>
 
                             </div>
 
-                            <span>建议上传180px*50px</span>
 
+                            <span>建议上传48px*48px</span>
 
                             <div class="input-group col-sm-3" id="logo">
 
                                 <img src="{$settings['logo']}" height="40px"/>
 
                             </div>

+ 2 - 2
application/index/controller/Index.php
Файл харах 

@@ -99,8 +99,8 @@ class Index extends Common
 
     {
 
         $now = time();
 
         $time = date('Y-m-d H:i', $now);
 
-        $logo = db('settings')->where('id',1)->find();
 
-        return json(['code' => 1, 'data' => ['time' => $time,'logo' => $logo['logo']], 'msg' => '成功']);
 
+        $settings = db('settings')->where('id',1)->find();
 
+        return json(['code' => 1, 'data' => ['time' => $time,'logo' => $settings['logo'],'enterprise_name' => $settings['enterprise_name']], 'msg' => '成功']);
 
     }
 
 
 }

+ 3 - 3
vendor/GatewayWorker_windows/Applications/whisper/Events.php
Файл харах 

@@ -908,7 +908,7 @@ class Events
 
     }
 
 
     //开启一个会话
 
-    private static function BeginTalk($kfuid, $uid, $group, $serviceid = 0, $userInfo = false)
 
+    private static function BeginTalk($kfuid, $uid, $group, $serviceid = 0, $userInfo = false, $isChangeKF=0)
 
     {
 
 
         $serviceid = intval($serviceid);
 
@@ -975,7 +975,7 @@ class Events
 
         self::MySendMsg($userInfo['client_id'], json_encode($noticeUser, 256));
 
 
         $sayHello = (self::$global->replay)['2'];
 
-        if (!empty($sayHello) && 1 == $sayHello['status']) {
 
+        if (!empty($sayHello) && 1 == $sayHello['status'] && !$isChangeKF) {
 
             $chat_message = [
 
                 'message_type' => 'chatMessage',
 
                 'data' => [
 
@@ -1551,7 +1551,7 @@ class Events
 
         ///更新redis数据
 
         self::updteKfTasksByservicd($fromkfuid, $serviceid, $user_info['client_id'], 0);
 
 
-        self:: BeginTalk($toukfid, $uid, $groupidto, 0, $user_info);
 
+        self:: BeginTalk($toukfid, $uid, $groupidto, 0, $user_info, 1);
 
         self::servicetrutoother('OUT', $fromkfuid, $toukfid, $serviceid, $uid);
 
         $newUserInfo = json_decode(self::$redis->hget(self::USERINFOKEY, $uid), true);
 
         self::servicetrutoother('IN', $toukfid, $fromkfuid, $newUserInfo['serverid'], $uid);