Jonlin 6 年之前
父节点
当前提交
2c25ccbdce
共有 2 个文件被更改,包括 16 次插入8 次删除
  1. 1 1
      application/admin/view/system/basics.html
  2. 15 7
      application/service/controller/History.php

+ 1 - 1
application/admin/view/system/basics.html

@@ -49,7 +49,7 @@
                             <span>建议上传420px*700px</span>
 
                             <button type="button" class="layui-btn layui-btn-small" onclick="checkImage()">选择图片</button>
-                            <div class="layui-layer-shade" id="all_blank_img" style="display: none"></div>
+                            <div class="layui-layer-shade" id="all_blank_img" style="display: none;"></div>
                             <div class="layui-layer layui-layer-dialog" id="check_image" style="display: none;">
                                 <div class="layui-layer-title" style="cursor: move;">请选择图片</div>
                                 <div id="images" class="layui-layer-content layui-layer-padding" style="height: 70vh;">

+ 15 - 7
application/service/controller/History.php

@@ -113,13 +113,13 @@ class History extends Common
     public function historyInfo()
     {
         // 验证token.
-        $tokenStatus = $this->verifyToken();
-        $code        = -2;
-        $msg         = '错误';
-        if ($tokenStatus === false) {
-            $msg = 'token错误';
-            return json(['code' => $code, 'data' => [], 'msg' => $msg]);
-        }
+//        $tokenStatus = $this->verifyToken();
+//        $code        = -2;
+//        $msg         = '错误';
+//        if ($tokenStatus === false) {
+//            $msg = 'token错误';
+//            return json(['code' => $code, 'data' => [], 'msg' => $msg]);
+//        }
 
         try {
             // 获取用户信息.
@@ -166,12 +166,20 @@ class History extends Common
                 }
             }
 
+            $service_log = db('service_log')->where('servicelog_id',$servicelogId)->find();
+            $account = db('accounts')->field('id,account_name,nick_name,account_email,account_phone,address,remark')->where('id',$service_log['user_id'])->find();
+
 
             $result['total']       = $countChatLog;
             $result['countPage']   = (ceil(($result['total']) / $pageSize));
             $result['currentPage'] = $currentPage;
             $result['list']        = $chatLog;
             $result['pageSize']    = $pageSize;
+
+            $result['user_ip']    = $service_log['user_ip'];
+            $result['system']    = $service_log['system'];
+            $result['account']    = $account;
+            
             $result['alarm']       = [
                 'evaluate_id'      => $alarm['evaluate_id'],
                 'verifyReturnTime' => $verifyReturnTime,