From 6d9081e4e230bf98f3eec35e078f2dca206918fb Mon Sep 17 00:00:00 2001 From: pushuo <229102104@qq.com> Date: Wed, 24 Aug 2022 10:02:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=8C=BA=E5=9F=9F=E3=80=81?= =?UTF-8?q?=E7=A8=8E=E7=8E=87=E3=80=81=E7=A8=8E=E7=B1=BB=E7=AD=89=E5=A4=9A?= =?UTF-8?q?=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/views/pages/regions/index.blade.php | 18 +++---- .../views/pages/tax_classes/index.blade.php | 54 +++++++++---------- .../views/pages/tax_rates/index.blade.php | 48 ++++++++--------- resources/lang/en/admin/region.php | 5 +- resources/lang/en/admin/rma_reason.php | 3 ++ resources/lang/en/admin/tax_class.php | 3 ++ resources/lang/en/admin/tax_rate.php | 6 +++ resources/lang/en/common.php | 6 +++ resources/lang/zh_cn/admin/region.php | 3 ++ resources/lang/zh_cn/admin/tax_class.php | 3 ++ resources/lang/zh_cn/admin/tax_rate.php | 6 +++ resources/lang/zh_cn/common.php | 6 +++ 12 files changed, 100 insertions(+), 61 deletions(-) diff --git a/resources/beike/admin/views/pages/regions/index.blade.php b/resources/beike/admin/views/pages/regions/index.blade.php index 832d5c0f..63bfdd74 100644 --- a/resources/beike/admin/views/pages/regions/index.blade.php +++ b/resources/beike/admin/views/pages/regions/index.blade.php @@ -1,22 +1,22 @@ @extends('admin::layouts.master') -@section('title', '区域组') +@section('title', __('admin/region.index')) @section('content')
- +
- - - - - + + + + + @@ -27,8 +27,8 @@ 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 23b358c1..9b542d42 100644 --- a/resources/beike/admin/views/pages/tax_classes/index.blade.php +++ b/resources/beike/admin/views/pages/tax_classes/index.blade.php @@ -1,31 +1,31 @@ @extends('admin::layouts.master') -@section('title', '税类设置') +@section('title', __('admin/tax_rate.tax_classes_index')) @section('content')
- +
ID名称描述创建时间修改时间操作{{ __('admin/region.name') }}{{ __('admin/region.describe') }}{{ __('common.created_at') }}{{ __('common.updated_at') }}{{ __('common.operate') }}
@{{ tax.created_at }} @{{ tax.updated_at }} - - + +
- - - - - + + + + + @@ -36,8 +36,8 @@ @@ -46,52 +46,52 @@ {{-- {{ $tax_classes->links('admin::vendor/pagination/bootstrap-4') }} --}} - - - + + - - + + - +
ID名称描述创建时间修改时间操作{{ __('admin/region.name') }}{{ __('admin/region.describe') }}{{ __('common.created_at') }}{{ __('common.updated_at') }}{{ __('common.operate') }}
@{{ tax.created_at }} @{{ tax.updated_at }} - - + +
- - - + + + - +
税率基于优先级{{ __('admin/tax_rate.tax_rate') }}{{ __('admin/tax_class.based_on') }}{{ __('admin/tax_class.priority') }}
- + - + - +
- 添加规则 + {{ __('common.add') }} - 保存 - 取消 + {{ __('common.save') }} + {{ __('common.cancel') }} 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 93dd8ee7..e13ddf6e 100644 --- a/resources/beike/admin/views/pages/tax_rates/index.blade.php +++ b/resources/beike/admin/views/pages/tax_rates/index.blade.php @@ -1,33 +1,33 @@ @extends('admin::layouts.master') -@section('title', '税率设置') +@section('title', __('admin/tax_rate.index')) @section('content')
- +
- - - - - - - + + + + + + + @@ -40,8 +40,8 @@ @@ -50,35 +50,35 @@ {{-- {{ $tax_rates->links('admin::vendor/pagination/bootstrap-4') }} --}} - - - + + - - + + - - + + - - + + - 保存 - 取消 + {{ __('common.save') }} + {{ __('common.cancel') }} diff --git a/resources/lang/en/admin/region.php b/resources/lang/en/admin/region.php index 12a128c2..022d8f96 100644 --- a/resources/lang/en/admin/region.php +++ b/resources/lang/en/admin/region.php @@ -10,9 +10,12 @@ */ return [ + 'index' => 'Area Group', 'regions_index' => 'Index', 'regions_create' => 'Create', 'regions_show' => 'Detail', 'regions_update' => 'Edit', - 'regions_delete' => 'Delete' + 'regions_delete' => 'Delete', + 'name' => 'Name', + 'describe' => 'Describe', ]; diff --git a/resources/lang/en/admin/rma_reason.php b/resources/lang/en/admin/rma_reason.php index 8a4513ac..ba21697a 100644 --- a/resources/lang/en/admin/rma_reason.php +++ b/resources/lang/en/admin/rma_reason.php @@ -10,6 +10,9 @@ */ return [ + 'rule' => 'Rule', + 'based_on' => 'Based On', + 'priority' => 'Priority', 'rma_reasons_index' => 'Index', 'rma_reasons_create' => 'Create', 'rma_reasons_update' => 'Update', diff --git a/resources/lang/en/admin/tax_class.php b/resources/lang/en/admin/tax_class.php index 0acec702..afd8ebc9 100644 --- a/resources/lang/en/admin/tax_class.php +++ b/resources/lang/en/admin/tax_class.php @@ -10,6 +10,9 @@ */ return [ + 'rule' => 'Rule', + 'based_on' => 'Based', + 'priority' => 'Priority', 'tax_classes_index' => 'Index', 'tax_classes_create' => 'Create', 'tax_classes_show' => 'Detail', diff --git a/resources/lang/en/admin/tax_rate.php b/resources/lang/en/admin/tax_rate.php index 63b8fdfe..7a8c8209 100644 --- a/resources/lang/en/admin/tax_rate.php +++ b/resources/lang/en/admin/tax_rate.php @@ -10,6 +10,12 @@ */ return [ + 'index' => 'Tax Rate', + 'tax_classes_index' => 'Tax Classes', + 'tax' => 'Tax', + 'tax_rate' => 'Tax Rate', + 'type' => 'Type', + 'area' => 'Area', 'tax_rates_index' => 'Index', 'tax_rates_create' => 'Create', 'tax_rates_show' => 'Detail', diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php index 4e004a3a..d7081718 100644 --- a/resources/lang/en/common.php +++ b/resources/lang/en/common.php @@ -34,6 +34,12 @@ return [ 'sign_out' => 'Sign Out', 'contact_us' => 'Contact us', 'input' => 'Type your search here', + 'created_at' => 'Created At', + 'updated_at' => 'Updated At', + 'edit' => 'Edit', + 'operate' => 'Operate', + 'add' => 'Add', + 'please_choose' => 'Please Choose', 'order' => [ 'unpaid' => 'Unpaid', diff --git a/resources/lang/zh_cn/admin/region.php b/resources/lang/zh_cn/admin/region.php index 697b8455..0aef34a4 100644 --- a/resources/lang/zh_cn/admin/region.php +++ b/resources/lang/zh_cn/admin/region.php @@ -10,9 +10,12 @@ */ return [ + 'index' => '区域组', 'regions_index' => '区域组列表', 'regions_create' => '创建区域组', 'regions_show' => '区域组详情', 'regions_update' => '更新区域组', 'regions_delete' => '删除区域组', + 'name' => '名称', + 'describe' => '描述', ]; diff --git a/resources/lang/zh_cn/admin/tax_class.php b/resources/lang/zh_cn/admin/tax_class.php index 1f146fba..56801adf 100644 --- a/resources/lang/zh_cn/admin/tax_class.php +++ b/resources/lang/zh_cn/admin/tax_class.php @@ -10,6 +10,9 @@ */ return [ + 'rule' => '规则', + 'based_on' => '基于', + 'priority' => '优先级', 'tax_classes_index' => '税类列表', 'tax_classes_create' => '创建税类', 'tax_classes_show' => '税类详情', diff --git a/resources/lang/zh_cn/admin/tax_rate.php b/resources/lang/zh_cn/admin/tax_rate.php index c2078ab4..d339212c 100644 --- a/resources/lang/zh_cn/admin/tax_rate.php +++ b/resources/lang/zh_cn/admin/tax_rate.php @@ -10,6 +10,12 @@ */ return [ + 'index' => '税率设置', + 'tax_classes_index' => '税类设置', + 'tax' => '税种', + 'tax_rate' => '税率', + 'type' => '类型', + 'area' => '区域', 'tax_rates_index' => '税率列表', 'tax_rates_create' => '创建税率', 'tax_rates_show' => '税率详情', diff --git a/resources/lang/zh_cn/common.php b/resources/lang/zh_cn/common.php index c417a620..f0fec103 100644 --- a/resources/lang/zh_cn/common.php +++ b/resources/lang/zh_cn/common.php @@ -33,6 +33,12 @@ return [ 'sign_out' => '退出登录', 'contact_us' => '联系我们', 'input' => '在此处输入您的搜索', + 'created_at' => '创建时间', + 'updated_at' => '修改时间', + 'edit' => '编辑', + 'operate' => '操作', + 'add' => '添加', + 'please_choose' => '请选择', 'order' => [ 'unpaid' => '待支付',
ID税种税率类型区域创建时间修改时间操作{{ __('admin/tax_rate.tax') }}{{ __('admin/tax_rate.tax_rate') }}{{ __('admin/tax_rate.type') }}{{ __('admin/tax_rate.area') }}{{ __('common.created_at') }}{{ __('common.updated_at') }}{{ __('common.operate') }}
@{{ tax.created_at }} @{{ tax.updated_at }} - - + +