From 7bf19e2c9207f8ac8ff7d0298e3bea2b3522a3aa Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@guangda.work>
Date: Mon, 13 Mar 2023 15:41:46 +0800
Subject: [PATCH] Fixed price in product list.

---
 beike/Admin/Http/Controllers/ProductController.php         | 6 ++++--
 resources/beike/admin/views/pages/products/index.blade.php | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/beike/Admin/Http/Controllers/ProductController.php b/beike/Admin/Http/Controllers/ProductController.php
index c703f8a9..cad4155e 100644
--- a/beike/Admin/Http/Controllers/ProductController.php
+++ b/beike/Admin/Http/Controllers/ProductController.php
@@ -21,10 +21,12 @@ class ProductController extends Controller
     {
         $requestData = $request->all();
         $productList = ProductRepo::list($requestData);
-        $products    = ProductResource::collection($productList)->resource;
+        $products    = ProductResource::collection($productList);
+        $productsFormat =  $products->jsonSerialize();
 
         $data = [
             'categories' => CategoryRepo::flatten(locale()),
+            'products_format' => $productsFormat,
             'products'   => $products,
             'type'       => 'products',
         ];
@@ -32,7 +34,7 @@ class ProductController extends Controller
         $data = hook_filter('admin.product.index.data', $data);
 
         if ($request->expectsJson()) {
-            return $products;
+            return $productsFormat;
         }
 
         return view('admin::pages.products.index', $data);
diff --git a/resources/beike/admin/views/pages/products/index.blade.php b/resources/beike/admin/views/pages/products/index.blade.php
index 79c0e034..a5b732c7 100644
--- a/resources/beike/admin/views/pages/products/index.blade.php
+++ b/resources/beike/admin/views/pages/products/index.blade.php
@@ -118,7 +118,7 @@
                 </tr>
               </thead>
               <tbody>
-                @foreach ($products as $product)
+                @foreach ($products_format as $product)
                 <tr>
                   <td><input type="checkbox" :value="{{ $product['id'] }}" v-model="selectedIds" /></td>
                   <td>{{ $product['id'] }}</td>
@@ -141,7 +141,7 @@
                   @hook('admin.product.list.column_value')
                   <td width="140" class="text-end">
                     @if ($product['deleted_at'] == '')
-                      <a href="{{ admin_route('products.edit', [$product->id]) }}" class="btn btn-outline-secondary btn-sm">{{ __('common.edit') }}</a>
+                      <a href="{{ admin_route('products.edit', [$product['id']]) }}" class="btn btn-outline-secondary btn-sm">{{ __('common.edit') }}</a>
                       <a href="javascript:void(0)" class="btn btn-outline-danger btn-sm" @click.prevent="deleteProduct({{ $loop->index }})">{{ __('common.delete') }}</a>
                       @hook('admin.product.list.action')
                     @else