wuhui_zzw
/
wyyl
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed system

This commit is contained in:
Edward Yang 2022-07-12 20:11:45 +08:00
parent c4d73d4185
commit c30810ae49
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
beike/Admin/Http/Controllers/CustomerController.php
View File

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

2
beike/Admin/Http/Controllers/DesignController.php
View File

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

2
beike/Admin/Services/CustomerService.php
View File

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

2
beike/Shop/Http/Controllers/HomeController.php
View File

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

4
beike/Shop/Services/AccountService.php
View File

@ -30,8 +30,8 @@ class AccountService
*/
public static function register(array $data): Customer
{
$data['customer_group_id'] = setting('system.default_customer_group_id', 1); // default_customer_group_id为默认客户组名称
$data['status'] = !setting('system.approve_customer'); // approve_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['from'] = $data['from'] ?? 'pc';
$data['locale'] = locale();

2
beike/Shop/Services/CheckoutService.php
View File

@ -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('system.country_id'),
'country_id' => (int)setting('base.country_id'),
'customer_id' => $customer->id ?? null,
'countries' => CountryRepo::all(),
'addresses' => AddressResource::collection($addresses),

2
resources/beike/admin/views/pages/customers/form.blade.php
View File

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

6
themes/default/account/address.blade.php
View File

@ -74,7 +74,7 @@
form: {
name: '',
phone: '',
country_id: @json((int)setting('system.country_id')),
country_id: @json((int)setting('base.country_id')),
zipcode: '',
zone_id: '',
city: '',
@ -166,7 +166,7 @@
this.editIndex = null;
Object.keys(this.form).forEach(key => this.form[key] = '')
this.form.country_id = @json((int)setting('system.country_id'))
this.form.country_id = @json((int)setting('base.country_id'))
},
countryChange(e) {
@ -179,4 +179,4 @@
}
})
</script>
@endpush
@endpush