From 41eafd3cdd7649152e8cefbc03ee4f2429f7e21d Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Tue, 2 Aug 2022 15:38:39 +0800
Subject: [PATCH] sku detaul

---
 .../goods/resources/views/grid/attr.blade.php |  2 +-
 .../Controllers/Admin/GoodsSkuController.php  | 25 ++++++++++---------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/packages/goods/resources/views/grid/attr.blade.php b/packages/goods/resources/views/grid/attr.blade.php
index e630876..643a91d 100644
--- a/packages/goods/resources/views/grid/attr.blade.php
+++ b/packages/goods/resources/views/grid/attr.blade.php
@@ -5,7 +5,7 @@
 @foreach($value as $item)
 <div class="mt-1">
     <span class="label bg-info">{{ $item['name'] }}</span>
-    <span>{{ $item['value'] }}</span>
+    <span>{{ $item['value'] }} {{ isset($item['price']) ? '(+'.$item['price'].')' : '' }}</span>
 </div>
 @endforeach
 @endif
diff --git a/packages/goods/src/Http/Controllers/Admin/GoodsSkuController.php b/packages/goods/src/Http/Controllers/Admin/GoodsSkuController.php
index 8584747..d61019d 100644
--- a/packages/goods/src/Http/Controllers/Admin/GoodsSkuController.php
+++ b/packages/goods/src/Http/Controllers/Admin/GoodsSkuController.php
@@ -59,24 +59,25 @@ class GoodsSkuController extends Controller
             ->body($grid);
     }
 
-    public function show($id, Content $content)
+    public function show($goods, $id, Content $content)
     {
-        $info = GoodsSku::with(['goods'])->findOrFail($id);
+        $goods = Goods::findOrFail($goods);
+        $info = GoodsSku::findOrFail($id);
         $show = Show::make($info, function (Show $show) {
             $show->field('sn');
             $show->field('name');
             $show->field('price');
             $show->field('stock');
-            // $show->field('spec')->view('peidikeji.dcat-admin-extension-goods::grid.attr');
-            $goods = $show->model()->goods;
-            foreach($goods->spec as $key => $item) {
-                $show->field('spec_' . $key, $item['name'])->as(function () use ($item) {
-                    $filtered = current(array_filter($this->spec, fn($subItem) => $subItem['name'] === $item['name']));
-                    $value = data_get($filtered, 'value');
-                    $price = data_get($filtered, 'price');
-                    return '<span class="label bg-info">'.$value.'</span>';
-                })->unescape();
-            }
+            $show->field('spec')->view('peidikeji.dcat-admin-extension-goods::grid.attr');
+            // $goods = $show->model()->goods;
+            // foreach($goods->spec as $key => $item) {
+            //     $show->field('spec_' . $key, $item['name'])->as(function () use ($item) {
+            //         $filtered = current(array_filter($this->spec, fn($subItem) => $subItem['name'] === $item['name']));
+            //         $value = data_get($filtered, 'value');
+            //         $price = data_get($filtered, 'price');
+            //         return '<span class="label bg-info">'.$value.'</span>';
+            //     })->unescape();
+            // }
         });
         return $content
             ->translation($this->translation)