diff --git a/beike/Admin/Http/Controllers/RmaReasonController.php b/beike/Admin/Http/Controllers/RmaReasonController.php index f932b277..83d6df3c 100644 --- a/beike/Admin/Http/Controllers/RmaReasonController.php +++ b/beike/Admin/Http/Controllers/RmaReasonController.php @@ -28,6 +28,10 @@ class RmaReasonController extends Controller 'rmaReasons' => RmaReasonDetail::collection($rmaReasons)->jsonSerialize(), ]; + if ($request->expectsJson()) { + return json_success(trans('common.success'), $data); + } + return view('admin::pages.rma_reasons.index', $data); } diff --git a/resources/beike/admin/views/pages/rma_reasons/index.blade.php b/resources/beike/admin/views/pages/rma_reasons/index.blade.php index 1e5ed4a4..53740164 100644 --- a/resources/beike/admin/views/pages/rma_reasons/index.blade.php +++ b/resources/beike/admin/views/pages/rma_reasons/index.blade.php @@ -58,10 +58,6 @@ @{{ language.id }} @{{ language.name }} - - {{ __('common.enable') }} - {{ __('common.disable') }} - @@ -69,8 +65,6 @@ - - {{-- {{ $languages->links('admin::vendor/pagination/bootstrap-4') }} --}} { + this.rmaReasons = res.data.rmaReasons; + }) + }, + statusChange(e, index) { const id = this.rmaReasons[index].id; @@ -160,17 +160,13 @@ this.$refs[form].validate((valid) => { if (!valid) { - this.$message.error('请检查表单是否填写正确'); + this.$message.error('{{ __('common.error_form') }}'); return; } $http[type](url, this.dialog.form).then((res) => { this.$message.success(res.message); - if (this.dialog.type == 'add') { - this.rmaReasons.push(res.data) - } else { - this.rmaReasons[this.dialog.index] = res.data - } + this.loadData(); this.dialog.show = false }) @@ -179,9 +175,9 @@ deleteCustomer(id, index) { const self = this; - this.$confirm('确定要删除语言吗?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', + this.$confirm('{{ __('common.confirm_delete') }}', '{{ __('common.text_hint') }}', { + confirmButtonText: '{{ __('common.confirm') }}', + cancelButtonText: '{{ __('common.cancel') }}', type: 'warning' }).then(() => { $http.delete('rmaReasons/' + id).then((res) => { @@ -194,6 +190,7 @@ closeCustomersDialog(form) { this.$refs[form].resetFields(); Object.keys(this.dialog.form).forEach(key => this.dialog.form[key] = '') + this.dialog.form.name = {}; this.dialog.show = false } }