Minor changes

app/Console/Commands/PanelInstallation.php

@@ -7,7 +7,6 @@ use Artisan;
 use Exception;
 use File;
 use Illuminate\Console\Command;
-use Illuminate\Contracts\Filesystem\FileNotFoundException;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
 
@@ -89,9 +88,6 @@ BANNER;
         }
     }
 
-    /**
-     * @throws FileNotFoundException
-     */
     private function setDatabaseInfo(): void
     {
         $this->line(' Setting up database information | 设置数据库信息');
@@ -107,9 +103,6 @@ BANNER;
         $this->saveToEnv($databaseInfo);
     }
 
-    /**
-     * @throws FileNotFoundException
-     */
     private function saveToEnv(array $data = []): void
     {
         $envPath = app()->environmentFilePath();

app/Http/Middleware/isForbidden.php

@@ -29,7 +29,7 @@ class isForbidden
         if (config('app.env') === 'production' && sysConfig('website_url') && ! str_contains(sysConfig('website_url'), $request->getHost())) {
             Log::warning('识别到通过订阅链接访问，强制跳转至百度('.IP::getClientIp().') '.$request->fullUrl());
 
-            return redirect('https://www.baidu.com');
+            return redirect(sysConfig('redirect_url', 'https://www.baidu.com').'?url='.$request->url());
         }
 
         if (sysConfig('forbid_mode')) {
@@ -39,7 +39,7 @@ class isForbidden
             if ($ipLocation !== false) {
                 // 拒绝无IP请求
                 if (empty($ipLocation) || empty(array_filter($ipLocation))) {
-                    Log::warning("无法识别到IP，拒绝访问：$ip");
+                    Log::warning(trans('errors.forbidden.access').": $ip");
 
                     return Response::view('auth.error', ['message' => trans('errors.forbidden.access')], 403);
                 }
@@ -49,27 +49,27 @@ class isForbidden
                     switch (sysConfig('forbid_mode')) {
                         case 'ban_mainland':
                             if (in_array($ipLocation['country'], ['China', '中国', 'CN']) && ! in_array($ipLocation['region'], ['Taiwan', 'Hong Kong', 'Macao', '香港', '澳门', '台湾', '台湾省'])) {
-                                Log::warning("识别到大陆IP，拒绝访问：$ip");
+                                Log::warning(trans('errors.forbidden.china').": $ip");
 
                                 return Response::view('auth.error', ['message' => trans('errors.forbidden.china')], 403);
                             }
                             break;
                         case 'ban_china':
                             if (in_array($ipLocation['country'], ['China', '中国', 'Taiwan', 'Hong Kong', 'Macao', '香港', '台湾', '澳门'])) {
-                                Log::warning("识别到中国IP，拒绝访问：$ip");
+                                Log::warning(trans('errors.forbidden.china').": $ip");
 
                                 return Response::view('auth.error', ['message' => trans('errors.forbidden.china')], 403);
                             }
                             break;
                         case 'ban_oversea':
                             if (! in_array($ipLocation['country'], ['China', '中国', 'Taiwan', 'Hong Kong', 'Macao', '香港', '台湾', '澳门'])) {
-                                Log::warning("识别到海外IP，拒绝访问：$ip - ".$ipLocation['country']);
+                                Log::warning(trans('errors.forbidden.oversea').": $ip - ".$ipLocation['country']);
 
                                 return Response::view('auth.error', ['message' => trans('errors.forbidden.oversea')], 403);
                             }
                             break;
                         default:
-                            Log::emergency('未知禁止访问模式！请在系统设置中修改【禁止访问模式】！');
+                            Log::emergency(trans('errors.forbidden.unknown'));
                             break;
                     }
                 }

database/seeders/ConfigSeeder.php

@@ -182,6 +182,7 @@ class ConfigSeeder extends Seeder
             'user_invite_days' => 7,
             'admin_invite_days' => 7,
             'standard_currency' => 'CNY',
+            'redirect_url' => 'https://www.baidu.com',
         ];
 
         foreach ($presetDates as $key => $value) {

resources/lang/de/errors.php

@@ -8,6 +8,7 @@ return [
         'bots' => 'Bot-Zugriff erkannt, Zugriff verweigert',
         'china' => 'China-IP oder Proxy-Zugriff erkannt, Zugriff verweigert',
         'oversea' => 'Übersee-IP oder Proxy-Zugriff erkannt, Zugriff verweigert',
+        'unknown' => 'Unbekannter verbotener Zugriffsmodus! Bitte ändern Sie den [Zugriffsbeschränkung] in den Systemeinstellungen!',
     ],
     'log' => 'Protokoll',
     'refresh' => 'Aktualisieren',

resources/lang/en/errors.php

@@ -8,6 +8,7 @@ return [
         'bots' => 'Detected bot access, access denied',
         'china' => 'Detected China IP or proxy access, access denied',
         'oversea' => 'Detected overseas IP or proxy access, access denied',
+        'unknown' => 'Unknown forbidden access mode! Please modify the [Access Restriction] in the system settings!',
     ],
     'log' => 'Log',
     'refresh' => 'Refresh',

resources/lang/fa/errors.php

@@ -8,6 +8,7 @@ return [
         'bots' => 'دسترسی ربات شناسایی شد، دسترسی ممنوع',
         'china' => 'دسترسی IP یا پروکسی چین شناسایی شد، دسترسی ممنوع',
         'oversea' => 'دسترسی IP یا پروکسی خارج از کشور شناسایی شد، دسترسی ممنوع',
+        'unknown' => 'حالت دسترسی ممنوع ناشناخته! لطفاً [حالت مسدودسازی] را در تنظیمات سیستم تغییر دهید!',
     ],
     'log' => 'لاگ',
     'refresh' => 'تازه‌سازی',

resources/lang/ja/errors.php

@@ -8,6 +8,7 @@ return [
         'bots' => 'ボットアクセスが検出されました。アクセス禁止',
         'china' => '中国のIPまたはプロキシアクセスが検出されました。アクセス禁止',
         'oversea' => '海外のIPまたはプロキシアクセスが検出されました。アクセス禁止',
+        'unknown' => '不明な禁止アクセスモード！システム設定で[アクセス禁止モード]を変更してください！',
     ],
     'log' => 'ログ',
     'refresh' => 'リフレッシュ',

resources/lang/ko/errors.php

@@ -8,6 +8,7 @@ return [
         'bots' => '봇 접근이 감지되었습니다. 접근이 거부되었습니다.',
         'china' => '중국 IP 또는 프록시 접근이 감지되었습니다. 접근이 거부되었습니다.',
         'oversea' => '해외 IP 또는 프록시 접근이 감지되었습니다. 접근이 거부되었습니다.',
+        'unknown' => '알 수 없는 금지 액세스 모드입니다! 시스템 설정에서 [접근 제한 모드]를 수정하십시오!',
     ],
     'log' => '로그',
     'refresh' => '새로 고침',

resources/lang/vi/errors.php

@@ -8,6 +8,7 @@ return [
         'bots' => 'Phát hiện truy cập từ robot, từ chối truy cập',
         'china' => 'Phát hiện truy cập từ IP hoặc proxy Trung Quốc, từ chối truy cập',
         'oversea' => 'Phát hiện truy cập từ IP hoặc proxy nước ngoài, từ chối truy cập',
+        'unknown' => 'Chế độ truy cập bị cấm không xác định! Vui lòng sửa đổi [Chế độ cấm truy cập] trong cài đặt hệ thống!',
     ],
     'log' => 'Nhật ký',
     'refresh' => 'Làm mới',

resources/lang/zh_CN/admin.php

@@ -680,7 +680,7 @@ return [
             'register_ip_limit' => '24小时内同IP允许注册数量，为0/留空不限制',
             'reset_password_times' => '24小时内可以通过邮件重置密码次数',
             'reset_traffic' => '用户会按其购买套餐的日期自动重置可用流量',
-            'server_chan_key' => '启用ServerChan，请务必填入本值（<a href=https://sc.ftqq.com target=_blank>申请 SCKEY</a>）',
+            'server_chan_key' => '启用ServerChan，请务必填入本值（<a href="https://sct.ftqq.com/r/2626" target="_blank">申请 SCKEY</a>）',
             'standard_currency' => '网站中涉及金钱部分的默认货币',
             'subject_name' => '用于在支付渠道的商品标题显示',
             'subscribe_ban_times' => '24小时内订阅链接请求次数限制',

resources/lang/zh_CN/errors.php

@@ -8,6 +8,7 @@ return [
         'bots' => '检测到机器人访问，禁止访问',
         'china' => '检测到中国IP或代理访问，禁止访问',
         'oversea' => '检测到海外IP或代理访问，禁止访问',
+        'unknown' => '未知禁止访问模式！请在系统设置中修改【禁止访问模式】！',
     ],
     'log' => '日志',
     'refresh' => '刷新',

resources/views/admin/aff/detail.blade.php

@@ -1,7 +1,4 @@
-@extends('admin.layouts')
-@section('css')
-    <link href="/assets/global/vendor/bootstrap-table/bootstrap-table.min.css" rel="stylesheet">
-@endsection
+@extends('admin.table_layouts')
 @section('content')
     <div class="page-content container">
         <div class="panel">
@@ -76,7 +73,3 @@
         </div>
     </div>
 @endsection
-@section('javascript')
-    <script src="/assets/global/vendor/bootstrap-table/bootstrap-table.min.js"></script>
-    <script src="/assets/global/vendor/bootstrap-table/extensions/mobile/bootstrap-table-mobile.min.js"></script>
-@endsection

resources/views/admin/aff/index.blade.php

@@ -22,7 +22,7 @@
                     </div>
                     <div class="form-group col-lg-1 col-sm-4 btn-group">
                         <button class="btn btn-primary" type="submit">{{ trans('common.search') }}</button>
-                        <a class="btn btn-danger" href="{{ route('admin.aff.index') }}">{{ trans('common.reset') }}</a>
+                        <button class="btn btn-danger" type="button" onclick="resetSearchForm()">{{ trans('common.reset') }}</button>
                     </div>
                 </form>
                 <table class="text-md-center" data-toggle="table" data-mobile-responsive="true">

resources/views/admin/aff/invite.blade.php

@@ -1,7 +1,4 @@
-@extends('admin.layouts')
-@section('css')
-    <link href="/assets/global/vendor/bootstrap-table/bootstrap-table.min.css" rel="stylesheet">
-@endsection
+@extends('admin.table_layouts')
 @section('content')
     <div class="page-content container-fluid">
         <div class="row">
@@ -85,10 +82,8 @@
         </div>
     </div>
 @endsection
-@section('javascript')
+@push('javascript')
     <script src="/assets/custom/clipboardjs/clipboard.min.js"></script>
-    <script src="/assets/global/vendor/bootstrap-table/bootstrap-table.min.js"></script>
-    <script src="/assets/global/vendor/bootstrap-table/extensions/mobile/bootstrap-table-mobile.min.js"></script>
     <script>
         @can('admin.invite.create')
             // 生成邀请码
@@ -157,4 +152,4 @@
             });
         });
     </script>
