From bb7a6aad0da85cbc6c9b2640ea2a0b0543fb37b3 Mon Sep 17 00:00:00 2001
From: pushuo <pushuo@guangda.work>
Date: Thu, 20 Jul 2023 06:22:35 +0000
Subject: [PATCH] !161 Fix page summary input error prompt * Fix installation
 error and no information display problem * Fix page summary input error
 prompt

---
 .../Views/environment-wizard.blade.php        | 34 +++++++++----------
 .../admin/views/pages/pages/form.blade.php    |  5 ++-
 resources/lang/zh_cn/validation.php           |  2 ++
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/beike/Installer/Views/environment-wizard.blade.php b/beike/Installer/Views/environment-wizard.blade.php
index 12f77629..e68b61d7 100644
--- a/beike/Installer/Views/environment-wizard.blade.php
+++ b/beike/Installer/Views/environment-wizard.blade.php
@@ -230,29 +230,27 @@
           $('.database-loading').addClass('d-none');
         },
         success: function(json) {
-          if (json.status == 'fail') {
-            var data = Object.keys(json.data);
+          $('.database-link-wrap input').addClass('is-valid')
+          $('.title-status .text-success').removeClass('d-none')
+          $('.admin-data-wrap').removeClass('d-none')
+        },
+        error: function(json) {
+          json = json.responseJSON;
+          var data = Object.keys(json.data);
 
-            data.forEach((e)=> {
-              $('.database-link-wrap input[name="' + e + '"]').addClass('is-invalid').next('.invalid-feedback').text(json.data[e])
-            })
+          data.forEach((e)=> {
+            $('.database-link-wrap input[name="' + e + '"]').addClass('is-invalid').next('.invalid-feedback').text(json.data[e])
+          })
 
-            if (json.data.database_version) {
-              $('.title-status .text-danger').removeClass('d-none').find('span').text(json.data.database_version);
-            }
-
-            if (json.data.database_other) {
-              $('.title-status .text-danger').removeClass('d-none').find('span').text(json.data.database_other);
-            }
-
-            $('.admin-data-wrap').addClass('d-none')
+          if (json.data.database_version) {
+            $('.title-status .text-danger').removeClass('d-none').find('span').text(json.data.database_version);
           }
 
-          if (json.status == 'success') {
-            $('.database-link-wrap input').addClass('is-valid')
-            $('.title-status .text-success').removeClass('d-none')
-            $('.admin-data-wrap').removeClass('d-none')
+          if (json.data.database_other) {
+            $('.title-status .text-danger').removeClass('d-none').find('span').text(json.data.database_other);
           }
+
+          $('.admin-data-wrap').addClass('d-none')
         }
       });
     }
diff --git a/resources/beike/admin/views/pages/pages/form.blade.php b/resources/beike/admin/views/pages/pages/form.blade.php
index d8a226a3..94e90771 100644
--- a/resources/beike/admin/views/pages/pages/form.blade.php
+++ b/resources/beike/admin/views/pages/pages/form.blade.php
@@ -54,8 +54,11 @@
 
                   <x-admin::form.row title="{{ __('page_category.text_summary') }}">
                     <div class="input-group w-max-400">
-                      <textarea rows="3" type="text" name="descriptions[{{ $language['code'] }}][summary]" class="form-control wp-400" placeholder="{{ __('page_category.text_summary') }}">{{ old('descriptions.' . $language['code'] . '.summary', $descriptions[$language['code']]['summary'] ?? '') }}</textarea>
+                      <textarea rows="3" type="text" name="descriptions[{{ $language['code'] }}][summary]" class="form-control wp-400 {{ $errors->has("descriptions.{$language['code']}.summary") ? 'is-invalid' : '' }}" placeholder="{{ __('page_category.text_summary') }}">{{ old('descriptions.' . $language['code'] . '.summary', $descriptions[$language['code']]['summary'] ?? '') }}</textarea>
                     </div>
+                    @if ($errors->has("descriptions.{$language['code']}.summary"))
+                      <span class="invalid-feedback d-block" role="alert">{{ $errors->first("descriptions.{$language['code']}.summary") }}</span>
+                    @endif
                   </x-admin::form.row>
 
                   <x-admin::form.row title="{{ __('admin/page.info_content') }}">
diff --git a/resources/lang/zh_cn/validation.php b/resources/lang/zh_cn/validation.php
index d9bd7379..206da3dc 100644
--- a/resources/lang/zh_cn/validation.php
+++ b/resources/lang/zh_cn/validation.php
@@ -158,6 +158,8 @@ return [
     'attributes'           => [
         'descriptions.en.title'    => '英文标题',
         'descriptions.zh_cn.title' => '中文标题',
+        'descriptions.en.summary' => '英文副标题',
+        'descriptions.zh_cn.summary' => '中文副标题',
 
         'tax_rate'                 => [
             'name' => '税种名称',