From 0d1cf0d9feb78cd0d96ad12e14ecf7513954a404 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=94=E5=A7=AC=E6=A1=91?= <867057410@qq.com>
Date: Sun, 16 Jan 2022 22:45:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E5=88=AB=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2[=E7=AD=9B=E9=80=89|=E6=B6=88=E6=81=AF]=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/PermissionController.php            |  13 +-
 .../Controllers/Admin/SubscribeController.php |   2 +-
 .../Controllers/Admin/TicketController.php    |   1 +
 .../views/admin/permission/index.blade.php    |  12 ++
 .../views/admin/subscribe/index.blade.php     |   7 +-
 resources/views/admin/ticket/reply.blade.php  | 129 ++++++++++++++++--
 resources/views/admin/user/index.blade.php    |   1 -
 resources/views/user/replyTicket.blade.php    |  18 ++-
 8 files changed, 153 insertions(+), 30 deletions(-)

diff --git a/app/Http/Controllers/Admin/PermissionController.php b/app/Http/Controllers/Admin/PermissionController.php
index 516e6d79..a164deea 100644
--- a/app/Http/Controllers/Admin/PermissionController.php
+++ b/app/Http/Controllers/Admin/PermissionController.php
@@ -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()
diff --git a/app/Http/Controllers/Admin/SubscribeController.php b/app/Http/Controllers/Admin/SubscribeController.php
index 480c2124..ffc6c997 100644
--- a/app/Http/Controllers/Admin/SubscribeController.php
+++ b/app/Http/Controllers/Admin/SubscribeController.php
@@ -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);
             });
diff --git a/app/Http/Controllers/Admin/TicketController.php b/app/Http/Controllers/Admin/TicketController.php
index 62e63a35..0de2c9e4 100644
--- a/app/Http/Controllers/Admin/TicketController.php
+++ b/app/Http/Controllers/Admin/TicketController.php
@@ -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(),
         ]);
     }
diff --git a/resources/views/admin/permission/index.blade.php b/resources/views/admin/permission/index.blade.php
index 06a3c3ca..392e7ad6 100644
--- a/resources/views/admin/permission/index.blade.php
+++ b/resources/views/admin/permission/index.blade.php
@@ -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>
diff --git a/resources/views/admin/subscribe/index.blade.php b/resources/views/admin/subscribe/index.blade.php
index 9c4ba891..687167ce 100644
--- a/resources/views/admin/subscribe/index.blade.php
+++ b/resources/views/admin/subscribe/index.blade.php
@@ -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>
diff --git a/resources/views/admin/ticket/reply.blade.php b/resources/views/admin/ticket/reply.blade.php
index 3356e891..07586cda 100644
--- a/resources/views/admin/ticket/reply.blade.php
+++ b/resources/views/admin/ticket/reply.blade.php
@@ -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
diff --git a/resources/views/admin/user/index.blade.php b/resources/views/admin/user/index.blade.php
index 18cdeefb..f9d0bd83 100644
--- a/resources/views/admin/user/index.blade.php
+++ b/resources/views/admin/user/index.blade.php
@@ -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>
diff --git a/resources/views/user/replyTicket.blade.php b/resources/views/user/replyTicket.blade.php
index 26a44ba1..d1fa0ed2 100644
--- a/resources/views/user/replyTicket.blade.php
+++ b/resources/views/user/replyTicket.blade.php
@@ -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