-@endsection
+@endpush

resources/views/admin/aff/rebate.blade.php

@@ -25,7 +25,7 @@
                     </div>
                     <div class="form-group col-lg-2 col-sm-6 btn-group">
                         <button class="btn btn-primary" type="submit">{{ trans('common.search') }}</button>
-                        <a class="btn btn-danger" href="{{ route('admin.aff.rebate') }}">{{ trans('common.reset') }}</a>
+                        <button class="btn btn-danger" type="button" onclick="resetSearchForm()">{{ trans('common.reset') }}</button>
                     </div>
                 </form>
                 <table class="text-md-center" data-toggle="table" data-mobile-responsive="true">

resources/views/admin/article/index.blade.php

@@ -45,7 +45,7 @@
                     </div>
                     <div class="form-group col-xxl-1 col-lg-3 col-md-3 col-4 btn-group">
                         <button class="btn btn-primary" type="submit">{{ trans('common.search') }}</button>
-                        <a class="btn btn-danger" href="{{ route('admin.article.index') }}">{{ trans('common.reset') }}</a>
+                        <button class="btn btn-danger" type="button" onclick="resetSearchForm()">{{ trans('common.reset') }}</button>
                     </div>
                 </form>
                 <table class="text-md-center" data-toggle="table" data-mobile-responsive="true">
