From 9d8c40a81bbcef5640784993422bdafa4a6dda47 Mon Sep 17 00:00:00 2001
From: TL <mengwb@opencart.cn>
Date: Tue, 23 Aug 2022 10:03:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=AE=A2=E6=88=B7=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Admin/Http/Controllers/SettingController.php  | 4 ++++
 resources/beike/admin/views/pages/setting.blade.php | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/beike/Admin/Http/Controllers/SettingController.php b/beike/Admin/Http/Controllers/SettingController.php
index 50874411..a54c16f2 100644
--- a/beike/Admin/Http/Controllers/SettingController.php
+++ b/beike/Admin/Http/Controllers/SettingController.php
@@ -11,6 +11,9 @@
 
 namespace Beike\Admin\Http\Controllers;
 
+use Beike\Admin\Http\Resources\CustomerGroupDetail;
+use Beike\Models\CustomerGroup;
+use Beike\Repositories\CustomerGroupRepo;
 use Beike\Repositories\SettingRepo;
 use Beike\Repositories\CountryRepo;
 use Beike\Repositories\CurrencyRepo;
@@ -40,6 +43,7 @@ class SettingController extends Controller
             'countries' => CountryRepo::all(),
             'currencies' => CurrencyRepo::listEnabled(),
             'tax_address' => $tax_address,
+            'customer_groups' => CustomerGroupDetail::collection(CustomerGroupRepo::list())->jsonSerialize(),
             'themes' => $themes
         ];
 
diff --git a/resources/beike/admin/views/pages/setting.blade.php b/resources/beike/admin/views/pages/setting.blade.php
index bcd309a1..d36e9559 100644
--- a/resources/beike/admin/views/pages/setting.blade.php
+++ b/resources/beike/admin/views/pages/setting.blade.php
@@ -61,6 +61,10 @@
               <div class="help-text font-size-12 lh-base">默认货币设置</div>
             </x-admin-form-select>
 
+              <x-admin-form-select title="默认客户组" name="default_customer_group_id" :value="old('locale', system_setting('base.default_customer_group_id', ''))" :options="$customer_groups" key="id" label="name">
+                  <div class="help-text font-size-12 lh-base">默认客户组</div>
+              </x-admin-form-select>
+
             <x-admin-form-input name="admin_name" title="后台目录" required value="{{ old('admin_name', system_setting('base.admin_name', 'admin')) }}">
               <div class="help-text font-size-12 lh-base">管理后台目录,默认为admin</div>
             </x-admin-form-input>