首页 发现 帮助
注册 登录
aqm
/
Customer-Service
3
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

1

Jonlin 6 年之前
父节点
8858ff7b5c
当前提交
b043f366f0
共有 5 个文件被更改，包括 33 次插入 和 22 次删除
合并视图 显示文件统计
  1. 7 0
      application/admin/controller/Accounts.php
  2. 2 2
      application/admin/controller/System.php
  3. 22 18
      application/admin/view/accounts/edit.html
  4. 1 1
      application/admin/view/admins/editadmin.html
  5. 1 1
      application/service/controller/Login.php

+ 7 - 0
application/admin/controller/Accounts.php
查看文件 

@@ -102,6 +102,12 @@ class Accounts extends Base
 
         $id = input('param.id/d');
 
         $id = input('param.id/d');
 
         $info = db('accounts')->where('id', $id)->find();
 
         $info = db('accounts')->where('id', $id)->find();
 
 
 
+        //服务记录
 
+        $service_log = db('service_log a')->join('users b','a.kf_id=b.id')->field('a.servicelog_id,a.start_time,b.user_name')->where('a.user_id', $id)->select();
 
+        for($i=0;$i<count($service_log);$i++){
 
+            $service_log[$i]['start_time'] = date("Y-m-d H:i:s",$service_log[$i]['start_time']);
 
+        }
 
+
 
         //转为日期时间格式
 
         //转为日期时间格式
 
         $info['add_time'] = date('Y-m-d H:i:s',$info['add_time']);
 
         $info['add_time'] = date('Y-m-d H:i:s',$info['add_time']);
 
 
 
@@ -111,6 +117,7 @@ class Accounts extends Base
 
         $this->assign([
 
         $this->assign([
 
             'info' => $info,
 
             'info' => $info,
 
             'users' => $users,
 
             'users' => $users,
 
+            'service_log' => $service_log,
 
             'status' => config('kf_status')
 
             'status' => config('kf_status')
 
         ]);
 
         ]);
 
         return $this->fetch();
 
         return $this->fetch();

+ 2 - 2
application/admin/controller/System.php
查看文件 

@@ -261,11 +261,11 @@ class System extends Base
 
                         //会话时长
 
                         //会话时长
 
                         $conversation_min = intval($alarm[$b]['alarm_cvtOvertime']/60);
 
                         $conversation_min = intval($alarm[$b]['alarm_cvtOvertime']/60);
 
                         $conversation_s = $alarm[$b]['alarm_cvtOvertime']%60;
 
                         $conversation_s = $alarm[$b]['alarm_cvtOvertime']%60;
 
-                        $result[$key]['conversation'] = $conversation_min.':'.$conversation_s;
 
+                        $result[$key]['conversation'] = $conversation_min.'分'.$conversation_s.'秒';
 
                         //响应时长
 
                         //响应时长
 
                         $response_min = intval($alarm[$b]['alarm_corresponding']/60);
 
                         $response_min = intval($alarm[$b]['alarm_corresponding']/60);
 
                         $response_s = $alarm[$b]['alarm_corresponding']%60;
 
                         $response_s = $alarm[$b]['alarm_corresponding']%60;
 
-                        $result[$key]['response'] = $response_min.':'.$response_s;
 
+                        $result[$key]['response'] = $response_min.'分'.$response_s.'秒';
 
                     }
 
                     }
 
                 }
 
                 }

+ 22 - 18
application/admin/view/accounts/edit.html
查看文件 

@@ -16,12 +16,19 @@
 
         float: left;
 
         float: left;
 
         position:absolute;
 
         position:absolute;
 
     }
 
     }
 
+    .service div{
 
+        float: left;
 
+        /*width: 50%;*/
 
+        height: 20px;
 
+        line-height: 20px;
 
+        margin-top: 5px;
 
+    }
 
 </style>
 
 </style>
 
 <body class="gray-bg">
 
 <body class="gray-bg">
 
 <div class="wrapper wrapper-content animated fadeInRight">
 
 <div class="wrapper wrapper-content animated fadeInRight">
 
     <div class="row">
 
     <div class="row">
 
         <div class="col-sm-8">
 
         <div class="col-sm-8">
 
