diff --git a/beike/Admin/Http/Controllers/SettingController.php b/beike/Admin/Http/Controllers/SettingController.php index 05fcec3e..06afef9d 100644 --- a/beike/Admin/Http/Controllers/SettingController.php +++ b/beike/Admin/Http/Controllers/SettingController.php @@ -37,9 +37,8 @@ class SettingController extends Controller ]; $data = [ - 'settings' => SystemSettingRepo::getList(), 'countries' => CountryRepo::all(), - 'currencies' => CurrencyRepo::all(), + 'currencies' => CurrencyRepo::listEnabled(), 'tax_address' => $tax_address, 'themes' => $themes ]; diff --git a/beike/Repositories/SystemSettingRepo.php b/beike/Repositories/SystemSettingRepo.php index 2b6487ee..54170ec7 100644 --- a/beike/Repositories/SystemSettingRepo.php +++ b/beike/Repositories/SystemSettingRepo.php @@ -13,101 +13,5 @@ namespace Beike\Repositories; class SystemSettingRepo { - /** - * 获取系统设置 - */ - public static function getList(): array - { - return [ - [ - 'name' => 'country_id', - 'label' => '默认国家', - 'type' => 'select', - 'required' => true, - 'options' => [ - ['value' => '1', 'label' => '中国'], - ['value' => '2', 'label' => '美国'] - ], - 'value' => old('country_id', system_setting('base.country_id', '1')), - 'description' => '默认国家设置', - ], - [ - 'name' => 'zone_id', - 'label' => '默认省份', - 'type' => 'select', - 'required' => true, - 'options' => ZoneRepo::getZoneOptions(1), - 'value' => old('zone_id', system_setting('base.zone_id', '1')), - 'description' => '默认省份设置', - ], - [ - 'name' => 'locale', - 'label' => '默认语言', - 'type' => 'select', - 'required' => true, - 'options' => [ - ['value' => 'zh_cn', 'label' => '简体中文'], - ['value' => 'en', 'label' => '英文'] - ], - 'value' => old('locale', system_setting('base.locale', 'zh_cn')), - 'description' => '默认语言设置', - ], - [ - 'name' => 'currency', - 'label' => '默认货币', - 'type' => 'select', - 'required' => true, - 'options' => [ - ['value' => 'CNY', 'label' => '人民币'], - ['value' => 'USD', 'label' => '美元'] - ], - 'value' => old('currency', system_setting('base.currency', 'USD')), - 'description' => '默认货币设置', - ], - [ - 'name' => 'admin_name', - 'label' => '后台目录', - 'type' => 'string', - 'required' => true, - 'value' => old('admin_name', system_setting('base.admin_name', 'admin')), - 'description' => '管理后台目录,默认为admin', - ], - [ - 'name' => 'theme', - 'label' => '主题模板', - 'type' => 'select', - 'options' => [ - ['value' => 'default', 'label' => '默认主题'], - ['value' => 'black', 'label' => '黑色主题'] - ], - 'value' => old('theme', system_setting('base.theme', 'default')), - 'required' => true, - 'description' => '主题模板选择', - ], - [ - 'name' => 'tax', - 'label' => '启用税费', - 'type' => 'select', - 'options' => [ - ['value' => '1', 'label' => '开启'], - ['value' => '0', 'label' => '关闭'] - ], - 'value' => old('tax', system_setting('base.tax', '0')), - 'required' => true, - 'description' => '是否启用税费计算', - ], - [ - 'name' => 'tax_address', - 'label' => '税费地址', - 'type' => 'select', - 'options' => [ - ['value' => 'shipping', 'label' => '配送地址'], - ['value' => 'payment', 'label' => '账单地址'] - ], - 'value' => old('tax_address', system_setting('base.tax_address', 'shipping')), - 'required' => true, - 'description' => '按什么地址计算税费', - ] - ]; - } + }