From d387d49da9b8c6b977ef3f0f002b01beb238dd32 Mon Sep 17 00:00:00 2001
From: sl <2436637291@qq.com>
Date: Wed, 17 Aug 2022 19:48:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/lang/zh_cn/shop/account.php  |  6 ++++++
 themes/default/account/login.blade.php | 18 +++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/resources/lang/zh_cn/shop/account.php b/resources/lang/zh_cn/shop/account.php
index 3d350977..8e0e61ab 100644
--- a/resources/lang/zh_cn/shop/account.php
+++ b/resources/lang/zh_cn/shop/account.php
@@ -27,6 +27,12 @@ return [
         'not_Already' => '还不是我们的注册客户？',
         'confirm_password' => '确认密码',
         'register' => '注册',
+        'enter_password' => '请输入密码',
+        'enter_email' => '请输入邮箱',
+        'please_confirm' => '请确认密码',
+        'password_err' => '两次输入密码不一致!',
+        'email_err' => '请输入正确邮箱地址!',
+        'check_form' => '请检查表单是否填写正确',
     ],
 
     'wishlist' => [
diff --git a/themes/default/account/login.blade.php b/themes/default/account/login.blade.php
index ce5ee452..c3e3cae0 100644
--- a/themes/default/account/login.blade.php
+++ b/themes/default/account/login.blade.php
@@ -91,7 +91,7 @@
   <script>
     var validatePass = (rule, value, callback) => {
       if (value === '') {
-        callback(new Error('请输入密码'));
+        callback(new Error('{{ __('shop/account.login.enter_password') }}'));
       } else {
         if (value !== '') {
           app.$refs.registerForm.validateField('password_confirmation');
@@ -102,9 +102,9 @@
 
     var validatePass2 = (rule, value, callback) => {
       if (value === '') {
-        callback(new Error('请输入确认密码'));
+        callback(new Error('{{ __('shop/account.login.please_confirm') }}'));
       } else if (value !== app.registerForm.password) {
-        callback(new Error('两次输入密码不一致!'));
+        callback(new Error('{{ __('shop/account.login.password_err') }}'));
       } else {
         callback();
       }
@@ -127,18 +127,18 @@
 
         loginRules: {
           email: [
-            {required: true, message: '请输入邮箱', trigger: 'blur'},
-            {type: 'email', message: '请输入正确邮箱地址', trigger: 'blur'},
+            {required: true, message: '{{ __('shop/account.login.enter_email') }}', trigger: 'blur'},
+            {type: 'email', message: '{{ __('shop/account.login.email_err') }}', trigger: 'blur'},
           ],
           password: [
-            {required: true, message: '请输入密码', trigger: 'blur'}
+            {required: true, message: '{{ __('shop/account.login.enter_password')}}', trigger: 'blur'}
           ]
         },
 
         registeRules: {
           email: [
-            {required: true, message: '请输入邮箱', trigger: 'blur'},
-            {type: 'email', message: '请输入正确邮箱地址', trigger: 'blur'},
+            {required: true, message: '{{ __('shop/account.login.enter_email') }}', trigger: 'blur'},
+            {type: 'email', message: '{{ __('shop/account.login.email_err') }}', trigger: 'blur'},
           ],
           password: [
             {required: true, validator: validatePass, trigger: 'blur'}
@@ -162,7 +162,7 @@
 
           this.$refs[form].validate((valid) => {
             if (!valid) {
-              layer.msg('请检查表单是否填写正确', () => {})
+              layer.msg('{{ __('shop/account.login.check_form') }}', () => {})
               return;
             }