From 1bad99dd0e406c4616e3d1588ec85d795c392fc7 Mon Sep 17 00:00:00 2001 From: pushuo <229102104@qq.com> Date: Thu, 30 Jun 2022 20:10:00 +0800 Subject: [PATCH] wip --- .../Http/Controllers/CustomerController.php | 3 +- beike/Admin/View/Components/Header.php | 4 +- beike/Shop/Providers/ShopServiceProvider.php | 3 +- .../views/pages/customers/form.blade.php | 114 +++++++++++++----- .../admin/views/pages/plugins/index.blade.php | 1 + 5 files changed, 94 insertions(+), 31 deletions(-) diff --git a/beike/Admin/Http/Controllers/CustomerController.php b/beike/Admin/Http/Controllers/CustomerController.php index d73366b4..2ff72a8f 100644 --- a/beike/Admin/Http/Controllers/CustomerController.php +++ b/beike/Admin/Http/Controllers/CustomerController.php @@ -53,7 +53,8 @@ class CustomerController extends Controller $data = [ 'customer' => $customer, 'customer_groups' => CustomerGroupRepo::list(), - 'country' => CountryRepo::all(), + 'countries' => CountryRepo::all(), + 'country_id' => setting('country_id'), '_redirect' => $this->getRedirect(), ]; diff --git a/beike/Admin/View/Components/Header.php b/beike/Admin/View/Components/Header.php index 19b673a4..a784c9c8 100644 --- a/beike/Admin/View/Components/Header.php +++ b/beike/Admin/View/Components/Header.php @@ -18,8 +18,8 @@ class Header extends Component $this->addLink('管理首页', admin_route('home.index'), true); $this->addLink('订单管理', admin_route('home.index')); $this->addLink('商品管理', admin_route('products.index')); - $this->addLink('会员管理', admin_route('home.index')); - $this->addLink('营销管理', admin_route('home.index')); + $this->addLink('会员管理', admin_route('customers.index')); + $this->addLink('插件管理', admin_route('plugins.index')); $this->addLink('系统设置', admin_route('home.index')); } diff --git a/beike/Shop/Providers/ShopServiceProvider.php b/beike/Shop/Providers/ShopServiceProvider.php index 5d74856b..66dec545 100644 --- a/beike/Shop/Providers/ShopServiceProvider.php +++ b/beike/Shop/Providers/ShopServiceProvider.php @@ -16,13 +16,14 @@ class ShopServiceProvider extends ServiceProvider { $uri = request()->getRequestUri(); + $this->loadSettings(); + if (Str::startsWith($uri, '/admin')) { return; } $this->loadRoutesFrom(__DIR__ . '/../Routes/shop.php'); $this->mergeConfigFrom(__DIR__ . '/../../Config/beike.php', 'beike'); - $this->loadSettings(); $this->registerGuard(); $this->app->booted(function () { diff --git a/resources/beike/admin/views/pages/customers/form.blade.php b/resources/beike/admin/views/pages/customers/form.blade.php index bea966bb..dd06a9b4 100644 --- a/resources/beike/admin/views/pages/customers/form.blade.php +++ b/resources/beike/admin/views/pages/customers/form.blade.php @@ -26,14 +26,14 @@ - + 提交 - + @@ -55,6 +55,7 @@ {{-- --}} @@ -71,7 +72,7 @@ - + @@ -79,16 +80,35 @@ - - - - - - - - - + +
+
+ + + + + + +
+
+ + + + + + +
+
+ + + +
+
+ + + @@ -113,23 +133,19 @@ data: { customerTab: 'customer', form: { - id: '', - name: '', - email: '', + id: @json($customer['id'] ?? null), + name: @json($customer['name']), + email: @json($customer['email']), password: '', customer_group_id: 1, - status: false, + status: @json($customer['status']) * 1, address: [] }, + source: { - customer_group: @json($customer_groups), - countrys: [ - {country_id: 44, name: "中国"}, - {country_id: 22, name: "美国"}, - {country_id: 122, name: "俄罗斯"}, - {country_id: 123, name: "英国"}, - {country_id: 113, name: "法国"}, - ] + customer_group: @json($customer_groups ?? []), + countries: @json($countries ?? []), + zones: [] }, dialogAddress: { show: false, @@ -137,9 +153,10 @@ form: { name: '', phone: '', - country_id: 44, - city_id: '', + country_id: @json(setting('country_id')) * 1, + zipcode: '', zone_id: '', + city_id: '', address_1: '', address_2: '', } @@ -151,16 +168,34 @@ name: [{required: true, message: '请输入姓名', trigger: 'blur'}, ], phone: [{required: true, message: '请输入联系电话', trigger: 'blur'}, ], address_1: [{required: true, message: '请输入详细地址 1', trigger: 'blur'}, ], + zone_id: [{required: true, message: '请选择省份', trigger: 'blur'}, ], + city_id: [{required: true, message: '请填写 city', trigger: 'blur'}, ], } }, + // 在挂载开始之前被调用:相关的 render 函数首次被调用 + beforeMount () { + this.countryChange(this.dialogAddress.form.country_id); + }, + methods: { submitForm(form) { + const self = this; + this.$refs[form].validate((valid) => { if (!valid) { this.$message.error('请检查表单是否填写正确'); return; } + + + $.ajax({ + url: `/admin/countries/${e}/zones`, + type: 'get', + success: function(res) { + this.$message.success('提交成功'); + } + }) }); }, @@ -176,6 +211,10 @@ this.dialogAddress.show = true }, + deleteAddress(index) { + this.form.address.splice(index, 1) + }, + addressFormSubmit(form) { this.$refs[form].validate((valid) => { if (!valid) { @@ -189,6 +228,15 @@ this.form.address[this.dialogAddress.index] = JSON.parse(JSON.stringify(this.dialogAddress.form)); } + $.ajax({ + url: `/admin/countries/{{ $customer['id'] }}/addresses`, + data: this.dialogAddress.form, + type: 'post', + success: function(res) { + console.log(res) + } + }) + this.$refs[form].resetFields(); this.dialogAddress.show = false this.dialogAddress.index = null; @@ -200,6 +248,18 @@ this.dialogAddress.show = false this.dialogAddress.index = null; }, + + countryChange(e) { + const self = this; + + $.ajax({ + url: `/admin/countries/${e}/zones`, + type: 'get', + success: function(res) { + self.source.zones = res.data.zones; + } + }) + } } }); diff --git a/resources/beike/admin/views/pages/plugins/index.blade.php b/resources/beike/admin/views/pages/plugins/index.blade.php index 88f0c6e1..66374cda 100644 --- a/resources/beike/admin/views/pages/plugins/index.blade.php +++ b/resources/beike/admin/views/pages/plugins/index.blade.php @@ -3,6 +3,7 @@ @section('title', '插件列表') @section('content') +
222 +