@@ -98,8 +98,7 @@
                                                     <i class="icon wb-eye" aria-hidden="true"></i></a>
                                             @endcan
                                             @can('admin.article.edit')
-                                                <a class="btn btn-outline-primary"
-                                                   href="{{ route('admin.article.edit', ['article' => $article->id, 'page' => Request::query('page')]) }}">
+                                                <a class="btn btn-outline-primary" href="{{ route('admin.article.edit', ['article' => $article->id]) }}">
                                                     <i class="icon wb-edit" aria-hidden="true"></i></a>
                                             @endcan
                                             @can('admin.article.destroy')

resources/views/admin/article/info.blade.php

@@ -194,7 +194,7 @@
                 }).data('dropify').init()
             }
 
-            function handleFormSubmit(event) {
+            function handleFormSubmit() {
                 const logoUrl = $logoUrl.val()
                 if (logoUrl || (logoCleared && !$logo.val())) {
                     $logo.attr('type', 'text').val(logoUrl || null)

resources/views/admin/config/common.blade.php

@@ -1,7 +1,4 @@
-@extends('admin.layouts')
-@section('css')
-    <link href="/assets/global/vendor/bootstrap-table/bootstrap-table.min.css" rel="stylesheet">
-@endsection
+@extends('admin.table_layouts')
 @section('content')
     <div class="page-content container">
         <div class="panel">
@@ -445,10 +442,8 @@
         </div>
     </div>
 @endsection
-@section('javascript')
+@push('javascript')
     <script src="/assets/custom/jump-tab.js"></script>
-    <script src="/assets/global/vendor/bootstrap-table/bootstrap-table.min.js"></script>
-    <script src="/assets/global/vendor/bootstrap-table/extensions/mobile/bootstrap-table-mobile.min.js"></script>
     <script>
         function addLevel() { // 添加等级
             @can('admin.config.level.store')
@@ -1158,4 +1153,4 @@
             @endcannot
         }
     </script>
-@endsection
+@endpush

resources/views/admin/config/emailFilter.blade.php

@@ -1,7 +1,4 @@
-@extends('admin.layouts')
-@section('css')
-    <link href="/assets/global/vendor/bootstrap-table/bootstrap-table.min.css" rel="stylesheet">
-@endsection
+@extends('admin.table_layouts')
 @section('content')
     <div class="page-content container">
         <div class="panel">
@@ -100,9 +97,7 @@
         </div>
     @endcan
 @endsection
-@section('javascript')
-    <script src="/assets/global/vendor/bootstrap-table/bootstrap-table.min.js"></script>
-    <script src="/assets/global/vendor/bootstrap-table/extensions/mobile/bootstrap-table-mobile.min.js"></script>
+@push('javascript')
     <script>
         @can('admin.config.filter.store')
             // 添加邮箱后缀
@@ -182,4 +177,4 @@
             }
         @endcan
     </script>
-@endsection
+@endpush

resources/views/admin/coupon/index.blade.php

@@ -39,7 +39,7 @@
                     </div>
                     <div class="form-group col-lg-3 col-sm-4 btn-group">
                         <button class="btn btn-primary" type="submit">{{ trans('common.search') }}</button>
-                        <a class="btn btn-danger" href="{{ route('admin.coupon.index') }}">{{ trans('common.reset') }}</a>
+                        <button class="btn btn-danger" type="button" onclick="resetSearchForm()">{{ trans('common.reset') }}</button>
                     </div>
                 </form>
                 <table class="text-md-center" data-toggle="table" data-mobile-responsive="true">

resources/views/admin/logs/callback.blade.php

@@ -26,7 +26,7 @@
                     </div>
                     <div class="form-group col-lg-2 col-sm-4 btn-group">
                         <button class="btn btn-primary" type="submit">{{ trans('common.search') }}</button>
-                        <a class="btn btn-danger" href="{{ route('admin.payment.callback') }}">{{ trans('common.reset') }}</a>
+                        <button class="btn btn-danger" type="button" onclick="resetSearchForm()">{{ trans('common.reset') }}</button>
                     </div>
                 </form>
                 <table class="text-md-center" data-toggle="table" data-mobile-responsive="true">

resources/views/admin/logs/notification.blade.php

@@ -21,7 +21,7 @@
                     </div>
                     <div class="form-group col-lg-1 col-sm-4 btn-group">
                         <button class="btn btn-primary" type="submit">{{ trans('common.search') }}</button>
-                        <a class="btn btn-danger" href="{{ route('admin.log.notify') }}">{{ trans('common.reset') }}</a>
+                        <button class="btn btn-danger" type="button" onclick="resetSearchForm()">{{ trans('common.reset') }}</button>
                     </div>
                 </form>
                 <table class="text-md-center" data-toggle="table" data-mobile-responsive="true">

resources/views/admin/logs/onlineIPMonitor.blade.php

@@ -33,7 +33,7 @@
                     </div>
                     <div class="form-group col-lg-2 col-sm-4 btn-group">
                         <button class="btn btn-primary" type="submit">{{ trans('common.search') }}</button>
-                        <a class="btn btn-danger" href="{{ route('admin.log.online') }}">{{ trans('common.reset') }}</a>
+                        <button class="btn btn-danger" type="button" onclick="resetSearchForm()">{{ trans('common.reset') }}</button>
                     </div>
                 </form>
                 <table class="text-md-center" data-toggle="table" data-mobile-responsive="true">

resources/views/admin/logs/order.blade.php

@@ -71,7 +71,7 @@
                     </div>
                     <div class="form-group col-lg-2 col-sm-6 btn-group">
                         <button class="btn btn-primary" type="submit">{{ trans('common.search') }}</button>
-                        <a class="btn btn-danger" href="{{ route('admin.order') }}">{{ trans('common.reset') }}</a>
+                        <button class="btn btn-danger" type="button" onclick="resetSearchForm()">{{ trans('common.reset') }}</button>
                     </div>
                 </form>
                 <table class="text-md-center" data-toggle="table" data-mobile-responsive="true">

resources/views/admin/logs/traffic.blade.php

@@ -46,7 +46,7 @@
                     </div>
                     <div class="form-group col-lg-2 col-sm-4 btn-group">
                         <button class="btn btn-primary" type="submit">{{ trans('common.search') }}</button>
-                        <a class="btn btn-danger" href="{{ route('admin.log.traffic') }}">{{ trans('common.reset') }}</a>
+                        <button class="btn btn-danger" type="button" onclick="resetSearchForm()">{{ trans('common.reset') }}</button>
                     </div>
                 </form>
                 <table class="text-md-center" data-toggle="table" data-mobile-responsive="true">

resources/views/admin/logs/userBanHistory.blade.php

@@ -1,7 +1,4 @@
-@extends('admin.layouts')
-@section('css')
-    <link href="/assets/global/vendor/bootstrap-table/bootstrap-table.min.css" rel="stylesheet">
-@endsection
+@extends('admin.table_layouts')
 @section('content')
     <div class="page-content container-fluid">
         <div class="panel">
@@ -16,7 +13,7 @@
                     </div>
                     <div class="form-group col-lg-2 col-sm-6 btn-group">
                         <button class="btn btn-primary" type="submit">{{ trans('common.search') }}</button>
-                        <a class="btn btn-danger" href="{{ route('admin.log.ban') }}">{{ trans('common.reset') }}</a>
+                        <button class="btn btn-danger" type="button" onclick="resetSearchForm()">{{ trans('common.reset') }}</button>
                     </div>
                 </form>
                 <table class="text-md-center" data-toggle="table" data-mobile-responsive="true">
@@ -72,7 +69,3 @@
         </div>
     </div>
 @endsection
-@section('javascript')
-    <script src="/assets/global/vendor/bootstrap-table/bootstrap-table.min.js"></script>
-    <script src="/assets/global/vendor/bootstrap-table/extensions/mobile/bootstrap-table-mobile.min.js"></script>
-@endsection

resources/views/admin/logs/userCreditHistory.blade.php

@@ -1,7 +1,4 @@
-@extends('admin.layouts')
-@section('css')
-    <link href="/assets/global/vendor/bootstrap-table/bootstrap-table.min.css" rel="stylesheet">
-@endsection
+@extends('admin.table_layouts')
 @section('content')
     <div class="page-content container-fluid">
         <div class="panel">
@@ -16,7 +13,7 @@
                     </div>
                     <div class="form-group col-lg-2 col-sm-6 btn-group">
                         <button class="btn btn-primary" type="submit">{{ trans('common.search') }}</button>
-                        <a class="btn btn-danger" href="{{ route('admin.log.credit') }}">{{ trans('common.reset') }}</a>
+                        <button class="btn btn-danger" type="button" onclick="resetSearchForm()">{{ trans('common.reset') }}</button>
                     </div>
                 </form>
                 <table class="text-md-center" data-toggle="table" data-mobile-responsive="true">
@@ -69,7 +66,3 @@
         </div>
     </div>
 @endsection
-@section('javascript')
-    <script src="/assets/global/vendor/bootstrap-table/bootstrap-table.min.js"></script>
-    <script src="/assets/global/vendor/bootstrap-table/extensions/mobile/bootstrap-table-mobile.min.js"></script>
-@endsection

resources/views/admin/logs/userOnlineIP.blade.php

@@ -1,7 +1,4 @@
-@extends('admin.layouts')
-@section('css')
-    <link href="/assets/global/vendor/bootstrap-table/bootstrap-table.min.css" rel="stylesheet">
-@endsection
+@extends('admin.table_layouts')
 @section('content')
     <div class="page-content container-fluid">
         <div class="panel">
@@ -32,7 +29,7 @@
                     </div>
                     <div class="form-group col-lg-2 col-sm-6 btn-group">
                         <button class="btn btn-primary" type="submit">{{ trans('common.search') }}</button>
-                        <a class="btn btn-danger" href="{{ route('admin.log.ip') }}">{{ trans('common.reset') }}</a>
+                        <button class="btn btn-danger" type="button" onclick="resetSearchForm()">{{ trans('common.reset') }}</button>
                     </div>
                 </form>
                 <table class="text-md-center" data-toggle="table" data-mobile-responsive="true">
@@ -115,7 +112,3 @@
         </div>
     </div>
 @endsection
-@section('javascript')
-    <script src="/assets/global/vendor/bootstrap-table/bootstrap-table.min.js"></script>
-    <script src="/assets/global/vendor/bootstrap-table/extensions/mobile/bootstrap-table-mobile.min.js"></script>
-@endsection

resources/views/admin/logs/userTraffic.blade.php

@@ -1,7 +1,4 @@
-@extends('admin.layouts')
-@section('css')
-    <link href="/assets/global/vendor/bootstrap-table/bootstrap-table.min.css" rel="stylesheet">
-@endsection
+@extends('admin.table_layouts')
 @section('content')
     <div class="page-content container-fluid">
         <div class="panel">
@@ -16,7 +13,7 @@
                     </div>
                     <div class="form-group col-lg-2 col-sm-6 btn-group">
                         <button class="btn btn-primary" type="submit">{{ trans('common.search') }}</button>
-                        <a class="btn btn-danger" href="{{ route('admin.log.flow') }}">{{ trans('common.reset') }}</a>
+                        <button class="btn btn-danger" type="button" onclick="resetSearchForm()">{{ trans('common.reset') }}</button>
                     </div>
                 </form>
                 <table class="text-md-center" data-toggle="table" data-mobile-responsive="true">
@@ -79,7 +76,3 @@
         </div>
     </div>
 @endsection
-@section('javascript')
-    <script src="/assets/global/vendor/bootstrap-table/bootstrap-table.min.js"></script>
-    <script src="/assets/global/vendor/bootstrap-table/extensions/mobile/bootstrap-table-mobile.min.js"></script>
-@endsection

resources/views/admin/marketing/emailList.blade.php

@@ -21,7 +21,7 @@
                     </div>
                     <div class="form-group col-lg-3 col-sm-6 btn-group">
                         <button class="btn btn-primary" type="submit">{{ trans('common.search') }}</button>
-                        <a class="btn btn-danger" href="{{ route('admin.marketing.email') }}">{{ trans('common.reset') }}</a>
+                        <button class="btn btn-danger" type="button" onclick="resetSearchForm()">{{ trans('common.reset') }}</button>
                     </div>
                 </form>
                 <table class="text-md-center" data-toggle="table" data-mobile-responsive="true">

resources/views/admin/marketing/pushList.blade.php

@@ -26,7 +26,7 @@
                     </div>
                     <div class="form-group col-lg-2 col-sm-6 btn-group">
                         <button class="btn btn-primary" type="submit">{{ trans('common.search') }}</button>
-                        <a class="btn btn-danger" href="{{ route('admin.marketing.push') }}">{{ trans('common.reset') }}</a>
+                        <button class="btn btn-danger" type="button" onclick="resetSearchForm()">{{ trans('common.reset') }}</button>
                     </div>
                 </form>
                 {{--                <div class="alert alert-info alert-dismissible" role="alert"> --}}

resources/views/admin/node/auth.blade.php

@@ -1,7 +1,4 @@
-@extends('admin.layouts')
-@section('css')
-    <link href="/assets/global/vendor/bootstrap-table/bootstrap-table.min.css" rel="stylesheet">
-@endsection
+@extends('admin.table_layouts')
 @section('content')
     <div class="page-content container-fluid">
         <div class="panel">
@@ -214,11 +211,8 @@
             </div>
         </div>
     @endforeach
-
 @endsection
-@section('javascript')
-    <script src="/assets/global/vendor/bootstrap-table/bootstrap-table.min.js"></script>
-    <script src="/assets/global/vendor/bootstrap-table/extensions/mobile/bootstrap-table-mobile.min.js"></script>
+@push('javascript')
     <script>
         // 生成授权KEY
         @can('admin.node.auth.store')
@@ -335,4 +329,4 @@
             }
         @endcan
     </script>
-@endsection
+@endpush

resources/views/admin/node/cert/index.blade.php

@@ -1,7 +1,4 @@
-@extends('admin.layouts')
-@section('css')
-    <link href="/assets/global/vendor/bootstrap-table/bootstrap-table.min.css" rel="stylesheet">
-@endsection
+@extends('admin.table_layouts')
 @section('content')
     <div class="page-content container-fluid">
         <div class="panel">
@@ -75,9 +72,7 @@
         </div>
     </div>
 @endsection
-@section('javascript')
-    <script src="/assets/global/vendor/bootstrap-table/bootstrap-table.min.js"></script>
-    <script src="/assets/global/vendor/bootstrap-table/extensions/mobile/bootstrap-table-mobile.min.js"></script>
+@push('javascript')
     @can('admin.node.cert.destroy')
         <script>
             // 删除授权
@@ -120,4 +115,4 @@
             }
         </script>
     @endcan
