diff --git a/resources/beike/admin/views/pages/customers/form.blade.php b/resources/beike/admin/views/pages/customers/form.blade.php index dc0a9221..9857d696 100644 --- a/resources/beike/admin/views/pages/customers/form.blade.php +++ b/resources/beike/admin/views/pages/customers/form.blade.php @@ -1,48 +1,48 @@ @extends('admin::layouts.master') -@section('title', '顾客管理') +@section('title', __('admin/common.customer')) @section('content')
- + - +
- - + + - - + + - - + + - + - + - 提交 + {{ __('common.submit') }}
- - + + - - - - + + + + @@ -53,16 +53,16 @@
ID名称电话创建时间操作{{ __('common.name') }}{{ __('common.phone') }}{{ __('common.created_at') }}{{ __('common.action') }}
@{{ address.created_at }} + @click="editAddress(index)">{{ __('common.edit') }} + @click="deleteAddress(address.id, index)">{{ __('common.delete') }}
- 当前账号无地址 - 新增地址 + {{ __('admin/customer.no_address') }} + {{ __('admin/customer.add_address') }}
@@ -71,20 +71,20 @@
- - + - + - +
- + @@ -93,7 +93,7 @@
- + @@ -102,23 +102,23 @@
- +
- + - + - + - 保存 - 取消 + {{ __('common.save') }} + {{ __('common.cancel') }} @@ -166,37 +166,37 @@ }, rules: { - name: [{required: true, message: '请输入用户名', trigger: 'blur'}, ], + name: [{required: true, message: "{{ __('common.error_required', ['name' => __('admin/customer.user_name')] ) }}", trigger: 'blur'}, ], email: [ - {required: true, message: '请输入邮箱', trigger: 'blur'}, - {type: 'email', message: '请输入正确邮箱格式' ,trigger: 'blur'}, + {required: true, message: '{{ __('common.error_required', ['name' => __('common.email')] ) }}', trigger: 'blur'}, + {type: 'email', message: '{{ __('common.error_required', ['name' => __('admin/customer.error_email')] ) }}' ,trigger: 'blur'}, ], }, addressRules: { name: [{ required: true, - message: '请输入姓名', + message: '{{ __('common.error_required', ['name' => __('admin/customer.user_name')] ) }}', trigger: 'blur' }, ], phone: [{ required: true, - message: '请输入联系电话', + message: '{{ __('common.error_required', ['name' => __('common.phone')] ) }}', trigger: 'blur' }, ], address_1: [{ required: true, - message: '请输入详细地址 1', + message: '{{ __('common.error_required', ['name' => __('admin/customer.address_1')] ) }}', trigger: 'blur' }, ], zone_id: [{ required: true, - message: '请选择省份', + message: '{{ __('common.error_required', ['name' => __('admin/customer.zones')] ) }}', trigger: 'blur' }, ], city: [{ required: true, - message: '请填写城市', + message: '{{ __('common.error_required', ['name' => __('admin/customer.city')] ) }}', trigger: 'blur' }, ], } @@ -213,7 +213,7 @@ this.$refs[form].validate((valid) => { if (!valid) { - this.$message.error('请检查表单是否填写正确'); + this.$message.error('{{__('common.error_form')}}'); return; } @@ -234,9 +234,9 @@ }, deleteAddress(id, index) { - this.$confirm('确定要删除地址吗？', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', + this.$confirm('{{ __('admin/customer.confirm_delete_address') }}', '{{__('common.text_hint')}}', { + confirmButtonText: '{{__('common.confirm')}}', + cancelButtonText: '{{__('common.cancel')}}', type: 'warning' }).then(() => { $http.delete(`customers/{{ $customer['id'] }}/addresses/${id}`).then((res) => { @@ -251,7 +251,7 @@ this.$refs[form].validate((valid) => { if (!valid) { - this.$message.error('请检查表单是否填写正确'); + this.$message.error('{{__('common.error_form')}}'); return; } diff --git a/resources/beike/admin/views/pages/orders/index.blade.php b/resources/beike/admin/views/pages/orders/index.blade.php index e0ac9074..e7a6581e 100644 --- a/resources/beike/admin/views/pages/orders/index.blade.php +++ b/resources/beike/admin/views/pages/orders/index.blade.php @@ -77,7 +77,7 @@ {{ $order->created_at }} {{ $order->updated_at }} 查看 + class="btn btn-outline-secondary btn-sm">{{ __('common.view') }} @endforeach diff --git a/resources/lang/en/admin/customer.php b/resources/lang/en/admin/customer.php index 176690bb..2743635f 100644 --- a/resources/lang/en/admin/customer.php +++ b/resources/lang/en/admin/customer.php @@ -16,5 +16,24 @@ return [ 'customers_update' => 'Edit', 'customers_delete' => 'Delete', + 'user_info' => 'User Info', + 'address_management' => 'Address', + 'user_name' => 'User Name', + 'password_info' => 'Leave blank to keep the original password unchanged', + 'add_address' => 'Add address', + 'no_address' => 'The current account has no address', + 'edit_address' => 'Edit address', + 'address' => 'Address', + 'choose_country' => 'Choose Country', + 'zones' => 'Zones', + 'choose_zones' => 'Choose Zones', + 'enter_city' => 'Enter city', + 'city' => 'City', + 'zipcode' => 'Zipcode', + 'address_1' => 'address 1', + 'address_2' => 'address 2', + 'cannot_delete_root' => 'Cannot delete root admin user', + 'error_email' => 'Please enter the correct email format', + 'confirm_delete_address' => 'Are you sure you want to delete the address?', ]; diff --git a/resources/lang/en/admin/customer_group.php b/resources/lang/en/admin/customer_group.php index 29e76d93..44b20df8 100644 --- a/resources/lang/en/admin/customer_group.php +++ b/resources/lang/en/admin/customer_group.php @@ -10,6 +10,8 @@ */ return [ + 'index' => 'Customer Groups', + 'customer_groups_index' => 'Index', 'customer_groups_create' => 'Create', 'customer_groups_show' => 'Detail', diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php index 4e923b6a..738c3a4b 100644 --- a/resources/lang/en/common.php +++ b/resources/lang/en/common.php @@ -11,9 +11,9 @@ return [ 'error_required' => 'Please fill out the :name', // 这个有用别删了，:name 是一个变量 - 'error_required_name' => 'Please fill in your name', - 'error_required_email' => 'Please enter your email', 'error_input_required' => 'Input box cannot be empty', + 'error_form' => 'Please check the form for errors', + 'email' => 'Email', 'unauthenticated' => 'Please login first', 'success' => 'Success', 'no_data' => 'No data～', @@ -57,6 +57,8 @@ return [ 'name' => 'Name', 'image' => 'Image', 'data' => 'Data', + 'view' => 'View', + 'phone' => 'Phone', 'id' => 'ID', 'created_at' => 'Created At', diff --git a/resources/lang/zh_cn/admin/customer.php b/resources/lang/zh_cn/admin/customer.php index dd327164..924fb02e 100644 --- a/resources/lang/zh_cn/admin/customer.php +++ b/resources/lang/zh_cn/admin/customer.php @@ -16,5 +16,29 @@ return [ 'customers_update' => '更新客户', 'customers_delete' => '删除客户', + 'user_info' => '用户信息', + 'address_management' => '地址管理', + 'user_name' => '用户名', + 'password_info' => '留空则保持原密码不变', + 'add_address' => '新增地址', + 'no_address' => '当前账号无地址', + 'edit_address' => '编辑地址', + 'address' => '地址', + 'choose_country' => '选择国家', + 'zones' => '省份', + 'choose_zones' => '选择省份', + 'enter_city' => '输入城市', + 'city' => '城市', + 'zipcode' => '邮编', + 'address_1' => '详细地址 1', + 'address_2' => '详细地址 2', + + // 'customers_delete' => '邮箱', + // 'customers_delete' => '密码', + // 'customers_delete' => '用户组', + // 'customers_delete' => '添加地址', + 'cannot_delete_root' => '不能删除Root账户', + 'error_email' => '请输入正确邮箱格式', + 'confirm_delete_address' => '确定要删除地址吗？', ]; diff --git a/resources/lang/zh_cn/admin/customer_group.php b/resources/lang/zh_cn/admin/customer_group.php index 9b4e6c54..1cc11b10 100644 --- a/resources/lang/zh_cn/admin/customer_group.php +++ b/resources/lang/zh_cn/admin/customer_group.php @@ -10,6 +10,8 @@ */ return [ + 'index' => '客户组', + 'customer_groups_index' => '客户组列表', 'customer_groups_create' => '创建客户组', 'customer_groups_show' => '客户组详情', diff --git a/resources/lang/zh_cn/common.php b/resources/lang/zh_cn/common.php index 4320a86a..c6ac1eef 100644 --- a/resources/lang/zh_cn/common.php +++ b/resources/lang/zh_cn/common.php @@ -10,9 +10,9 @@ */ return [ 'error_required' => '请填写 :name', // 这个有用别删了，:name 是一个变量 - 'error_required_name' => '请填写姓名', - 'error_required_email' => '请填写邮箱', 'error_input_required' => '输入框不能为空', + 'error_form' => '请检查表单是否填写正确', + 'email' => '邮箱', 'unauthenticated' => '请先登录', 'success' => '成功', 'no_data' => '暂无数据～', @@ -56,6 +56,8 @@ return [ 'name' => '名称', 'image' => '图片', 'data' => '数据', + 'view' => '查看', + 'phone' => '电话', 'id' => 'ID', 'created_at' => '创建时间',