server/manghe
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加异常

Browse Source
This commit is contained in:
youda 2025-04-18 14:04:18 +08:00
parent 9bd5d0b7d7
commit 9579f994f7
1 changed files with 149 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
app/admin/controller/User.php
View File

@ -65,7 +65,9 @@ class User extends Base
$field = '*';
$order = 'id desc';
$data = UserModel::getList($where, $field, $order, $limit);
if ($data && $data['list']) {
foreach ($data['list'] as &$value) {
try {
$pid_info = UserModel::field('id,nickname,headimg,uid')->where(['id' => $value['pid']])->find();
$value['pid_info'] = $pid_info;
#关联user_account
@ -113,8 +115,11 @@ class User extends Base
$value['ip_adcode'] = $user_account['ip_adcode'];
$value['ip_province'] = $user_account['ip_province'];
$value['ip_city'] = $user_account['ip_city'];
} catch (\Throwable $th) {
//throw $th;
}
}
}
// 获取数据
$list = $data['list'];
@ -857,7 +862,7 @@ class User extends Base
// 将UID转换为用户ID
$user_id = $this->convertUidToUserId($user_id);
if(empty($user_id)) {
if (empty($user_id)) {
return json(['code' => 1, 'msg' => '参数错误', 'count' => 0, 'data' => []]);
}
@ -966,10 +971,10 @@ class User extends Base
public function user_order()
{
$id = input('id');
View::assign('id',$id);
View::assign('user_id',$id);
View::assign('id', $id);
View::assign('user_id', $id);
$nickname = input('nickname');
View::assign('nickname',$nickname);
View::assign('nickname', $nickname);
return View::fetch('User/user_order');
}
@ -984,7 +989,7 @@ class User extends Base
// 将UID转换为用户ID
$user_id = $this->convertUidToUserId($user_id);
if(empty($user_id)) {
if (empty($user_id)) {
return json(['code' => 1, 'msg' => '参数错误', 'count' => 0, 'data' => []]);
}
@ -1305,11 +1310,15 @@ class User extends Base
// 计算活跃用户数
$active_user_count = \app\common\model\UserLoginLog::getActiveUserCount($start_date, $end_date);
return json(['code' => 0, 'msg' => 'ok', 'data' => [
return json([
'code' => 0,
'msg' => 'ok',
'data' => [
'chart' => $chart_data,
'active_users' => $active_user_count,
'total_logins' => array_sum($values),
]]);
]
]);
break;
case 'week':
@ -1329,10 +1338,14 @@ class User extends Base
'values' => $values,
];
return json(['code' => 0, 'msg' => 'ok', 'data' => [
return json([
'code' => 0,
'msg' => 'ok',
'data' => [
'chart' => $chart_data,
'total_logins' => array_sum($values),
]]);
]
]);
break;
case 'month':
@ -1352,10 +1365,14 @@ class User extends Base
'values' => $values,
];
return json(['code' => 0, 'msg' => 'ok', 'data' => [
return json([
'code' => 0,
'msg' => 'ok',
'data' => [
'chart' => $chart_data,
'total_logins' => array_sum($values),
]]);
]
]);
break;
default: