Jonlin 6 سال پیش
والد
کامیت
40339a4917

+ 1 - 1
application/admin/controller/Accounts.php

@@ -81,7 +81,7 @@ class Accounts extends Base
     //用户信息导出
     public function toexcel()
     {
-        $result = db('accounts')->select();
+        $result = db('accounts')->order('add_time', 'desc')->select();
         //所有标签
         $label = db('accountslabel')->select();
         foreach($result as $key=>$vo){

+ 16 - 12
application/admin/controller/System.php

@@ -317,19 +317,25 @@ class System extends Base
         for($i=0;$i<count($chat);$i++){
             $content = json_decode($chat[$i]['content'], true);
             $chat[$i]['time_line'] = date('H:i',$chat[$i]['time_line']);
+            if(!empty($content['text'])){
+                $content['content'] = $content['text'];
+            }
+            if(!empty($content['img'])){
+                $content['content'] = '<img width="100%" src="'.$content['img'].'"/>';
+            }
             if(!empty(strstr($chat[$i]['to_id'], 'KF'))){
                 $html = $html . '<div style="margin-top:15px;width: 30%;"><div>'.$chat[$i]['from_name'].'&nbsp&nbsp&nbsp'.$chat[$i]['time_line'].'</div>';
-                $html = $html . '<p style="margin-top:5px;" class="form-content">'.$content['text'].'</p></div>';
+                $html = $html . '<p style="margin-top:5px;" class="form-content">'.$content['content'].'</p></div>';
             }else{
                 $html = $html . '<div style="margin-top:15px;width: 30%;margin-left:70%;text-align:right;"><div>'.$chat[$i]['from_name'].'&nbsp&nbsp&nbsp'.$chat[$i]['time_line'].'</div>';
-                $html = $html . '<p style="margin-top:5px;" class="form-content">'.$content['text'].'</p></div>';
+                $html = $html . '<p style="margin-top:5px;" class="form-content">'.$content['content'].'</p></div>';
             }
 
         }
         $servicelog = db('service_log')->where('servicelog_id',$id)->find();
         //满意度
         $evaluate = db('evaluate')->where('evaluate_id',$servicelog['evaluate_id'])->find();
-        $evaluate = $evaluate['evaluate_name'];
+        $evaluate = '<img width="40px" style="margin-top:15px;" src="'.$evaluate['evaluate_url'].'"/>';
 
         //$alarm报警信息
         $alarm =  db('alarm')->where('servicelog_id',$id)->find();
@@ -338,25 +344,23 @@ class System extends Base
         $verifyAllTime =  db('systemconfig')->where('systemconfig_name','质检会话时长设置')->find();
         //会话响应时长标准
         $verifyReturnTime =  db('systemconfig')->where('systemconfig_name','质检会话响应时长设置')->find();
-        $ul = '';
+        $span = '';
         if(!empty($alarm)){
-            $ul = $ul . '<ul class="alarm" style="margin-top: 5px;margin-left: 110px;">';
             if($alarm['alarm_userSensitive'] != 0){
-                $ul = $ul . '<li class="alarm_info">访客敏感词</li>';
+                $span = $span . '<span class="alarm_info">访客敏感词</span>';
             }
             if($alarm['alarm_serverSensitive'] != 0){
-                $ul = $ul . '<li class="alarm_info">客服敏感词</li>';
+                $span = $span . '<span class="alarm_info">客服敏感词</span>';
             }
             if($alarm['alarm_corresponding'] > $verifyReturnTime['systemconfig_data']){
-                $ul = $ul . '<li class="alarm_info">响应超时</li>';
+                $span = $span . '<span class="alarm_info">响应超时</span>';
             }
             if($alarm['alarm_cvtOvertime'] > $verifyAllTime['systemconfig_data']){
-                $ul = $ul . '<li class="alarm_info">会话超时</li>';
+                $span = $span . '<span class="alarm_info">会话超时</span>';
             }
             if($alarm['alarm_respond'] == 1){
-                $ul = $ul . '<li class="alarm_info">客服未回应</li>';
+                $span = $span . '<span class="alarm_info">客服未回应</span>';
             }
-            $ul = $ul . '</ul>';
         }
 
         //用户信息
@@ -365,7 +369,7 @@ class System extends Base
         $account['label'] = $label['name'];
         $this->assign([
             'html' => $html,
-            'ul' => $ul,
+            'span' => $span,
             'evaluate' => $evaluate,
             'servicelog' => $servicelog,
             'account' => $account

+ 19 - 8
application/admin/view/system/detail.html

@@ -46,7 +46,7 @@
         font-size: 15px;
         color: black;
     }
-    ul.alarm li.alarm_info{
+    span.alarm_info{
         background-color: #EC4859;
         color: white;
         margin-top: 20px;
@@ -59,6 +59,15 @@
         font-size: 12px;
         width: 65px;
     }
+    .foot-evaluate{
+        float: left;
+        width: 100px;
+        text-align: center;
+    }
+    .foot-alarm{
+        float: left;
+        width: 300px;
+    }
 </style>
 <body class="gray-bg">
 <div class="wrapper wrapper-content animated fadeInRight">
@@ -73,13 +82,15 @@
                 </div>
                 <div style="background-color: #eee;height: 150px;margin-top: -10px;">
                     <hr style="width: 86%;margin-left:7%;border-top:1px solid dimgrey;">
-                    <ul class="foot">
-                        <li>评价</li>
-                        <li style="margin-left: 10px;">{$evaluate}</li>
-                        <li style="margin-left: 20px;">触犯警报</li>
-                    </ul>
-                    <br>
-                    {$ul}
+                    <div class="foot-evaluate">
+                        <div>评价</div>
+                        <div>{$evaluate}</div>
+                    </div>
+                    <div class="foot-alarm">
+                        <div style="margin-left:5px;">触犯警报</div>
+                        {$span}
+                    </div>
+
                 </div>
 
             </div>

BIN
public/static/admin/images/commonly.png


BIN
public/static/admin/images/dissatisfied.png


BIN
public/static/admin/images/satisfied.png


BIN
public/uploads/20190715/1590590262951e61e7e201876db548ff.jpg


BIN
public/uploads/20190715/20f2319a30565f4e8d1aa2c9dd2bfdda.jpg


BIN
public/uploads/20190715/26d43b77c30ac3c011c30a9c4495910d.jpg


BIN
public/uploads/20190715/7323f787fc9019b0f8770a0b16827c75.jpeg


BIN
public/uploads/20190715/9d855f984d6a7e212d23e2bf38317ea6.jpg


BIN
public/uploads/20190715/c0ae3181a5aa4160d5aadd85ec05e53e.jpg


BIN
public/uploads/20190715/e54aab9c275e9ee5063eb2d6c1d1e7c0.jpg