-@endsection
+@endpush

resources/views/admin/node/index.blade.php

@@ -1,6 +1,5 @@
-@extends('admin.layouts')
-@section('css')
-    <link href="/assets/global/vendor/bootstrap-table/bootstrap-table.min.css" rel="stylesheet">
+@extends('admin.table_layouts')
+@push('css')
     <style>
         #swal2-content {
             display: grid !important;
@@ -10,7 +9,7 @@
             text-decoration: none;
         }
     </style>
-@endsection
+@endpush
 @section('content')
     <div class="page-content container-fluid">
         <div class="panel">
@@ -253,9 +252,7 @@
         </div>
     </div>
 @endsection
-@section('javascript')
-    <script src="/assets/global/vendor/bootstrap-table/bootstrap-table.min.js"></script>
-    <script src="/assets/global/vendor/bootstrap-table/extensions/mobile/bootstrap-table-mobile.min.js"></script>
+@push('javascript')
     <script>
         @can('admin.node.check')
             // 节点连通性测试
@@ -415,4 +412,4 @@
             }
         @endcan
     </script>
-@endsection
+@endpush

resources/views/admin/permission/index.blade.php

@@ -1,7 +1,4 @@
-@extends('admin.layouts')
-@section('css')
-    <link href="/assets/global/vendor/bootstrap-table/bootstrap-table.min.css" rel="stylesheet">
-@endsection
+@extends('admin.table_layouts')
 @section('content')
     <div class="page-content container">
         <div class="panel">
