diff --git a/resources/beike/admin/views/pages/tax_classes/index.blade.php b/resources/beike/admin/views/pages/tax_classes/index.blade.php index 479046e5..d5382420 100644 --- a/resources/beike/admin/views/pages/tax_classes/index.blade.php +++ b/resources/beike/admin/views/pages/tax_classes/index.blade.php @@ -124,8 +124,8 @@ }, rules: { - title: [{required: true,message: '请输入税类名称',trigger: 'blur'}, ], - description: [{required: true,message: '请输入描述',trigger: 'blur'}, ], + title: [{required: true,message: "{{ __('common.error_required', ['name' => __('admin/region.name')])}}",trigger: 'blur'}, ], + description: [{required: true,message: '{{ __('common.error_required', ['name' => __('admin/region.describe')])}}',trigger: 'blur'}, ], } }, diff --git a/resources/beike/admin/views/pages/tax_rates/index.blade.php b/resources/beike/admin/views/pages/tax_rates/index.blade.php index 33fcd3f9..bd8016ab 100644 --- a/resources/beike/admin/views/pages/tax_rates/index.blade.php +++ b/resources/beike/admin/views/pages/tax_rates/index.blade.php @@ -96,7 +96,7 @@ source: { all_tax_rates: @json($all_tax_rates ?? []), regions: @json($regions ?? []), - types: [{value:'percent', name: '百分比'}, {value:'flat', name: '固定税率'}] + types: [{value:'percent', name: '{{ __('admin/tax_rate.percentage') }}'}, {value:'flat', name: '{{ __('admin/tax_rate.fixed_tax_rate') }}'}] }, dialog: { @@ -113,8 +113,8 @@ }, rules: { - name: [{required: true,message: '请输入税种',trigger: 'blur'}, ], - rate: [{required: true,message: '请输入税率',trigger: 'blur'}, ], + name: [{required: true,message: '{{ __('common.error_required', ['name' => __('admin/tax_rate.tax_rate.tax')])}}',trigger: 'blur'}, ], + rate: [{required: true,message: '{{ __('common.error_required', ['name' => __('admin/tax_rate.tax_rate')])}}',trigger: 'blur'}, ], } }, @@ -149,7 +149,7 @@ this.$refs[form].validate((valid) => { if (!valid) { - this.$message.error('请检查表单是否填写正确'); + this.$message.error('{{ __('common.error_form') }}'); return; } @@ -168,9 +168,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('tax_rates/' + id).then((res) => { diff --git a/resources/lang/en/admin/tax_rate.php b/resources/lang/en/admin/tax_rate.php index 7a8c8209..a9cd7e98 100644 --- a/resources/lang/en/admin/tax_rate.php +++ b/resources/lang/en/admin/tax_rate.php @@ -16,6 +16,8 @@ return [ 'tax_rate' => 'Tax Rate', 'type' => 'Type', 'area' => 'Area', + 'percentage' => 'Percentage', + 'fixed_tax_rate' => 'Fixed Tax Rate', 'tax_rates_index' => 'Index', 'tax_rates_create' => 'Create', 'tax_rates_show' => 'Detail', diff --git a/resources/lang/zh_cn/admin/tax_rate.php b/resources/lang/zh_cn/admin/tax_rate.php index d339212c..71f7da75 100644 --- a/resources/lang/zh_cn/admin/tax_rate.php +++ b/resources/lang/zh_cn/admin/tax_rate.php @@ -16,6 +16,8 @@ return [ 'tax_rate' => '税率', 'type' => '类型', 'area' => '区域', + 'percentage' => '百分比', + 'fixed_tax_rate' => '固定税率', 'tax_rates_index' => '税率列表', 'tax_rates_create' => '创建税率', 'tax_rates_show' => '税率详情',