update system setting.

beike/Admin/Http/Controllers/CustomerController.php

@@ -52,7 +52,7 @@ class CustomerController extends Controller
             'customer_groups' => CustomerGroupRepo::list(),
             'addresses' => AddressResource::collection($addresses),
             'countries' => CountryRepo::all(),
-            'country_id' => setting('base.country_id'),
+            'country_id' => system_setting('base.country_id'),
             '_redirect' => $this->getRedirect(),
         ];
 

beike/Admin/Http/Controllers/DesignController.php

@@ -12,7 +12,7 @@ class DesignController extends Controller
     {
         $data = [
             'editors' => ['editor-slide_show'],
-            'design_settings' => setting('base.design_setting'),
+            'design_settings' => system_setting('base.design_setting'),
         ];
         return view('admin::pages.design.builder.index', $data);
     }

beike/Admin/Services/CustomerService.php

@@ -20,7 +20,7 @@ class CustomerService
 {
     public static function create($data)
     {
-        $data['locale'] = setting('base.locale');
+        $data['locale'] = system_setting('base.locale');
         $data['from'] = 'admin';
         $customer = CustomerRepo::create($data);
         return $customer;

beike/Helpers.php

@@ -22,27 +22,25 @@ function setting($key, $default = null)
 /**
  * 获取系统 settings
  *
- * @param $group
  * @param $key
  * @param null $default
  * @return mixed
  */
-function system_setting($group, $key, $default = null)
+function system_setting($key, $default = null)
 {
-    return config("bk.{$group}.{$key}", $default);
+    return setting("system.{$key}", $default);
 }
 
 /**
  * 获取后台设置到 settings 表的值
  *
- * @param $plugin
  * @param $key
  * @param null $default
  * @return mixed
  */
-function plugin_setting($plugin, $key, $default = null)
+function plugin_setting($key, $default = null)
 {
-    return config("bk.{$plugin}.{$key}", $default);
+    return setting("plugin.{$key}", $default);
 }
 
 /**
@@ -52,7 +50,7 @@ function admin_name(): string
 {
     if ($envAdminName = env('ADMIN_NAME')) {
         return Str::snake($envAdminName);
-    } elseif ($settingAdminName = setting('base.admin_name')) {
+    } elseif ($settingAdminName = system_setting('base.admin_name')) {
         return Str::snake($settingAdminName);
     }
     return 'admin';

beike/Shop/Http/Controllers/HomeController.php

@@ -13,7 +13,7 @@ class HomeController extends Controller
         ];
 
         $html = '';
-        $designSettings = setting('base.design_setting');
+        $designSettings = system_setting('base.design_setting');
         $modules = $designSettings['form']['modules'] ?? [];
 
         foreach ($modules as $module) {

beike/Shop/Services/AccountService.php

@@ -30,8 +30,8 @@ class AccountService
      */
     public static function register(array $data): Customer
     {
-        $data['customer_group_id'] = setting('base.default_customer_group_id', 1); // default_customer_group_id为默认客户组名称
-        $data['status'] = !setting('base.approve_customer'); // approve_customer为是否需要审核客户
+        $data['customer_group_id'] = system_setting('base.default_customer_group_id', 1); // default_customer_group_id为默认客户组名称
+        $data['status'] = !system_setting('base.approve_customer'); // approve_customer为是否需要审核客户
         $data['from'] = $data['from'] ?? 'pc';
         $data['locale'] = locale();
 

beike/Shop/Services/CheckoutService.php

@@ -130,7 +130,7 @@ class CheckoutService
                 'payment_address_id' => $this->cart->payment_address_id,
                 'payment_method_code' => $this->cart->payment_method_code,
             ],
-            'country_id' => (int)setting('base.country_id'),
+            'country_id' => (int)system_setting('base.country_id'),
             'customer_id' => $customer->id ?? null,
             'countries' => CountryRepo::all(),
             'addresses' => AddressResource::collection($addresses),

resources/beike/admin/views/pages/customers/form.blade.php

@@ -157,7 +157,7 @@
           form: {
             name: '',
             phone: '',
-            country_id: @json((int)setting('base.country_id')),
+            country_id: @json((int)system_setting('base.country_id')),
             zipcode: '',
             zone_id: '',
             city_id: '',

themes/default/account/address.blade.php

@@ -74,7 +74,7 @@
         form: {
           name: '',
           phone: '',
-          country_id: @json((int)setting('base.country_id')),
+          country_id: @json((int)system_setting('base.country_id')),
           zipcode: '',
           zone_id: '',
           city: '',