From 152f8379b922c8bf80446c5c790d4d2924e421a6 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Tue, 16 Aug 2022 17:52:19 +0800
Subject: [PATCH] page

---
 .../beike/admin/views/pages/pages/form.blade.php     | 12 +++++++-----
 .../beike/admin/views/pages/plugins/form.blade.php   | 11 ++---------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/resources/beike/admin/views/pages/pages/form.blade.php b/resources/beike/admin/views/pages/pages/form.blade.php
index bd086d59..a643d480 100644
--- a/resources/beike/admin/views/pages/pages/form.blade.php
+++ b/resources/beike/admin/views/pages/pages/form.blade.php
@@ -7,7 +7,6 @@
 @endpush
 
 @section('content')
-    @dump($errors)
   <div id="plugins-app-form" class="card h-min-600">
     <div class="card-body">
       <form action="{{ $page->id ? admin_route('pages.update', [$page->id]) : admin_route('pages.store') }}" method="POST">
@@ -24,11 +23,11 @@
         <div class="tab-content">
           @foreach ($admin_languages as $language)
             <div class="tab-pane fade {{ $loop->first ? 'show active' : '' }}" id="tab-{{ $language['code'] }}">
-                @php
-                $message = $errors->first("descriptions.{$language['code']}.title");
-                @endphp
+              @php
+                $error_title = $errors->first("descriptions.{$language['code']}.title");
+              @endphp
               <x-admin-form-input
-                error="{{ $message }}"
+                error="{{ $error_title }}"
                 name="descriptions[{{ $language['code'] }}][title]"
                 title="信息标题"
                 value="{{ old('title', $descriptions[$language['code']]['title'] ?? '') }}"
@@ -40,6 +39,9 @@
                     {{ old('content', $descriptions[$language['code']]['content'] ?? '') }}
                   </textarea>
                 </div>
+                @if ($errors->has("descriptions.{$language['code']}.content"))
+                  <span class="invalid-feedback d-block" role="alert">{{ $errors->first("descriptions.{$language['code']}.content") }}</span>
+                @endif
               </x-admin::form.row>
               <input type="hidden" name="descriptions[{{ $language['code'] }}][locale]" value="{{ $language['code'] }}">
               <x-admin-form-input name="descriptions[{{ $language['code'] }}][meta_title]" title="Meta Tag 标题" value="{{ old('meta_title', $descriptions[$language['code']]['meta_title'] ?? '') }}" />
diff --git a/resources/beike/admin/views/pages/plugins/form.blade.php b/resources/beike/admin/views/pages/plugins/form.blade.php
index 9976ab56..64a43fc6 100644
--- a/resources/beike/admin/views/pages/plugins/form.blade.php
+++ b/resources/beike/admin/views/pages/plugins/form.blade.php
@@ -19,16 +19,9 @@
             <x-admin-form-input
               :name="$column['name']"
               :title="$column['label']"
-              {{-- :class="$errors->has($column['name']) ? 'is-invalid' : ''" --}}
+              :error="$errors->first($column['name'])"
               :required="$column['required'] ? true : false"
-              :value="old($column['name'], $column['value'] ?? '')">
-              @if (isset($column['description']))
-                <div class="help-text font-size-12 lh-base">{{ $column['description'] }}</div>
-              @endif
-{{--               @if ($errors->has($column['name']))
-                <span class="invalid-feedback" role="alert">{{ $errors->first($column['name']) }}</span>
-              @endif --}}
-            </x-admin-form-input>
+              :value="old($column['name'], $column['value'] ?? '')" />
           @endif
 
           @if ($column['type'] == 'select')