-            <div class="ibox float-e-margins" style="width: 69%;">
 
+            <div class="ibox float-e-margins" style="width: 70%;">
 
                 <div class="ibox-title">
 
                 <div class="ibox-title">
 
                     <h5>会员列表</h5>
 
                     <h5>会员列表</h5>
 
                 </div>
 
                 </div>
 
@@ -104,26 +111,23 @@
 
                 </div>
 
                 </div>
 
             </div>
 
             </div>
 
 
 
-            <div class="ibox float-e-margins" style="width: 32%;margin-left: 70%;">
 
+            <div class="ibox float-e-margins" style="width: 36%;margin-left: 71%;">
 
                 <div class="ibox-title">
 
                 <div class="ibox-title">
 
-                    <h5>个人信息</h5>
 
+                    <h5>服务记录</h5>
 
                 </div>
 
                 </div>
 
                 <div class="ibox-content" style="height: 500px;margin-bottom: 10px;">
 
                 <div class="ibox-content" style="height: 500px;margin-bottom: 10px;">
 
-                    <div class="table_title">用户信息</div>
 
-                    <table>
 
-                        <tr>
 
-                            <td class="td_info">姓名</td>
 
-                            <td class="td_info_value"></td>
 
-                        </tr>
 
-                        <tr>
 
-                            <td class="td_info">手机</td>
 
-                            <td class="td_info_value"></td>
 
-                        </tr>
 
-                        <tr>
 
-                            <td class="td_info">邮箱</td>
 
-                            <td class="td_info_value"></td>
 
-                        </tr>
 
-                    </table>
 
+                    <ul>
 
+                        {if !empty($service_log)}
 
+                        {foreach name="service_log" item="vo" key="key"}
 
+                        <a href="/admin/system/detail/id/{$vo['servicelog_id']}.html">
 
+                            <li class="service" style="box-shadow:inset;">
 
+                                <div style="width:60%;">{$vo['start_time']}</div>
 
+                                <div style="width:40%;text-align: right;">{$vo['user_name']}</div>
 
+                            </li>
 
+                        </a>
 
+                        {/foreach}
 
+                        {/if}
 
+                    </ul>
 
                 </div>
 
                 </div>
 
             </div>
 
             </div>

+ 1 - 1
application/admin/view/admins/editadmin.html
查看文件 

@@ -36,7 +36,7 @@
 
                         </div>
 
                         </div>
 
                         <div class="form-group">
 
                         <div class="form-group">
 
                             <label class="col-sm-3 control-label">选择角色：</label>
 
                             <label class="col-sm-3 control-label">选择角色：</label>
 
-                            <input type="hidden" id="group_id" name="group_id"/>
 
+                            <input type="hidden" id="group_id" name="group_id" value="{$info['group_id']}"/>
 
                             <div class="input-group col-sm-4 layui-form">
 
                             <div class="input-group col-sm-4 layui-form">
 
                                 <select lay-verify="required" lay-filter="group">
 
                                 <select lay-verify="required" lay-filter="group">
 
                                     <option value="0">请选择分组</option>
 
                                     <option value="0">请选择分组</option>

+ 1 - 1
application/service/controller/Login.php
查看文件 

@@ -24,7 +24,7 @@ class Login extends Controller
 
         if(empty($user)){
 
         if(empty($user)){
 
             return json(['code' => -1, 'data' => '', 'msg' => '客服不存在']);
 
             return json(['code' => -1, 'data' => '', 'msg' => '客服不存在']);
 
         }else{
 
         }else{
 
-            if($user['status'] == 2){
 
+            if($user['status'] != 1){
 
                 return json(['code' => -3, 'data' => '', 'msg' => '此账号已禁用']);
 
                 return json(['code' => -3, 'data' => '', 'msg' => '此账号已禁用']);
 
             }
 
             }
 
         }
 
         }