@@ -27,7 +24,7 @@
                     </div>
                     <div class="form-group col-lg-2 col-sm-6 btn-group">
                         <button class="btn btn-primary" type="submit">{{ trans('common.search') }}</button>
-                        <a class="btn btn-danger" href="{{ route('admin.permission.index') }}">{{ trans('common.reset') }}</a>
+                        <button class="btn btn-danger" type="button" onclick="resetSearchForm()">{{ trans('common.reset') }}</button>
                     </div>
                 </form>
                 <table class="text-md-center" data-toggle="table" data-mobile-responsive="true">
@@ -80,9 +77,7 @@
         </div>
     </div>
 @endsection
-@section('javascript')
-    <script src="/assets/global/vendor/bootstrap-table/bootstrap-table.min.js"></script>
-    <script src="/assets/global/vendor/bootstrap-table/extensions/mobile/bootstrap-table-mobile.min.js"></script>
+@push('javascript')
     @can('admin.permission.destroy')
         <script>
             function delPermission(url, name) {
@@ -124,4 +119,4 @@
             }
         </script>
     @endcan
-@endsection
+@endpush

resources/views/admin/report/siteDataAnalysis.blade.php

@@ -17,7 +17,7 @@
                     </div>
                     <div class="form-group col-xxl-1 col-lg-3 col-md-3 col-4 btn-group">
                         <button class="btn btn-primary" type="submit">{{ trans('common.search') }}</button>
