diff --git a/beike/Admin/Http/Controllers/CustomerGroupController.php b/beike/Admin/Http/Controllers/CustomerGroupController.php index 905ed443..f375311a 100644 --- a/beike/Admin/Http/Controllers/CustomerGroupController.php +++ b/beike/Admin/Http/Controllers/CustomerGroupController.php @@ -12,6 +12,7 @@ namespace Beike\Admin\Http\Controllers; use Beike\Admin\Http\Requests\CustomerGroupRequest; +use Beike\Admin\Http\Resources\CustomerGroupDetail; use Beike\Admin\Services\CustomerGroupService; use Beike\Repositories\CustomerGroupRepo; use Beike\Repositories\LanguageRepo; diff --git a/beike/Admin/Http/Resources/CustomerGroupDetail.php b/beike/Admin/Http/Resources/CustomerGroupDetail.php index 19ee894f..f6ddd2aa 100644 --- a/beike/Admin/Http/Resources/CustomerGroupDetail.php +++ b/beike/Admin/Http/Resources/CustomerGroupDetail.php @@ -23,6 +23,7 @@ class CustomerGroupDetail extends JsonResource 'discount_factor' => $this->discount_factor, 'level' => $this->level, 'name' => $this->description->name ?? '', + 'description' => $this->description->description ?? '', ]; return $data; diff --git a/resources/beike/admin/views/pages/customer_groups/index.blade.php b/resources/beike/admin/views/pages/customer_groups/index.blade.php index 700932a5..72205b16 100644 --- a/resources/beike/admin/views/pages/customer_groups/index.blade.php +++ b/resources/beike/admin/views/pages/customer_groups/index.blade.php @@ -25,8 +25,8 @@ @{{ group.id }} - @{{ group.description.name }} - @{{ group.description.description }} + @{{ group.description?.name || '' }} + @{{ group.description?.description || '' }} @{{ group.level }} @{{ group.total }} @{{ group.discount_factor }} diff --git a/resources/beike/admin/views/pages/customers/form.blade.php b/resources/beike/admin/views/pages/customers/form.blade.php index acde2d94..dd592b0b 100644 --- a/resources/beike/admin/views/pages/customers/form.blade.php +++ b/resources/beike/admin/views/pages/customers/form.blade.php @@ -20,7 +20,7 @@ - diff --git a/resources/beike/admin/views/pages/customers/index.blade.php b/resources/beike/admin/views/pages/customers/index.blade.php index cd6e8077..67a6343b 100644 --- a/resources/beike/admin/views/pages/customers/index.blade.php +++ b/resources/beike/admin/views/pages/customers/index.blade.php @@ -21,7 +21,7 @@ - + @{{ customer.id }} @{{ customer.email }} @@ -42,7 +42,7 @@ - {{ $customers->links('admin::vendor/pagination/bootstrap-4') }} + {{-- {{ $customers->links('admin::vendor/pagination/bootstrap-4') }} --}} -