From a82b7462e69b8f7a2ca91fb0f550a7482478b8dc Mon Sep 17 00:00:00 2001
From: sl <2436637291@qq.com>
Date: Mon, 22 Aug 2022 18:56:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=9C=B0=E5=9D=80=20?=
 =?UTF-8?q?=E8=8B=B1=E6=96=87=E8=AF=8D=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/lang/en/common.php                 |  3 ++-
 resources/lang/zh_cn/common.php              |  2 ++
 themes/default/account/address.blade.php     |  2 +-
 themes/default/shared/address-form.blade.php | 26 ++++++++++----------
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php
index d2099c39..8e910d91 100644
--- a/resources/lang/en/common.php
+++ b/resources/lang/en/common.php
@@ -23,6 +23,7 @@ return [
     'disable' => 'Disable',
     'home' => 'home',
     'submit' => 'submit',
+    'save' => 'save',
     'cancel' => 'cancel',
     'confirm' => 'confirm',
     'no' => 'no',
@@ -36,5 +37,5 @@ return [
         'paid' => 'Paid',
         'shipped' => 'Shipped',
         'completed' => 'Completed',
-    ]
+    ],
 ];
diff --git a/resources/lang/zh_cn/common.php b/resources/lang/zh_cn/common.php
index 5e76a21c..313369c1 100644
--- a/resources/lang/zh_cn/common.php
+++ b/resources/lang/zh_cn/common.php
@@ -9,6 +9,7 @@
  * @modified   2022-07-28 17:21:38
  */
 return [
+    'index' => '123123',
     'error_required' => '请填写 :name',
     'unauthenticated' => '请先登录',
     'success' => '成功',
@@ -22,6 +23,7 @@ return [
     'disable' => '禁用',
     'home' => '首页',
     'submit' => '提交',
+    'save' => '保存',
     'cancel' => '取消',
     'confirm' => '确定',
     'no' => '否',
diff --git a/themes/default/account/address.blade.php b/themes/default/account/address.blade.php
index 4c9ed77f..8c4654dd 100644
--- a/themes/default/account/address.blade.php
+++ b/themes/default/account/address.blade.php
@@ -89,7 +89,7 @@
         rules: {
           name: [{required: true, message: '{{ __('shop/account.addresses.enter_name') }}', trigger: 'blur'}, ],
           phone: [{required: true, message: '{{ __('shop/account.addresses.enter_phone') }}', trigger: 'blur'}, ],
-          address_1: [{required: true, message: ' 1{{ __('shop/account.addresses.enter_address') }}', trigger: 'blur'}, ],
+          address_1: [{required: true, message: ' {{ __('shop/account.addresses.enter_address') }}', trigger: 'blur'}, ],
           zone_id: [{required: true, message: '{{ __('shop/account.addresses.select_province') }}', trigger: 'blur'}, ],
           city: [{required: true, message: '{{ __('shop/account.addresses.enter_city') }}', trigger: 'blur'}, ],
         }
diff --git a/themes/default/shared/address-form.blade.php b/themes/default/shared/address-form.blade.php
index 78cf4c9c..672e0cc9 100644
--- a/themes/default/shared/address-form.blade.php
+++ b/themes/default/shared/address-form.blade.php
@@ -4,19 +4,19 @@
   $address_form_rules = $address_form_rules ?? 'addressRules';
 @endphp
 
-<el-dialog custom-class="mobileWidth" title="编辑地址" :visible.sync="{{ $address_form_show }}" @close="closeAddressDialog('addressForm')" :close-on-click-modal="false">
+<el-dialog custom-class="mobileWidth" title="{{ __('address.index') }}" :visible.sync="{{ $address_form_show }}" @close="closeAddressDialog('addressForm')" :close-on-click-modal="false">
   <el-form ref="addressForm" :rules="{{ $address_form_rules }}" :model="{{ $address_form_key }}" label-width="100px">
-    <el-form-item label="姓名" prop="name">
+    <el-form-item label="{{ __('address.name') }}" prop="name">
       <el-input v-model="{{ $address_form_key }}.name"></el-input>
     </el-form-item>
-    <el-form-item label="联系电话" prop="phone">
+    <el-form-item label="{{ __('address.phone') }}" prop="phone">
       <el-input maxlength="11" v-model="{{ $address_form_key }}.phone" type="number"></el-input>
     </el-form-item>
-    <el-form-item label="地址" required>
+    <el-form-item label="{{ __('address.address') }}" required>
       <div class="row dialog-address">
         <div class="col-4">
           <el-form-item>
-            <el-select v-model="{{ $address_form_key }}.country_id" filterable placeholder="选择国家" @change="countryChange">
+            <el-select v-model="{{ $address_form_key }}.country_id" filterable placeholder="{{ __('address.country_id') }}" @change="countryChange">
               <el-option v-for="item in source.countries" :key="item.id" :label="item.name"
                 :value="item.id">
               </el-option>
@@ -25,7 +25,7 @@
         </div>
         <div class="col-4 mt-2 mt-sm-0">
           <el-form-item prop="zone_id">
-            <el-select v-model="{{ $address_form_key }}.zone_id" filterable placeholder="选择省份">
+            <el-select v-model="{{ $address_form_key }}.zone_id" filterable placeholder="{{ __('address.zone_id') }}">
               <el-option v-for="item in source.zones" :key="item.id" :label="item.name"
                 :value="item.id">
               </el-option>
@@ -34,21 +34,21 @@
         </div>
         <div class="col-4 mt-2 mt-sm-0">
           <el-form-item prop="city">
-            <el-input v-model="{{ $address_form_key }}.city" placeholder="输入城市"></el-input>
+            <el-input v-model="{{ $address_form_key }}.city" placeholder="{{ __('address.enter_city') }}"></el-input>
           </el-form-item>
         </div>
       </div>
     </el-form-item>
-    <el-form-item label="邮编" prop="zipcode">
+    <el-form-item label="{{ __('address.post_code') }}" prop="zipcode">
       <el-input v-model="{{ $address_form_key }}.zipcode"></el-input>
     </el-form-item>
-    <el-form-item label="详细地址 1" prop="address_1">
+    <el-form-item label="{{ __('address.address_1') }}" prop="address_1">
       <el-input v-model="{{ $address_form_key }}.address_1"></el-input>
     </el-form-item>
-    <el-form-item label="详细地址 2">
+    <el-form-item label="{{ __('address.address_2') }}">
       <el-input v-model="{{ $address_form_key }}.address_2"></el-input>
     </el-form-item>
-    <el-form-item label="默认地址">
+    <el-form-item label="{{ __('address.default') }}">
       <el-switch
         v-model="{{ $address_form_key }}.default"
         :active-value="1"
@@ -57,8 +57,8 @@
       </el-switch>
     </el-form-item>
     <el-form-item>
-      <el-button type="primary" @click="addressFormSubmit('addressForm')">保存</el-button>
-      <el-button @click="closeAddressDialog('addressForm')">取消</el-button>
+      <el-button type="primary" @click="addressFormSubmit('addressForm')">{{ __('common.save') }}"</el-button>
+      <el-button @click="closeAddressDialog('addressForm')">{{ __('common.cancel') }}"</el-button>
     </el-form-item>
   </el-form>
 </el-dialog>
\ No newline at end of file