mirror of
https://github.com/ProxyPanel/ProxyPanel.git
synced 2026-04-04 19:49:16 +00:00
个别管理页面[筛选|消息]优化
This commit is contained in:
兔姬桑
@@ -5,13 +5,22 @@ namespace App\Http\Controllers\Admin;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\Admin\PermissionRequest;
|
||||
use Exception;
|
||||
use Illuminate\Http\Request;
|
||||
use Spatie\Permission\Models\Permission;
|
||||
|
||||
class PermissionController extends Controller
|
||||
{
|
||||
public function index()
|
||||
public function index(Request $request)
|
||||
{
|
||||
return view('admin.permission.index', ['permissions' => Permission::query()->paginate(15)]);
|
||||
$query = Permission::query();
|
||||
|
||||
foreach (['name', 'description'] as $field) {
|
||||
$request->whenFilled($field, function ($value) use ($query, $field) {
|
||||
$query->where($field, 'like', "%{$value}%");
|
||||
});
|
||||
}
|
||||
|
||||
return view('admin.permission.index', ['permissions' => $query->paginate(20)->appends($request->except('page'))]);
|
||||
}
|
||||
|
||||
public function create()
|
||||
|
||||
@@ -27,7 +27,7 @@ class SubscribeController extends Controller
|
||||
});
|
||||
});
|
||||
|
||||
foreach (['user_id', 'status'] as $field) {
|
||||
foreach (['user_id', 'status', 'code'] as $field) {
|
||||
$request->whenFilled($field, function ($value) use ($query, $field) {
|
||||
$query->where($field, $value);
|
||||
});
|
||||
|
||||
@@ -55,6 +55,7 @@ class TicketController extends Controller
|
||||
{
|
||||
return view('admin.ticket.reply', [
|
||||
'ticket' => $ticket,
|
||||
'user' => $ticket->user->load('userGroup', 'inviter'),
|
||||
'replyList' => $ticket->reply()->oldest()->get(),
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -16,6 +16,18 @@
|
||||
@endcan
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<form class="form-row">
|
||||
<div class="form-group col-lg-5 col-sm-6">
|
||||
<input type="text" class="form-control" name="description" value="{{Request::query('description')}}" placeholder="名称"/>
|
||||
</div>
|
||||
<div class="form-group col-lg-5 col-sm-6">
|
||||
<input type="text" class="form-control" name="name" value="{{Request::query('name')}}" placeholder="行为"/>
|
||||
</div>
|
||||
<div class="form-group col-lg-2 col-sm-6 btn-group">
|
||||
<button type="submit" class="btn btn-primary">搜 索</button>
|
||||
<a href="{{route('admin.permission.index')}}" class="btn btn-danger">{{trans('common.reset')}}</a>
|
||||
</div>
|
||||
</form>
|
||||
<table class="text-md-center" data-toggle="table" data-mobile-responsive="true">
|
||||
<thead class="thead-default">
|
||||
<tr>
|
||||
|
||||
@@ -10,12 +10,15 @@
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<form class="form-row">
|
||||
<div class="form-group col-lg-2 col-sm-6">
|
||||
<div class="form-group col-lg-1 col-sm-6">
|
||||
<input type="number" class="form-control" name="user_id" value="{{Request::query('user_id')}}" placeholder="ID"/>
|
||||
</div>
|
||||
<div class="form-group col-lg-4 col-sm-6">
|
||||
<div class="form-group col-lg-3 col-sm-6">
|
||||
<input type="text" class="form-control" name="username" value="{{Request::query('username')}}" placeholder="用户账号"/>
|
||||
</div>
|
||||
<div class="form-group col-lg-3 col-sm-6">
|
||||
<input type="text" class="form-control" name="code" value="{{Request::query('code')}}" placeholder="订阅码"/>
|
||||
</div>
|
||||
<div class="form-group col-lg-3 col-sm-6">
|
||||
<select name="status" id="status" class="form-control" onchange="this.form.submit()">
|
||||
<option value="" hidden>状态</option>
|
||||
|
||||
@@ -3,8 +3,11 @@
|
||||
<div class="page-content">
|
||||
<div class="panel panel-bordered">
|
||||
<div class="panel-heading">
|
||||
<h1 class="panel-title cyan-600"><i class="icon wb-help-circle"></i> {{$ticket->title}} </h1>
|
||||
<div class="panel-actions">
|
||||
<h1 class="panel-title cyan-600">
|
||||
<i class="icon wb-help-circle"></i> {{$ticket->title}}
|
||||
</h1>
|
||||
<div class="panel-actions btn-group">
|
||||
<button class="btn icon-1x btn-info btn-icon wb-user-circle" data-target="#userInfo" data-toggle="modal" type="button"> 用户信息</button>
|
||||
<a href="{{route('admin.ticket.index')}}" class="btn btn-default">返 回</a>
|
||||
@if($ticket->status !== 2)
|
||||
@can('admin.ticket.destroy')
|
||||
@@ -23,20 +26,118 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@if($ticket->status !== 2)
|
||||
@can('admin.ticket.update')
|
||||
<div class="panel-footer pb-30">
|
||||
<form>
|
||||
<div class="input-group">
|
||||
<input type="text" class="form-control" id="editor" placeholder="{{trans('user.ticket.reply_placeholder')}}"/>
|
||||
<span class="input-group-btn">
|
||||
@can('admin.ticket.update')
|
||||
<div class="panel-footer pb-30">
|
||||
<form>
|
||||
<div class="input-group">
|
||||
<input type="text" class="form-control" id="editor" placeholder="{{trans('user.ticket.reply_placeholder')}}"/>
|
||||
<span class="input-group-btn">
|
||||
<button type="button" class="btn btn-primary" onclick="replyTicket()"> {{trans('common.send')}}</button>
|
||||
</span>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
@endcan
|
||||
@endif
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
@endcan
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal fade" id="userInfo" aria-hidden="true" aria-labelledby="userInfo"
|
||||
role="dialog" tabindex="-1">
|
||||
<div class="modal-dialog modal-simple modal-sidebar">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
<h4 class="modal-title">
|
||||
<i class="wb-user" aria-hidden="true"></i> 用户信息</h4>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<ul class="list-group list-group-dividered px-20 mb-0">
|
||||
<h5>基础信息</h5>
|
||||
<dl class="dl-horizontal row">
|
||||
<dt class="col-sm-3">昵称</dt>
|
||||
<dd class="col-sm-9">{{$user->nickname}}</dd>
|
||||
<dt class="col-sm-3">账号</dt>
|
||||
<dd class="col-sm-9">{{$user->username}}</dd>
|
||||
<dt class="col-sm-3">账号状态</dt>
|
||||
<dd class="col-sm-9">
|
||||
@if ($user->status > 0)
|
||||
<span class="badge badge-lg badge-primary">
|
||||
<i class="wb-check" aria-hidden="true"></i>
|
||||
</span>
|
||||
@elseif ($user->status < 0)
|
||||
<span class="badge badge-lg badge-danger">
|
||||
<i class="wb-close" aria-hidden="true"></i>
|
||||
</span>
|
||||
@else
|
||||
<span class="badge badge-lg badge-default">
|
||||
<i class="wb-minus" aria-hidden="true"></i>
|
||||
</span>
|
||||
@endif
|
||||
</dd>
|
||||
<dt class="col-sm-3">等级</dt>
|
||||
<dd class="col-sm-9">{{$user->level}}</dd>
|
||||
<dt class="col-sm-3">分组</dt>
|
||||
<dd class="col-sm-9">{{$user->userGroup ?? '无分组'}}</dd>
|
||||
<dt class="col-sm-3">余额</dt>
|
||||
<dd class="col-sm-9">{{$user->credit}}</dd>
|
||||
<dt class="col-sm-3">流量</dt>
|
||||
<dd class="col-sm-9">{{flowAutoShow($user->used_traffic)}} / {{$user->transfer_enable_formatted}}</dd>
|
||||
<dt class="col-sm-3">重置日期</dt>
|
||||
<dd class="col-sm-9">{{$user->reset_time ?? '无'}}</dd>
|
||||
<dt class="col-sm-3">最近使用</dt>
|
||||
<dd class="col-sm-9">
|
||||
{{$user->t? date('Y-m-d H:i', $user->t): '未使用'}}
|
||||
</dd>
|
||||
<dt class="col-sm-3">过期日期</dt>
|
||||
<dd class="col-sm-9">
|
||||
@if ($user->expired_at < date('Y-m-d'))
|
||||
<span class="badge badge-lg badge-danger"> {{$user->expired_at}} </span>
|
||||
@elseif ($user->expired_at === date('Y-m-d'))
|
||||
<span class="badge badge-lg badge-warning"> {{$user->expired_at}} </span>
|
||||
@elseif ($user->expired_at <= date('Y-m-d', strtotime('30 days')))
|
||||
<span class="badge badge-lg badge-default"> {{$user->expired_at}} </span>
|
||||
@else
|
||||
{{$user->expired_at}}
|
||||
@endif
|
||||
</dd>
|
||||
<dt class="col-sm-3">备注</dt>
|
||||
<dt class="col-sm-3">{!! $user->remark !!}</dt>
|
||||
</dl>
|
||||
<h5>代理信息</h5>
|
||||
<dl class="dl-horizontal row">
|
||||
<dt class="col-sm-3">开启状态</dt>
|
||||
<dd class="col-sm-9">
|
||||
<span class="badge badge-lg badge-{{$user->enable?'info':'danger'}}">
|
||||
<i class="wb-{{$user->enable?'check':'close'}}" aria-hidden="true"></i>
|
||||
</span>
|
||||
</dd>
|
||||
<dt class="col-sm-3">端口</dt>
|
||||
<dd class="col-sm-9">{!!$user->port? : '<span class="badge badge-lg badge-danger"> 未分配 </span>'!!}</dd>
|
||||
</dl>
|
||||
<h5>其他</h5>
|
||||
<dl class="dl-horizontal row">
|
||||
<dt class="col-sm-3">邀请人信息</dt>
|
||||
<dd class="col-sm-9">
|
||||
{{$user->inviter->nickname ?? '无'}}
|
||||
</dd>
|
||||
@isset ($user->inviter)
|
||||
<dt class="col-sm-3 offset-md-1">账号</dt>
|
||||
<dd class="col-sm-8">{{$user->inviter->username}}</dd>
|
||||
<dt class="col-sm-3 offset-md-1">等级</dt>
|
||||
<dd class="col-sm-8">{{$user->inviter->level}}</dd>
|
||||
<dt class="col-sm-3 offset-md-1">最近使用</dt>
|
||||
<dd class="col-sm-8">
|
||||
{{$user->inviter->t? date('Y-m-d H:i', $user->inviter->t): '未使用'}}
|
||||
</dd>
|
||||
@endif
|
||||
</dl>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-default" data-dismiss="modal">@lang('common.close')</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
@@ -113,7 +113,6 @@
|
||||
</td>
|
||||
<td> {{flowAutoShow($user->used_traffic)}} / {{$user->transfer_enable_formatted}} </td>
|
||||
<td> {{$user->t? date('Y-m-d H:i', $user->t): '未使用'}} </td>
|
||||
|
||||
<td>
|
||||
@if ($user->expired_at < date('Y-m-d'))
|
||||
<span class="badge badge-lg badge-danger"> {{$user->expired_at}} </span>
|
||||
|
||||
@@ -20,18 +20,16 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@if($ticket->status !== 2)
|
||||
<div class="panel-footer pb-30">
|
||||
<form>
|
||||
<div class="input-group">
|
||||
<input type="text" class="form-control" id="editor" placeholder="{{trans('user.ticket.reply_placeholder')}}"/>
|
||||
<span class="input-group-btn">
|
||||
<div class="panel-footer pb-30">
|
||||
<form>
|
||||
<div class="input-group">
|
||||
<input type="text" class="form-control" id="editor" placeholder="{{trans('user.ticket.reply_placeholder')}}"/>
|
||||
<span class="input-group-btn">
|
||||
<button type="button" class="btn btn-primary" onclick="replyTicket()"> {{trans('common.send')}}</button>
|
||||
</span>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
Reference in New Issue
Block a user