diff --git a/beike/Admin/Http/Controllers/TaxRateController.php b/beike/Admin/Http/Controllers/TaxRateController.php index ba4cfec3..8be80082 100644 --- a/beike/Admin/Http/Controllers/TaxRateController.php +++ b/beike/Admin/Http/Controllers/TaxRateController.php @@ -11,6 +11,7 @@ namespace Beike\Admin\Http\Controllers; +use Beike\Admin\Http\Requests\TaxRateRequest; use Beike\Models\Region; use Illuminate\Http\Request; use Beike\Admin\Repositories\TaxRateRepo; @@ -27,7 +28,7 @@ class TaxRateController return view('admin::pages.tax_rates.index', $data); } - public function store(Request $request) + public function store(TaxRateRequest $request) { $requestData = json_decode($request->getContent(), true); $taxRate = TaxRateRepo::createOrUpdate($requestData); @@ -35,7 +36,7 @@ class TaxRateController return json_success(trans('common.created_success'), $taxRate); } - public function update(Request $request, int $taxRateId) + public function update(TaxRateRequest $request, int $taxRateId) { $requestData = json_decode($request->getContent(), true); $requestData['id'] = $taxRateId; diff --git a/beike/Admin/Http/Requests/TaxRateRequest.php b/beike/Admin/Http/Requests/TaxRateRequest.php new file mode 100644 index 00000000..843b45e0 --- /dev/null +++ b/beike/Admin/Http/Requests/TaxRateRequest.php @@ -0,0 +1,41 @@ + + * @created 2022-08-12 17:48:08 + * @modified 2022-08-12 17:48:08 + */ + +namespace Beike\Admin\Http\Requests; + +use Illuminate\Foundation\Http\FormRequest; + +class TaxRateRequest extends FormRequest +{ + /** + * Determine if the user is authorized to make this request. + * + * @return bool + */ + public function authorize(): bool + { + return true; + } + + /** + * Get the validation rules that apply to the request. + * + * @return array + */ + public function rules(): array + { + return [ + 'name' => 'required|string|max:10', + 'rate' => 'required|numeric', + 'type' => 'required|' + ]; + } +} diff --git a/resources/lang/zh_cn/validation.php b/resources/lang/zh_cn/validation.php index 89d2bf8e..5020bf75 100644 --- a/resources/lang/zh_cn/validation.php +++ b/resources/lang/zh_cn/validation.php @@ -13,119 +13,119 @@ return [ | */ - 'accepted' => 'The :attribute must be accepted.', - 'accepted_if' => 'The :attribute must be accepted when :other is :value.', - 'active_url' => 'The :attribute is not a valid URL.', - 'after' => 'The :attribute must be a date after :date.', - 'after_or_equal' => 'The :attribute must be a date after or equal to :date.', - 'alpha' => 'The :attribute must only contain letters.', - 'alpha_dash' => 'The :attribute must only contain letters, numbers, dashes and underscores.', - 'alpha_num' => 'The :attribute must only contain letters and numbers.', - 'array' => 'The :attribute must be an array.', - 'before' => 'The :attribute must be a date before :date.', - 'before_or_equal' => 'The :attribute must be a date before or equal to :date.', + 'accepted' => ':attribute 必须接受。', + 'accepted_if' => '当:other为:value时,:attribute 必须接受。', + 'active_url' => ':attribute 必须是一个有效的 URL。', + 'after' => ':attribute 必须是 :date 之后的一个日期。', + 'after_or_equal' => ':attribute 必须是 :date 之后或相同的一个日期。', + 'alpha' => ':attribute 只能包含字母。', + 'alpha_dash' => ':attribute 只能包含字母、数字、中划线或下划线。', + 'alpha_num' => ':attribute 只能包含字母和数字。', + 'array' => ':attribute 必须是一个数组。', + 'before' => ':attribute 必须是 :date 之前的一个日期。', + 'before_or_equal' => ':attribute 必须是 :date 之前或相同的一个日期。', 'between' => [ - 'numeric' => 'The :attribute must be between :min and :max.', - 'file' => 'The :attribute must be between :min and :max kilobytes.', - 'string' => 'The :attribute must be between :min and :max characters.', - 'array' => 'The :attribute must have between :min and :max items.', + 'numeric' => ':attribute 必须在 :min 到 :max 之间。', + 'file' => ':attribute 必须在 :min 到 :max KB 之间。', + 'string' => ':attribute 必须在 :min 到 :max 个字符之间。', + 'array' => ':attribute 必须在 :min 到 :max 项之间。', ], - 'boolean' => 'The :attribute field must be true or false.', - 'confirmed' => 'The :attribute confirmation does not match.', - 'current_password' => 'The password is incorrect.', - 'date' => 'The :attribute is not a valid date.', - 'date_equals' => 'The :attribute must be a date equal to :date.', - 'date_format' => 'The :attribute does not match the format :format.', - 'declined' => 'The :attribute must be declined.', - 'declined_if' => 'The :attribute must be declined when :other is :value.', - 'different' => 'The :attribute and :other must be different.', - 'digits' => 'The :attribute must be :digits digits.', - 'digits_between' => 'The :attribute must be between :min and :max digits.', - 'dimensions' => 'The :attribute has invalid image dimensions.', - 'distinct' => 'The :attribute field has a duplicate value.', - 'email' => 'The :attribute must be a valid email address.', - 'ends_with' => 'The :attribute must end with one of the following: :values.', - 'exists' => 'The selected :attribute is invalid.', - 'file' => 'The :attribute must be a file.', - 'filled' => 'The :attribute field must have a value.', + 'boolean' => ':attribute 字符必须是 true 或 false。', + 'confirmed' => ':attribute 二次确认不匹配。', + 'current_password' => '密码不不正确。', + 'date' => ':attribute 必须是一个有效的日期。', + 'date_equals' => ':attribute 必须相同于 :date。', + 'date_format' => ':attribute 与给定的格式 :format 不符合。', + 'declined' => ':attribute 必须被拒绝。', + 'declined_if' => '当:other为:value.时,:attribute 必须被拒绝。', + 'different' => ':attribute 必须不同于 :other。', + 'digits' => ':attribute 必须是 :digits 位数。', + 'digits_between' => ':attribute 必须在 :min 和 :max 位之间。', + 'dimensions' => ':attribute 具有无效的图片尺寸。', + 'distinct' => ':attribute 字段具有重复值。', + 'email' => ':attribute 必须是一个有效的电子邮件地址。', + 'ends_with' => ':attribute 必须以 :values 结束。', + 'exists' => '选定的 :attribute 是无效的。', + 'file' => ':attribute 必须是一个文件。', + 'filled' => ':attribute 的字段是必填的。', 'gt' => [ - 'numeric' => 'The :attribute must be greater than :value.', - 'file' => 'The :attribute must be greater than :value kilobytes.', - 'string' => 'The :attribute must be greater than :value characters.', - 'array' => 'The :attribute must have more than :value items.', + 'numeric' => ':attribute 必须大于 :value。', + 'file' => ':attribute 必须大于 :value KB。', + 'string' => ':attribute 必须超过 :value 个字符。', + 'array' => ':attribute 必须超过 :value 项。', ], 'gte' => [ - 'numeric' => 'The :attribute must be greater than or equal to :value.', - 'file' => 'The :attribute must be greater than or equal to :value kilobytes.', - 'string' => 'The :attribute must be greater than or equal to :value characters.', - 'array' => 'The :attribute must have :value items or more.', + 'numeric' => ':attribute 必须大于或相同于 :value。', + 'file' => ':attribute 必须大于或相同于 :value KB。', + 'string' => ':attribute 必须超过或相同于 :value 个字符。', + 'array' => ':attribute 必须超过或相同于 :value 项。', ], - 'image' => 'The :attribute must be an image.', - 'in' => 'The selected :attribute is invalid.', - 'in_array' => 'The :attribute field does not exist in :other.', - 'integer' => 'The :attribute must be an integer.', - 'ip' => 'The :attribute must be a valid IP address.', - 'ipv4' => 'The :attribute must be a valid IPv4 address.', - 'ipv6' => 'The :attribute must be a valid IPv6 address.', - 'json' => 'The :attribute must be a valid JSON string.', + 'image' => ':attribute 必须是图片格式。', + 'in' => '选定的 :attribute 是无效的。', + 'in_array' => ':attribute 字段不存在于 :other。', + 'integer' => ':attribute 必须是个整数。', + 'ip' => ':attribute 必须是一个有效的 IP 地址。', + 'ipv4' => ':attribute 必须是个有效的 IPv4 地址。', + 'ipv6' => ':attribute 必须是个有效的 IPv6 地址。', + 'json' => ':attribute 必须是个有效的 JSON 字符串。', 'lt' => [ - 'numeric' => 'The :attribute must be less than :value.', - 'file' => 'The :attribute must be less than :value kilobytes.', - 'string' => 'The :attribute must be less than :value characters.', - 'array' => 'The :attribute must have less than :value items.', + 'numeric' => ':attribute 必须少于 :value。', + 'file' => ':attribute 必须少于 :value KB。', + 'string' => ':attribute 必须少于 :value 个字符。', + 'array' => ':attribute 必须少于 :value 项。', ], 'lte' => [ - 'numeric' => 'The :attribute must be less than or equal to :value.', - 'file' => 'The :attribute must be less than or equal to :value kilobytes.', - 'string' => 'The :attribute must be less than or equal to :value characters.', - 'array' => 'The :attribute must not have more than :value items.', + 'numeric' => ':attribute 必须少于或等于 :value。', + 'file' => ':attribute 必须少于或等于 :value KB。', + 'string' => ':attribute 必须少于或等于 :value 个字符。', + 'array' => ':attribute 必须少于或等于 :value 项。', ], 'max' => [ - 'numeric' => ':attribute不能大于 :max', - 'file' => 'The :attribute must not be greater than :max kilobytes.', - 'string' => ':attribute长度不能超过 :max 个字符', - 'array' => 'The :attribute must not have more than :max items.', + 'numeric' => ':attribute 的最大长度为 :max 位数。', + 'file' => ':attribute 的大小最多为 :max KB。', + 'string' => ':attribute 的最大长度为 :max 字符。', + 'array' => ':attribute 最多为 :max 项。', ], - 'mimes' => 'The :attribute must be a file of type: :values.', - 'mimetypes' => 'The :attribute must be a file of type: :values.', + 'mimes' => ':attribute 的文件类型必须是 :values。', + 'mimetypes' => ':attribute 的文件类型必须是 :values。', 'min' => [ - 'numeric' => 'The :attribute must be at least :min.', - 'file' => 'The :attribute must be at least :min kilobytes.', - 'string' => 'The :attribute must be at least :min characters.', - 'array' => 'The :attribute must have at least :min items.', + 'numeric' => ':attribute 的最小长度为 :min 位数。', + 'file' => ':attribute 的大小至少为 :min KB。', + 'string' => ':attribute 的最小长度为 :min 字符。', + 'array' => ':attribute 至少有 :min 项。', ], - 'multiple_of' => 'The :attribute must be a multiple of :value.', - 'not_in' => 'The selected :attribute is invalid.', - 'not_regex' => 'The :attribute format is invalid.', - 'numeric' => 'The :attribute must be a number.', - 'password' => 'The password is incorrect.', - 'present' => 'The :attribute field must be present.', - 'prohibited' => 'The :attribute field is prohibited.', - 'prohibited_if' => 'The :attribute field is prohibited when :other is :value.', - 'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.', - 'prohibits' => 'The :attribute field prohibits :other from being present.', - 'regex' => 'The :attribute format is invalid.', - 'required' => 'The :attribute field is required.', - 'required_if' => 'The :attribute field is required when :other is :value.', - 'required_unless' => 'The :attribute field is required unless :other is in :values.', - 'required_with' => 'The :attribute field is required when :values is present.', - 'required_with_all' => 'The :attribute field is required when :values are present.', - 'required_without' => 'The :attribute field is required when :values is not present.', - 'required_without_all' => 'The :attribute field is required when none of :values are present.', - 'same' => 'The :attribute and :other must match.', + 'multiple_of' => ':attribute 必须是 :value 的倍数。', + 'not_in' => '选定的 :attribute 是无效的。', + 'not_regex' => ':attribute 的格式是无效的。', + 'numeric' => ':attribute 必须是数字。', + 'password' => '密码错误。', + 'present' => ':attribute 字段必须存在。', + 'prohibited' => ':attribute 字段是被禁止的。', + 'prohibited_if' => ':attribute 字段是被禁止的当:other为:value。', + 'prohibited_unless' => ':attribute 字段是被禁止的除非 :other 属于 :values。', + 'prohibits' => ':attribute 字段是被禁止的 :other。', + 'regex' => ':attribute 格式是无效的。', + 'required' => ':attribute 字段是必须的。', + 'required_if' => ':attribute 字段是必须的当 :other 是 :value。', + 'required_unless' => ':attribute 字段是必须的,除非 :other 是在 :values 中。', + 'required_with' => ':attribute 字段是必须的当 :values 是存在的。', + 'required_with_all' => ':attribute 字段是必须的当 :values 是存在的。', + 'required_without' => ':attribute 字段是必须的当 :values 是不存在的。', + 'required_without_all' => ':attribute 字段是必须的当 没有一个 :values 是存在的。', + 'same' => ':attribute和:other必须匹配。', 'size' => [ - 'numeric' => 'The :attribute must be :size.', - 'file' => 'The :attribute must be :size kilobytes.', - 'string' => 'The :attribute must be :size characters.', - 'array' => 'The :attribute must contain :size items.', + 'numeric' => ':attribute 必须是 :size 位数。', + 'file' => ':attribute 必须是 :size KB。', + 'string' => ':attribute 必须是 :size 个字符。', + 'array' => ':attribute 必须包括 :size 项。', ], - 'starts_with' => 'The :attribute must start with one of the following: :values.', - 'string' => 'The :attribute must be a string.', - 'timezone' => 'The :attribute must be a valid timezone.', - 'unique' => 'The :attribute has already been taken.', - 'uploaded' => 'The :attribute failed to upload.', - 'url' => 'The :attribute must be a valid URL.', - 'uuid' => 'The :attribute must be a valid UUID.', + 'starts_with' => ':attribute 必须以 :values 开始。', + 'string' => ':attribute 必须是一个字符串。', + 'timezone' => ':attribute 必须是个有效的时区。', + 'unique' => ':attribute 已存在。', + 'uploaded' => ':attribute 上传失败。', + 'url' => ':attribute 无效的格式。', + 'uuid' => ':attribute 必须是个有效的 UUID。', /* |--------------------------------------------------------------------------