|
|
@@ -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 {
|
|
|
// 获取用户信息.
|
|
|
@@ -168,6 +168,9 @@ 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();
|
|
|
+ $account['user_ip'] = $service_log['user_ip'];
|
|
|
+ $account['system'] = $service_log['system'];
|
|
|
+ $account['browse'] = $service_log['browse'];
|
|
|
|
|
|
|
|
|
$result['total'] = $countChatLog;
|
|
|
@@ -175,11 +178,7 @@ class History extends Common
|
|
|
$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,
|
Jonlin