-                        <a class="btn btn-danger" href="{{ route('admin.report.siteAnalysis') }}">{{ trans('common.reset') }}</a>
+                        <button class="btn btn-danger" type="button" onclick="resetSearchForm()">{{ trans('common.reset') }}</button>
                     </div>
                 </form>
             </div>

resources/views/admin/role/index.blade.php

@@ -1,7 +1,4 @@
-@extends('admin.layouts')
-@section('css')
-    <link href="/assets/global/vendor/bootstrap-table/bootstrap-table.min.css" rel="stylesheet">
-@endsection
+@extends('admin.table_layouts')
 @section('content')
     <div class="page-content container">
         <div class="panel">
@@ -74,9 +71,7 @@
         </div>
     </div>
 @endsection
-@section('javascript')
-    <script src="/assets/global/vendor/bootstrap-table/bootstrap-table.min.js"></script>
-    <script src="/assets/global/vendor/bootstrap-table/extensions/mobile/bootstrap-table-mobile.min.js"></script>
+@push('javascript')
     @can('admin.role.destroy')
         <script>
             function delRole(url, name) {
@@ -118,4 +113,4 @@
             }
         </script>
     @endcan
-@endsection
+@endpush

resources/views/admin/rule/group/index.blade.php

@@ -1,7 +1,4 @@
-@extends('admin.layouts')
-@section('css')
-    <link href="/assets/global/vendor/bootstrap-table/bootstrap-table.min.css" rel="stylesheet">
-@endsection
+@extends('admin.table_layouts')
 @section('content')
     <div class="page-content container-fluid">
         <div class="panel">
@@ -68,9 +65,7 @@
         </div>
     </div>
 @endsection
