diff --git a/resources/beike/admin/views/pages/admin_roles/edit.blade.php b/resources/beike/admin/views/pages/admin_roles/edit.blade.php index f7c52968..60785582 100644 --- a/resources/beike/admin/views/pages/admin_roles/edit.blade.php +++ b/resources/beike/admin/views/pages/admin_roles/edit.blade.php @@ -58,8 +58,7 @@ }, rules: { - name: [{required: true,message: '请输入角色名称',trigger: 'blur'}, ], - description: [{required: true,message: '请输入描述',trigger: 'blur'}, ], + name: [{required: true,message: '{{ __('common.error_required', ['name' => __('admin/admin_roles.role_name')]) }}',trigger: 'blur'}, ], } }, @@ -94,7 +93,7 @@ // }); if (!valid) { - this.$message.error('请检查表单是否填写正确'); + this.$message.error('{{ __('common.error_form') }}'); return; } diff --git a/resources/beike/admin/views/pages/admin_roles/index.blade.php b/resources/beike/admin/views/pages/admin_roles/index.blade.php index 52da4836..0c1d8a9f 100644 --- a/resources/beike/admin/views/pages/admin_roles/index.blade.php +++ b/resources/beike/admin/views/pages/admin_roles/index.blade.php @@ -52,9 +52,9 @@ const id = $(this).data('id'); const self = $(this); - layer.confirm('确定要删除角色吗?', { - title: "提示", - btn: ['取消', '确定'], + layer.confirm('{{ __('common.confirm_delete') }}', { + title: "{{ __('common.text_hint') }}", + btn: ['{{ __('common.cancel') }}', '{{ __('common.confirm') }}'], area: ['400px'], btn2: () => { $http.delete(`admin_roles/${id}`).then((res) => { diff --git a/resources/beike/admin/views/pages/admin_users/index.blade.php b/resources/beike/admin/views/pages/admin_users/index.blade.php index 35d0dd8c..e17fe37d 100644 --- a/resources/beike/admin/views/pages/admin_users/index.blade.php +++ b/resources/beike/admin/views/pages/admin_users/index.blade.php @@ -124,10 +124,10 @@ }, rules: { - name: [{required: true,message: '请输入账号名称', trigger: 'blur'}, ], - email: [{required: true,message: '请输入邮箱', trigger: 'blur'}, ], - password: [{required: true,message: '请输入密码', trigger: 'blur'}, ], - roles: [{type: 'array', required: true, message: '请至少选择一个角色', trigger: 'blur'}], + name: [{required: true,message: '{{ __('common.error_required', ['name' => __('common.name')]) }}', trigger: 'blur'}, ], + email: [{required: true,message: '{{ __('common.error_required', ['name' => __('common.email')]) }}', trigger: 'blur'}, ], + password: [{required: true,message: '{{ __('common.error_required', ['name' => __('shop/login.password')]) }}', trigger: 'blur'}, ], + roles: [{type: 'array', required: true, message: '{{ __('admin/admin_roles.error_roles') }}', trigger: 'blur'}], } }, @@ -157,7 +157,7 @@ this.$refs[form].validate((valid) => { if (!valid) { - this.$message.error('请检查表单是否填写正确'); + this.$message.error('{{ __('common.error_form') }}'); return; } @@ -176,9 +176,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('admin_users/' + id).then((res) => { diff --git a/resources/lang/en/admin/admin_roles.php b/resources/lang/en/admin/admin_roles.php index becfa3c3..4fc8e3c1 100644 --- a/resources/lang/en/admin/admin_roles.php +++ b/resources/lang/en/admin/admin_roles.php @@ -15,4 +15,5 @@ return [ 'role_name' => 'Role Name', 'role_management' => 'Role Management', 'permission' => 'Permission', + 'error_roles' => 'Please select at least one role', ]; diff --git a/resources/lang/zh_cn/admin/admin_roles.php b/resources/lang/zh_cn/admin/admin_roles.php index 17b56b9c..654e46ff 100644 --- a/resources/lang/zh_cn/admin/admin_roles.php +++ b/resources/lang/zh_cn/admin/admin_roles.php @@ -15,4 +15,5 @@ return [ 'role_name' => '角色名称', 'role_management' => '角色管理', 'permission' => '权限', + 'error_roles' => '请至少选择一个角色', ];