From 70283cade3cc5a8e04ff2dc908d31405cd59bf4b Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Wed, 3 Aug 2022 18:16:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Models/Product.php                                   | 2 +-
 .../beike/admin/views/pages/products/form/form.blade.php   | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/beike/Models/Product.php b/beike/Models/Product.php
index bb4402d0..37fe4eaa 100644
--- a/beike/Models/Product.php
+++ b/beike/Models/Product.php
@@ -10,7 +10,7 @@ class Product extends Base
     use HasFactory;
     use SoftDeletes;
 
-    protected $fillable = ['images', 'video', 'position', 'active', 'variables'];
+    protected $fillable = ['images', 'video', 'position', 'brand_id', 'tax_class_id', 'active', 'variables'];
     protected $casts = [
         'active' => 'boolean',
         'variables' => 'array',
diff --git a/resources/beike/admin/views/pages/products/form/form.blade.php b/resources/beike/admin/views/pages/products/form/form.blade.php
index d5b542ce..0c806cea 100644
--- a/resources/beike/admin/views/pages/products/form/form.blade.php
+++ b/resources/beike/admin/views/pages/products/form/form.blade.php
@@ -47,6 +47,8 @@
             </x-admin::form.row>
             <x-admin-form-input name="video" title="视频" :value="old('video', $product->video ?? '')" />
             <x-admin-form-input name="position" title="排序" :value="old('position', $product->position ?? '')" />
+            <x-admin-form-input name="brand_id" title="品牌" value="0" />
+            <x-admin-form-input name="tax_class_id" title="税类" value="0" />
             <x-admin-form-switch name="active" title="状态" :value="old('active', $product->active ?? 1)" />
 
             <x-admin::form.row title="分类">
@@ -209,11 +211,12 @@
                   </li>
                 @endforeach
               </ul>
+
               <div class="tab-content">
                 @foreach ($languages as $language)
                   <div class="tab-pane fade {{ $loop->first ? 'show active' : '' }}" id="tab-descriptions-{{ $language->code }}">
-                    <textarea name="descriptions[{{ $language->code }}]" class="form-control tinymce">
-                      {{ old('descriptions', $product->descriptions[$language->code] ?? '') }}
+                    <textarea name="descriptions[{{ $language->code }}][content]" class="form-control tinymce">
+                      {{ old('content', $product->descriptions->keyBy('locale')[$language->code]->content ?? '') }}
                     </textarea>
                   </div>
                 @endforeach