-@section('javascript')
-    <script src="/assets/global/vendor/bootstrap-table/bootstrap-table.min.js"></script>
-    <script src="/assets/global/vendor/bootstrap-table/extensions/mobile/bootstrap-table-mobile.min.js"></script>
+@push('javascript')
     @can('admin.rule.group.destroy')
         <script>
             // 删除规则分组
@@ -113,4 +108,4 @@
             }
         </script>
     @endcan
-@endsection
+@endpush

resources/views/admin/rule/index.blade.php

@@ -24,7 +24,7 @@
                         </select>
                     </div>
                     <div class="form-group col-xxl-1 col-lg-3 col-md-3 col-4">
-                        <a class="btn btn-danger" href="{{ route('admin.rule.index') }}">{{ trans('common.reset') }}</a>
+                        <button class="btn btn-danger" type="button" onclick="resetSearchForm()">{{ trans('common.reset') }}</button>
                     </div>
                 </form>
                 <table class="text-md-center" data-toggle="table" data-mobile-responsive="true">

resources/views/admin/rule/log.blade.php

@@ -40,7 +40,7 @@
                     </div>
                     <div class="form-group col-xxl-1 col-lg-3 col-md-3 col-4 btn-group">
                         <button class="btn btn-primary" type="submit">{{ trans('common.search') }}</button>
-                        <a class="btn btn-danger" href="{{ route('admin.rule.log') }}">{{ trans('common.reset') }}</a>
+                        <button class="btn btn-danger" type="button" onclick="resetSearchForm()">{{ trans('common.reset') }}</button>
                     </div>
                 </form>
                 <table class="text-md-center" data-toggle="table" data-mobile-responsive="true">

resources/views/admin/shop/index.blade.php

@@ -32,7 +32,7 @@
                     </div>
                     <div class="form-group col-lg-2 col-sm-4 btn-group">
                         <button class="btn btn-primary" type="submit">{{ trans('common.search') }}</button>
-                        <a class="btn btn-danger" href="{{ route('admin.goods.index') }}">{{ trans('common.reset') }}</a>
+                        <button class="btn btn-danger" type="button" onclick="resetSearchForm()">{{ trans('common.reset') }}</button>
                     </div>
                 </form>
                 <table class="text-md-center" data-toggle="table" data-mobile-responsive="true">

resources/views/admin/subscribe/index.blade.php

@@ -35,7 +35,7 @@
                     </div>
                     <div class="form-group col-lg-2 col-sm-6 btn-group">
                         <button class="btn btn-primary" type="submit">{{ trans('common.search') }}</button>
-                        <a class="btn btn-danger" href="{{ route('admin.subscribe.index') }}">{{ trans('common.reset') }}</a>
+                        <button class="btn btn-danger" type="button" onclick="resetSearchForm()">{{ trans('common.reset') }}</button>
                     </div>
                 </form>
                 <table class="text-md-center" data-toggle="table" data-mobile-responsive="true">

resources/views/admin/subscribe/log.blade.php

@@ -1,8 +1,7 @@
-@extends('admin.layouts')
-@section('css')
-    <link href="/assets/global/vendor/bootstrap-table/bootstrap-table.min.css" rel="stylesheet">
+@extends('admin.table_layouts')
+@push('css')
     <link href="/assets/global/vendor/bootstrap-datepicker/bootstrap-datepicker.min.css" rel="stylesheet">
-@endsection
+@endpush
 @section('content')
     <div class="page-content container-fluid">
         <div class="panel">
@@ -35,7 +34,7 @@
                     </div>
                     <div class="form-group col-xxl-1 col-lg-2 btn-group">
                         <button class="btn btn-primary" type="submit">{{ trans('common.search') }}</button>
-                        <a class="btn btn-danger" href="{{ route('admin.subscribe.log', $subscribe->user->id) }}">{{ trans('common.reset') }}</a>
+                        <button class="btn btn-danger" type="button" onclick="resetSearchForm()">{{ trans('common.reset') }}</button>
                     </div>
                 </form>
                 <div class="col-sm-12 col-xl-2">
@@ -128,9 +127,7 @@
         </div>
     </div>
 @endsection
-@section('javascript')
-    <script src="/assets/global/vendor/bootstrap-table/bootstrap-table.min.js"></script>
-    <script src="/assets/global/vendor/bootstrap-table/extensions/mobile/bootstrap-table-mobile.min.js"></script>
+@push('javascript')
     <script src="/assets/global/vendor/bootstrap-datepicker/bootstrap-datepicker.min.js"></script>
     <script src="/assets/global/js/Plugin/bootstrap-datepicker.js"></script>
     <script>
@@ -167,4 +164,4 @@
             }
         @endcan
     </script>
-@endsection
+@endpush

resources/views/admin/table_layouts.blade.php

@@ -10,6 +10,10 @@
     <script src="/assets/global/vendor/bootstrap-select/bootstrap-select.min.js"></script>
     <script src="/assets/global/js/Plugin/bootstrap-select.js"></script>
     <script>
