Prechádzať zdrojové kódy

'修改js引入文件'

Ethan 6 rokov pred
rodič
commit
f538b84b99

+ 1 - 1
application/admin/view/settings/demo.html

@@ -20,7 +20,7 @@
   var hostname = location.protocol+'//'+location.host;
   var adminDomain = 'http://kfadmin.bocai186.com';   //服务器域名
   var serverDomain = 'http://kefu.bocai186.com';   //客服域名
-  var userDomain = 'http://kf.bocai186.com?pid='+escape("~!@#¥%……&*()——+,./;\'[]");   //用户域名
+  var userDomain = 'http://kf.bocai186.com?pid='+escape("这就是一个编码没有什么用啊");   //用户域名
   if(isIE8){
     availheight= screen.height;
   }

+ 3 - 3
application/service/controller/History.php

@@ -54,7 +54,7 @@ class History extends Common
 
             foreach ($groups as $k => $v) {
                 $data[$k]           = (object) [
-                    'label' => $v['name'],
+                    'label' => $v['name'].'-组',
                 ];
                 $n                  = 0;
                 $data[$k]->children = [];
@@ -65,7 +65,7 @@ class History extends Common
                             : ($kefuInfoData['status'] == 2 ? '(隐身)'
                                 : ($kefuInfoData['status'] == 3 ? '(休息)' : '(未知)'));
                         $data[$k]->children[$n] = (object) [
-                            'label' => $kefuInfoData['name'].$KFstatus,
+                            'label' => $kefuInfoData['name'].$KFstatus.'-客服',
                         ];
                         $m = 0;
                         $data[$k]->children[$n]->children = [];
@@ -74,7 +74,7 @@ class History extends Common
                             if (('KF'.$servicelogData['kf_id']) == $kefuInfoData['id']) {
                                 $found_key = array_search($servicelogData['user_id'], array_column($getAllAccounts, 'id'));
                                 $data[$k]->children[$n]->children[$m] = (object) [
-                                    'label'         => $servicelogData['user_name'],
+                                    'label'         => $servicelogData['user_name'].'-会话',
                                     'user_id'         => $servicelogData['user_id'],
                                     'nick_name'         => $getAllAccounts[$found_key]['nick_name'],
                                     'servicelog_id' => $servicelogData['servicelog_id'],

+ 34 - 0
application/service/model/Accounts.php

@@ -0,0 +1,34 @@
+<?php
+namespace app\service\model;
+
+use think\Model;
+
+/**
+ * 用户模型
+ */
+class Accounts extends Model
+{
+
+
+    /**
+     * 数据筛选
+     *
+     * @access public
+     * @param mixed $field 字段
+     * @param mixed $where 条件
+     * @return array 返回类型
+     */
+    public function selectAccounts($field, $where=[])
+    {
+        $result = $this->field($field);
+        if (empty($where) === false) {
+            $result = $result->where($where);
+        }
+
+        $result = $result->select();
+        return $result;
+
+    }//end selectAccounts()
+
+
+}

+ 1 - 1
public/entranceJs/FloatingButton.js

@@ -10,7 +10,7 @@ var availheight = screen.availHeight;   //默认高度为屏幕的高度
 var hostname = location.protocol+'//'+location.host;
 var adminDomain = 'http://kfadmin.bocai186.com';   //服务器域名
 var serverDomain = 'http://kefu.bocai186.com';   //客服域名
-var userDomain = 'http://kf.bocai186.com?pid='+escape("~!@#¥%……&*()——+,./;\'[]");   //用户域名
+var userDomain = 'http://kf.bocai186.com?pid='+escape("这就是一个编码没有什么用啊");   //用户域名
 if(isIE8){
   availheight= screen.height;
 }

+ 1 - 1
vendor/GatewayWorker_windows/Applications/whisper/Events.php

@@ -237,7 +237,7 @@ class Events
             return false;
         }
         $dbdata = self::$db->select('status')->from('ws_users')->where('id=:id')->bindValues(['id' => self::getkfid($kfuid)])->row();
-        if ($dbdata && $dbdata['status'] == 1) {
+        if ($dbdata && $dbdata['status'] == 1 && $kfdatas['group'] == $dbdata['group_id']) {
             return false;
         }