From 03b9d18071a7e236715e9bd275156132ab41a91f Mon Sep 17 00:00:00 2001 From: pushuo <229102104@qq.com> Date: Thu, 11 Aug 2022 11:10:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Http/Controllers/PluginController.php | 5 +- .../Admin/Providers/AdminServiceProvider.php | 2 + beike/Admin/View/Components/Alert.php | 22 +++ public/build/beike/admin/css/bootstrap.css | 130 +++++++++--------- .../beike/admin/css/bootstrap/bootstrap.scss | 3 + .../admin/views/components/alert.blade.php | 5 + .../admin/views/pages/plugins/form.blade.php | 3 + 7 files changed, 103 insertions(+), 67 deletions(-) create mode 100644 beike/Admin/View/Components/Alert.php create mode 100644 resources/beike/admin/views/components/alert.blade.php diff --git a/beike/Admin/Http/Controllers/PluginController.php b/beike/Admin/Http/Controllers/PluginController.php index 100a54c1..b06fcdf2 100644 --- a/beike/Admin/Http/Controllers/PluginController.php +++ b/beike/Admin/Http/Controllers/PluginController.php @@ -90,12 +90,13 @@ class PluginController extends Controller * @return array * @throws Exception */ - public function update(Request $request, $code): array + public function update(Request $request, $code) { app('plugin')->getPluginOrFail($code); $fields = $request->all(); SettingRepo::update('plugin', $code, $fields); - return json_success("编辑成功"); + return redirect($this->getRedirect())->with('success', '修改成功'); + // return json_success("编辑成功"); } diff --git a/beike/Admin/Providers/AdminServiceProvider.php b/beike/Admin/Providers/AdminServiceProvider.php index 3c1f0eba..53155a48 100644 --- a/beike/Admin/Providers/AdminServiceProvider.php +++ b/beike/Admin/Providers/AdminServiceProvider.php @@ -10,6 +10,7 @@ use Illuminate\Support\ServiceProvider; use Beike\Admin\View\Components\Filter; use Beike\Admin\View\Components\Header; use Beike\Admin\View\Components\Sidebar; +use Beike\Admin\View\Components\Alert; use Beike\Admin\View\Components\Form\Image; use Beike\Admin\View\Components\Form\Input; use Beike\Admin\View\Components\Form\Select; @@ -45,6 +46,7 @@ class AdminServiceProvider extends ServiceProvider 'header' => Header::class, 'sidebar' => Sidebar::class, 'filter' => Filter::class, + 'alert' => Alert::class, 'form-input-locale' => InputLocale::class, 'form-switch' => SwitchRadio::class, 'form-input' => Input::class, diff --git a/beike/Admin/View/Components/Alert.php b/beike/Admin/View/Components/Alert.php new file mode 100644 index 00000000..4564d292 --- /dev/null +++ b/beike/Admin/View/Components/Alert.php @@ -0,0 +1,22 @@ +type = $type; + $this->msg = $msg; + } + + public function render() + { + return view('admin::components.alert'); + } +} diff --git a/public/build/beike/admin/css/bootstrap.css b/public/build/beike/admin/css/bootstrap.css index 031fb88d..3dade7df 100644 --- a/public/build/beike/admin/css/bootstrap.css +++ b/public/build/beike/admin/css/bootstrap.css @@ -6781,7 +6781,7 @@ --bs-gray-900: #212529; --bs-primary: #fd560f; --bs-secondary: #6c757d; - --bs-success: #198754; + --bs-success: #71c20b; --bs-info: #1a8eff; --bs-warning: #ffc107; --bs-danger: #dc3545; @@ -6789,7 +6789,7 @@ --bs-dark: #212529; --bs-primary-rgb: 253, 86, 15; --bs-secondary-rgb: 108, 117, 125; - --bs-success-rgb: 25, 135, 84; + --bs-success-rgb: 113, 194, 11; --bs-info-rgb: 26, 142, 255; --bs-warning-rgb: 255, 193, 7; --bs-danger-rgb: 220, 53, 69; @@ -8570,15 +8570,15 @@ progress { } .table-success { - --bs-table-bg: #d1e7dd; - --bs-table-striped-bg: #c7dbd2; + --bs-table-bg: #e3f3ce; + --bs-table-striped-bg: #d8e7c4; --bs-table-striped-color: #000; - --bs-table-active-bg: #bcd0c7; + --bs-table-active-bg: #ccdbb9; --bs-table-active-color: #000; - --bs-table-hover-bg: #c1d6cc; + --bs-table-hover-bg: #d2e1bf; --bs-table-hover-color: #000; color: #000; - border-color: #bcd0c7; + border-color: #ccdbb9; } .table-info { @@ -9324,7 +9324,7 @@ textarea.form-control-lg { width: 100%; margin-top: 0.25rem; font-size: 0.875em; - color: #198754; + color: #71c20b; } .valid-tooltip { @@ -9336,8 +9336,8 @@ textarea.form-control-lg { padding: 0.25rem 0.5rem; margin-top: 0.1rem; font-size: 0.7175rem; - color: #fff; - background-color: rgba(25, 135, 84, 0.9); + color: #000; + background-color: rgba(113, 194, 11, 0.9); border-radius: 0; } @@ -9349,16 +9349,16 @@ textarea.form-control-lg { } .was-validated .form-control:valid, .form-control.is-valid { - border-color: #198754; + border-color: #71c20b; padding-right: calc(1.5em + 0.75rem); - background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%23198754' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e"); + background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%2371c20b' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e"); background-repeat: no-repeat; background-position: right calc(0.375em + 0.1875rem) center; background-size: calc(0.75em + 0.375rem) calc(0.75em + 0.375rem); } .was-validated .form-control:valid:focus, .form-control.is-valid:focus { - border-color: #198754; - box-shadow: 0 0 0 0.25rem rgba(25, 135, 84, 0.25); + border-color: #71c20b; + box-shadow: 0 0 0 0.25rem rgba(113, 194, 11, 0.25); } .was-validated textarea.form-control:valid, textarea.form-control.is-valid { @@ -9367,30 +9367,30 @@ textarea.form-control-lg { } .was-validated .form-select:valid, .form-select.is-valid { - border-color: #198754; + border-color: #71c20b; } .was-validated .form-select:valid:not([multiple]):not([size]), .was-validated .form-select:valid:not([multiple])[size="1"], .form-select.is-valid:not([multiple]):not([size]), .form-select.is-valid:not([multiple])[size="1"] { padding-right: 4.125rem; - background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23343a40' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M2 5l6 6 6-6'/%3e%3c/svg%3e"), url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%23198754' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e"); + background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23343a40' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M2 5l6 6 6-6'/%3e%3c/svg%3e"), url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%2371c20b' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e"); background-position: right 0.75rem center, center right 2.25rem; background-size: 16px 12px, calc(0.75em + 0.375rem) calc(0.75em + 0.375rem); } .was-validated .form-select:valid:focus, .form-select.is-valid:focus { - border-color: #198754; - box-shadow: 0 0 0 0.25rem rgba(25, 135, 84, 0.25); + border-color: #71c20b; + box-shadow: 0 0 0 0.25rem rgba(113, 194, 11, 0.25); } .was-validated .form-check-input:valid, .form-check-input.is-valid { - border-color: #198754; + border-color: #71c20b; } .was-validated .form-check-input:valid:checked, .form-check-input.is-valid:checked { - background-color: #198754; + background-color: #71c20b; } .was-validated .form-check-input:valid:focus, .form-check-input.is-valid:focus { - box-shadow: 0 0 0 0.25rem rgba(25, 135, 84, 0.25); + box-shadow: 0 0 0 0.25rem rgba(113, 194, 11, 0.25); } .was-validated .form-check-input:valid ~ .form-check-label, .form-check-input.is-valid ~ .form-check-label { - color: #198754; + color: #71c20b; } .form-check-inline .form-check-input ~ .valid-feedback { @@ -9593,33 +9593,33 @@ textarea.form-control-lg { } .btn-success { - color: #fff; - background-color: #198754; - border-color: #198754; + color: #000; + background-color: #71c20b; + border-color: #71c20b; } .btn-success:hover { - color: #fff; - background-color: #157347; - border-color: #146c43; + color: #000; + background-color: #86cb30; + border-color: #7fc823; } .btn-check:focus + .btn-success, .btn-success:focus { - color: #fff; - background-color: #157347; - border-color: #146c43; - box-shadow: 0 0 0 0 rgba(60, 153, 110, 0.5); + color: #000; + background-color: #86cb30; + border-color: #7fc823; + box-shadow: 0 0 0 0 rgba(96, 165, 9, 0.5); } .btn-check:checked + .btn-success, .btn-check:active + .btn-success, .btn-success:active, .btn-success.active, .show > .btn-success.dropdown-toggle { - color: #fff; - background-color: #146c43; - border-color: #13653f; + color: #000; + background-color: #8dce3c; + border-color: #7fc823; } .btn-check:checked + .btn-success:focus, .btn-check:active + .btn-success:focus, .btn-success:active:focus, .btn-success.active:focus, .show > .btn-success.dropdown-toggle:focus { - box-shadow: 0 0 0 0 rgba(60, 153, 110, 0.5); + box-shadow: 0 0 0 0 rgba(96, 165, 9, 0.5); } .btn-success:disabled, .btn-success.disabled { - color: #fff; - background-color: #198754; - border-color: #198754; + color: #000; + background-color: #71c20b; + border-color: #71c20b; } .btn-info { @@ -9823,27 +9823,27 @@ textarea.form-control-lg { } .btn-outline-success { - color: #198754; - border-color: #198754; + color: #71c20b; + border-color: #71c20b; } .btn-outline-success:hover { - color: #fff; - background-color: #198754; - border-color: #198754; + color: #000; + background-color: #71c20b; + border-color: #71c20b; } .btn-check:focus + .btn-outline-success, .btn-outline-success:focus { - box-shadow: 0 0 0 0 rgba(25, 135, 84, 0.5); + box-shadow: 0 0 0 0 rgba(113, 194, 11, 0.5); } .btn-check:checked + .btn-outline-success, .btn-check:active + .btn-outline-success, .btn-outline-success:active, .btn-outline-success.active, .btn-outline-success.dropdown-toggle.show { - color: #fff; - background-color: #198754; - border-color: #198754; + color: #000; + background-color: #71c20b; + border-color: #71c20b; } .btn-check:checked + .btn-outline-success:focus, .btn-check:active + .btn-outline-success:focus, .btn-outline-success:active:focus, .btn-outline-success.active:focus, .btn-outline-success.dropdown-toggle.show:focus { - box-shadow: 0 0 0 0 rgba(25, 135, 84, 0.5); + box-shadow: 0 0 0 0 rgba(113, 194, 11, 0.5); } .btn-outline-success:disabled, .btn-outline-success.disabled { - color: #198754; + color: #71c20b; background-color: transparent; } @@ -11405,7 +11405,7 @@ textarea.form-control-lg { .alert { position: relative; - padding: 1rem 1rem; + padding: 0.5rem 1rem; margin-bottom: 1rem; border: 1px solid transparent; border-radius: 0; @@ -11427,7 +11427,7 @@ textarea.form-control-lg { top: 0; right: 0; z-index: 2; - padding: 1.25rem 1rem; + padding: 0.625rem 1rem; } .alert-primary { @@ -11449,12 +11449,12 @@ textarea.form-control-lg { } .alert-success { - color: #0f5132; - background-color: #d1e7dd; - border-color: #badbcc; + color: #447407; + background-color: #e3f3ce; + border-color: #d4edb6; } .alert-success .alert-link { - color: #0c4128; + color: #365d06; } .alert-info { @@ -11805,17 +11805,17 @@ textarea.form-control-lg { } .list-group-item-success { - color: #0f5132; - background-color: #d1e7dd; + color: #447407; + background-color: #e3f3ce; } .list-group-item-success.list-group-item-action:hover, .list-group-item-success.list-group-item-action:focus { - color: #0f5132; - background-color: #bcd0c7; + color: #447407; + background-color: #ccdbb9; } .list-group-item-success.list-group-item-action.active { color: #fff; - background-color: #0f5132; - border-color: #0f5132; + background-color: #447407; + border-color: #447407; } .list-group-item-info { @@ -12941,10 +12941,10 @@ textarea.form-control-lg { } .link-success { - color: #198754; + color: #71c20b; } .link-success:hover, .link-success:focus { - color: #146c43; + color: #8dce3c; } .link-info { @@ -13388,7 +13388,7 @@ textarea.form-control-lg { } .border-success { - border-color: #198754 !important; + border-color: #71c20b !important; } .border-info { diff --git a/resources/beike/admin/css/bootstrap/bootstrap.scss b/resources/beike/admin/css/bootstrap/bootstrap.scss index 882c9432..891dd83f 100644 --- a/resources/beike/admin/css/bootstrap/bootstrap.scss +++ b/resources/beike/admin/css/bootstrap/bootstrap.scss @@ -9,6 +9,7 @@ // $primary: #fd560f; +$success: #71c20b; $info: #1a8eff; $body-bg: #f9fbfd; @@ -34,6 +35,8 @@ $input-border-color: #e2e2e2; $badge-border-radius: 2px; $text-muted: #95aac9; +$alert-padding-y: 0.5rem; + @import './bootstrap-icons'; @import 'node_modules/bootstrap-5.1.3/scss/bootstrap'; // @import 'node_modules/bootstrap/scss/bootstrap'; diff --git a/resources/beike/admin/views/components/alert.blade.php b/resources/beike/admin/views/components/alert.blade.php new file mode 100644 index 00000000..9ab92d72 --- /dev/null +++ b/resources/beike/admin/views/components/alert.blade.php @@ -0,0 +1,5 @@ +
+ + {{ $msg }} + +
\ No newline at end of file diff --git a/resources/beike/admin/views/pages/plugins/form.blade.php b/resources/beike/admin/views/pages/plugins/form.blade.php index 4d06ef82..fca54b47 100644 --- a/resources/beike/admin/views/pages/plugins/form.blade.php +++ b/resources/beike/admin/views/pages/plugins/form.blade.php @@ -5,6 +5,9 @@ @section('content')
+ @if (session('success')) + + @endif
@csrf {{ method_field('put') }}