Skip to content

Commit d791ee0

Browse files
author
zhangjiangbin
committed
修正merge导致的bug
1 parent d2583f4 commit d791ee0

12 files changed

Lines changed: 34 additions & 699 deletions

File tree

‎app/Http/Controllers/AdminController.php‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,7 +1000,7 @@ public function export(Request $request)
10001000
return Redirect::to('admin/userList');
10011001
}
10021002

1003-
$nodeList = SsNode::query()->paginate(10)->appends($request->except('page'));
1003+
$nodeList = SsNode::query()->where('status', 1)->paginate(10)->appends($request->except('page'));
10041004
foreach ($nodeList as &$node) {
10051005
// 生成ssr scheme
10061006
$obfs_param = $node->single ? '' : $user->obfs_param;
@@ -1756,12 +1756,8 @@ public function userBalanceLogList(Request $request)
17561756
return Response::view('admin/userBalanceLogList', $view);
17571757
}
17581758

1759-
/**
1760-
* 以某用户登录
1761-
* @param Request $request
1762-
* @return \Illuminate\Http\JsonResponse
1763-
*/
1764-
public function loginas(Request $request)
1759+
// 转换成某个用户的身份
1760+
public function switchToUser(Request $request)
17651761
{
17661762
$id = $request->get('user_id');
17671763
$user = User::query()->find($id);

‎app/Http/Controllers/PaymentController.php‎

Lines changed: 0 additions & 198 deletions
This file was deleted.

‎app/Http/Controllers/UserController.php‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ public function index(Request $request)
5656
$view['articleList'] = Article::query()->where('type', 1)->where('is_del', 0)->orderBy('sort', 'desc')->orderBy('id', 'desc')->paginate(5);
5757
$view['wechat_qrcode'] = self::$config['wechat_qrcode'];
5858
$view['alipay_qrcode'] = self::$config['alipay_qrcode'];
59-
$view['payment_enabled'] = self::$config['dmf_qqpay'] || self::$config['dmf_wepay'] || self::$config['dmf_alipay'];
6059

6160
// 推广返利是否可见
6261
if (!$request->session()->has('referral_status')) {
@@ -961,21 +960,8 @@ public function subscribe(Request $request)
961960
return Response::view('/user/subscribe', $view);
962961
}
963962

964-
/**
965-
* 充值余额
966-
* @param Request $request
967-
* @return \Illuminate\Http\Response
968-
*/
969-
public function payment(Request $request)
970-
{
971-
$view = self::$config;
972-
$view['paymentList'] = Payment::query()->where("user_id", $request->session()->get('user')['id'])->get();
973-
974-
return Response::view("user.payment", $view);
975-
}
976-
977-
// 管理员切换到用户身份后恢复到管理员权限
978-
public function loginasadmin(Request $request)
963+
// 转换成管理员的身份
964+
public function switchToAdmin(Request $request)
979965
{
980966
if (!$request->session()->has('admin') || !$request->session()->has('user')) {
981967
return Response::json(['status' => 'fail', 'data' => '', 'message' => '非法请求']);

‎resources/views/admin/editUser.blade.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<div class="row">
3535
<span class="caption-subject font-dark bold uppercase col-md-4">账号信息</span>
3636
<div class="text-right col-md-8" style="">
37-
<button type="button" class="btn btn-sm btn-danger btn-outline" onclick="loginas()">切换身份</button>
37+
<button type="button" class="btn btn-sm btn-danger btn-outline" onclick="switchToUser()">切换身份</button>
3838
</div>
3939
</div>
4040
</div>
@@ -366,10 +366,10 @@
366366
<script src="/js/layer/layer.js" type="text/javascript"></script>
367367

368368
<script type="text/javascript">
369-
// 切换用户身份：以某用户的身份登录
370-
function loginas() {
369+
// 切换用户身份
370+
function switchToUser() {
371371
$.ajax({
372-
'url': "{{url("/admin/loginas")}}",
372+
'url': "{{url("/admin/switchToUser")}}",
373373
'data': {
374374
'user_id': '{{$user->id}}',
375375
'_token': '{{csrf_token()}}'

0 commit comments

Comments
 (0)