From c76a81cdda214cbc5e2a9f018840b3aeea8fea80 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Thu, 11 Aug 2022 19:57:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=A2=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=AE=A2=E6=88=B7=E7=BB=84=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Admin/Http/Controllers/CustomerGroupController.php    | 1 +
 beike/Admin/Http/Resources/CustomerGroupDetail.php          | 1 +
 .../beike/admin/views/pages/customer_groups/index.blade.php | 4 ++--
 resources/beike/admin/views/pages/customers/form.blade.php  | 2 +-
 resources/beike/admin/views/pages/customers/index.blade.php | 6 +++---
 5 files changed, 8 insertions(+), 6 deletions(-)

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 @@
         <tbody>
           <tr v-for="group, index in customer_groups" :key="index">
             <td>@{{ group.id }}</td>
-            <td>@{{ group.description.name }}</td>
-            <td>@{{ group.description.description }}</td>
+            <td>@{{ group.description?.name || '' }}</td>
+            <td>@{{ group.description?.description || '' }}</td>
             <td>@{{ group.level }}</td>
             <td>@{{ group.total }}</td>
             <td>@{{ group.discount_factor }}</td>
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 @@
               </el-form-item>
               <el-form-item label="用户组">
                 <el-select v-model="form.customer_group_id" placeholder="请选择">
-                  <el-option v-for="item in source.customer_group" :key="item.id" :label="item.description.name"
+                  <el-option v-for="item in source.customer_group" :key="item.id" :label="item.name"
                     :value="item.id">
                   </el-option>
                 </el-select>
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 @@
           </tr>
         </thead>
         <tbody>
-          <tr v-for="customer, index in customers" :key="index">
+          <tr v-for="customer, index in customers.data" :key="index">
             <td>@{{ customer.id }}</td>
             <td>@{{ customer.email }}</td>
             <td>
@@ -42,7 +42,7 @@
         </tbody>
       </table>
 
-      {{ $customers->links('admin::vendor/pagination/bootstrap-4') }}
+      {{-- {{ $customers->links('admin::vendor/pagination/bootstrap-4') }} --}}
     </div>
 
     <el-dialog title="创建顾客" :visible.sync="dialogCustomers.show" width="600px"
@@ -59,7 +59,7 @@
         </el-form-item>
         <el-form-item label="用户组">
           <el-select v-model="dialogCustomers.form.customer_group_id" placeholder="请选择">
-            <el-option v-for="item in source.customer_group" :key="item.id" :label="item.description.name"
+            <el-option v-for="item in source.customer_group" :key="item.id" :label="item.name"
               :value="item.id">
             </el-option>
           </el-select>