+        function resetSearchForm() {
+            window.location.href = window.location.href.split('?')[0];
+        }
+
         $('form').on('submit', function() {
             $(this).find('input, select').each(function() {
                 if (!$(this).val()) {

resources/views/admin/ticket/index.blade.php

@@ -1,7 +1,4 @@
-@extends('admin.layouts')
-@section('css')
-    <link href="/assets/global/vendor/bootstrap-table/bootstrap-table.min.css" rel="stylesheet">
-@endsection
+@extends('admin.table_layouts')
 @section('content')
     <div class="page-content container-fluid">
         <div class="panel">
@@ -25,7 +22,7 @@
                     </div>
                     <div class="form-group col-lg-2 col-sm-6 btn-group">
                         <button class="btn btn-primary" type="submit">{{ trans('common.search') }}</button>
-                        <a class="btn btn-danger" href="{{ route('admin.ticket.index') }}">{{ trans('common.reset') }}</a>
+                        <button class="btn btn-danger" type="button" onclick="resetSearchForm()">{{ trans('common.reset') }}</button>
                     </div>
                 </form>
                 <table class="text-md-center" data-toggle="table" data-mobile-responsive="true">
@@ -130,9 +127,7 @@
         </div>
     @endcan
 @endsection
-@section('javascript')
-    <script src="/assets/global/vendor/bootstrap-table/bootstrap-table.min.js"></script>
-    <script src="/assets/global/vendor/bootstrap-table/extensions/mobile/bootstrap-table-mobile.min.js"></script>
+@push('javascript')
     <script>
         @can('admin.ticket.store')
             // 发起工单
@@ -223,4 +218,4 @@
             }
         @endcan
     </script>
-@endsection
+@endpush

resources/views/admin/tools/analysis.blade.php

@@ -1,7 +1,4 @@
-@extends('admin.layouts')
-@section('css')
-    <link href="/assets/global/vendor/bootstrap-table/bootstrap-table.min.css" rel="stylesheet">
-@endsection
+@extends('admin.table_layouts')
 @section('content')
     <div class="page-content container">
         <div class="panel">
@@ -39,9 +36,7 @@
     </div>
 
 @endsection
-@section('javascript')
-    <script src="/assets/global/vendor/bootstrap-table/bootstrap-table.min.js"></script>
-    <script src="/assets/global/vendor/bootstrap-table/extensions/mobile/bootstrap-table-mobile.min.js"></script>
+@push('javascript')
     <script>
         const TableDatatablesScroller = function() {
             const e = function() {
@@ -98,4 +93,4 @@
             TableDatatablesScroller.init();
         });
     </script>
-@endsection
+@endpush

resources/views/admin/user/export.blade.php

@@ -1,7 +1,4 @@
-@extends('admin.layouts')
-@section('css')
-    <link href="/assets/global/vendor/bootstrap-table/bootstrap-table.min.css" rel="stylesheet">
-@endsection
+@extends('admin.table_layouts')
 @section('content')
     <div class="page-content container-fluid">
         <div class="panel">
@@ -84,9 +81,7 @@
         </div>
     </div>
 @endsection
-@section('javascript')
-    <script src="/assets/global/vendor/bootstrap-table/bootstrap-table.min.js"></script>
-    <script src="/assets/global/vendor/bootstrap-table/extensions/mobile/bootstrap-table-mobile.min.js"></script>
+@push('javascript')
     <script src="/assets/custom/easy.qrcode.min.js" type="text/javascript"></script>
     @can('admin.user.exportProxy')
         <script>
@@ -155,4 +150,4 @@
             }
         </script>
     @endcan
-@endsection
+@endpush

resources/views/admin/user/group/index.blade.php

@@ -1,7 +1,4 @@
-@extends('admin.layouts')
-@section('css')
-    <link href="/assets/global/vendor/bootstrap-table/bootstrap-table.min.css" rel="stylesheet">
-@endsection
+@extends('admin.table_layouts')
 @section('content')
     <div class="page-content container-fluid">
         <div class="panel">
@@ -66,10 +63,7 @@
         </div>
     </div>
 @endsection
-@section('javascript')
-    <script src="/assets/global/vendor/bootstrap-table/bootstrap-table.min.js"></script>
-    <script src="/assets/global/vendor/bootstrap-table/extensions/mobile/bootstrap-table-mobile.min.js"></script>
-
+@push('javascript')
     @can('admin.user.group.edit')
         <script>
             // 删除用户分组
@@ -112,4 +106,4 @@
             }
         </script>
     @endcan
-@endsection
+@endpush

resources/views/admin/user/index.blade.php

@@ -85,7 +85,7 @@
                     </div>
                     <div class="form-group col-xxl-1 col-lg-3 col-md-3 col-4 btn-group">
                         <button class="btn btn-primary" type="submit">{{ trans('common.search') }}</button>
-                        <a class="btn btn-danger" href="{{ route('admin.user.index') }}">{{ trans('common.reset') }}</a>
+                        <button class="btn btn-danger" type="button" onclick="resetSearchForm()">{{ trans('common.reset') }}</button>
                     </div>
                 </form>
                 <table class="text-md-center" data-toggle="table" data-mobile-responsive="true">

resources/views/admin/user/oauth.blade.php

@@ -1,7 +1,4 @@
-@extends('admin.layouts')
-@section('css')
-    <link href="/assets/global/vendor/bootstrap-table/bootstrap-table.min.css" rel="stylesheet">
-@endsection
+@extends('admin.table_layouts')
 @section('content')
     <div class="page-content container-fluid">
         <div class="panel">
@@ -48,7 +45,3 @@
         </div>
     </div>
 @endsection
-@section('javascript')
-    <script src="/assets/global/vendor/bootstrap-table/bootstrap-table.min.js"></script>
-    <script src="/assets/global/vendor/bootstrap-table/extensions/mobile/bootstrap-table-mobile.min.js"></script>
-@endsection