From 568b551aaeaaffdfe8fa8430021f717c5bd60121 Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Wed, 21 Sep 2022 14:40:46 +0800
Subject: [PATCH] goods-sku

---
 src/Form/Spec.php                     | 8 --------
 src/Http/Admin/GoodsSkuController.php | 6 +++++-
 src/Models/GoodsSku.php               | 2 +-
 views/form/spec.blade.php             | 6 ++++--
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/Form/Spec.php b/src/Form/Spec.php
index 6206f3c..21e7c09 100644
--- a/src/Form/Spec.php
+++ b/src/Form/Spec.php
@@ -28,12 +28,4 @@ class Spec extends Field
 
         return $this;
     }
-
-    protected function formatFieldData($data)
-    {
-        // 获取到当前字段值
-        $value = parent::formatFieldData($data);
-
-        return $value ?: [];
-    }
 }
diff --git a/src/Http/Admin/GoodsSkuController.php b/src/Http/Admin/GoodsSkuController.php
index 71187b0..524b87a 100644
--- a/src/Http/Admin/GoodsSkuController.php
+++ b/src/Http/Admin/GoodsSkuController.php
@@ -56,7 +56,6 @@ class GoodsSkuController extends Controller
                     });
                 }
             }
-            // $grid->column('spec')->view('dcat-admin-goods::grid.attr');
 
             $user = Admin::user();
             $grid->showCreateButton($user->can('dcat.admin.goods_sku.create'));
@@ -84,6 +83,8 @@ class GoodsSkuController extends Controller
             $show->field('price');
             $show->field('stock');
             $show->field('spec')->view('dcat-admin-goods::goods.grid-spec');
+            $show->disableDeleteButton();
+            $show->disableEditButton();
         });
 
         return $content
@@ -141,6 +142,9 @@ class GoodsSkuController extends Controller
             $form->disableEditingCheck();
             $form->disableViewCheck();
             $form->disableResetButton();
+            $form->disableViewButton();
+            $form->disableListButton();
+            $form->disableDeleteButton();
         });
     }
 
diff --git a/src/Models/GoodsSku.php b/src/Models/GoodsSku.php
index 693e56d..1b805c6 100644
--- a/src/Models/GoodsSku.php
+++ b/src/Models/GoodsSku.php
@@ -9,7 +9,7 @@ class GoodsSku extends Model
 {
     protected $table = 'goods_sku';
 
-    protected $fillable = ['sn', 'goods_id', 'name', 'price', 'vip_price', 'stock', 'spec', 'weight', 'volume', 'shipping_tmp_id'];
+    protected $fillable = ['sn', 'goods_id', 'name', 'price', 'vip_price', 'stock', 'spec', 'weight', 'volume', 'shipping_tmp_id', 'score_'];
 
     protected $casts = [
         'spec' => 'array',
diff --git a/views/form/spec.blade.php b/views/form/spec.blade.php
index c140fff..c7d7753 100644
--- a/views/form/spec.blade.php
+++ b/views/form/spec.blade.php
@@ -16,7 +16,8 @@
             </tr>
         </thead>
         <tbody>
-            @foreach($value?:[] as $item)
+            @if($value)
+            @foreach($value as $item)
             <tr data-id="{{ $item['name'] }}">
                 <td rowspan="{{count($item['values']) + 2}}" class="editable">{{ $item['name'] }}</td>
             </tr>
@@ -45,6 +46,7 @@
                 </td>
             </tr>
             @endforeach
+            @endif
             <tr>
                 <td colspan="{{ count($headers) }}">
                     <input type="text" class="form-control add-attr-input" placeholder="添加 {{ $headers[0] }}">
@@ -79,7 +81,7 @@
     element.on('click', '.add-attr-button', function () {
         var value = $('.add-attr-input').val()
         if (!value) {
-            return Dcat.swal.warning(`请填写 ${headers.name}`)
+            return Dcat.swal.warning(`请填写 ${headers[0]}`)
         }
 
         addGroup(value)