From d02f8e354b8a96870ea8a59ab4edba5fac237679 Mon Sep 17 00:00:00 2001
From: sl <2436637291@qq.com>
Date: Thu, 18 Aug 2022 17:07:51 +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        | 13 ++++++++-
 themes/default/account/address.blade.php     | 28 ++++++++++----------
 themes/default/account/wishlist.blade.php    |  7 +++--
 themes/default/shared/address-form.blade.php |  2 +-
 4 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/resources/lang/zh_cn/shop/account.php b/resources/lang/zh_cn/shop/account.php
index f1975178..0aa01680 100644
--- a/resources/lang/zh_cn/shop/account.php
+++ b/resources/lang/zh_cn/shop/account.php
@@ -87,6 +87,17 @@ return [
     ],
 
     'addresses' => [
-        'index' => '我的地址'
+        'index' => '我的地址',
+        'add_address' => '添加新地址',
+        'default_address' => '默认地址',
+        'delete' => '删除',
+        'edit' => '编辑',
+        'enter_name' => '请输入姓名',
+        'enter_phone' => '请输入联系电话',
+        'enter_address' => '请输入详细地址 1',
+        'select_province' => '请选择省份',
+        'enter_city' => '请填写城市',
+        'confirm_delete' => '确定要删除地址吗？',
+        'hint' => '提示',
     ],
 ];
diff --git a/themes/default/account/address.blade.php b/themes/default/account/address.blade.php
index b4162eb4..041ecee4 100644
--- a/themes/default/account/address.blade.php
+++ b/themes/default/account/address.blade.php
@@ -11,7 +11,7 @@
 @section('content')
   <div class="container" id="address-app">
 
-    <x-shop-breadcrumb type="static" value="account.addresses.index" />
+    <x-shop-breadcrumb type="static" value="account.addresses.index" /> 
 
     <div class="row">
       <x-shop-sidebar/>
@@ -19,10 +19,10 @@
       <div class="col-12 col-md-9">
         <div class="card h-min-600">
           <div class="card-header d-flex justify-content-between align-items-center">
-            <h5 class="card-title">我的地址</h5>
+            <h5 class="card-title">{{ __('shop/account.addresses.index') }}</h5>
           </div>
           <div class="card-body h-600">
-            <button class="btn btn-dark mb-3" @click="editAddress"><i class="bi bi-plus-square-dotted me-1"></i> 添加新地址</button>
+            <button class="btn btn-dark mb-3" @click="editAddress"><i class="bi bi-plus-square-dotted me-1"></i> {{ __('shop/account.addresses.add_address') }}</button>
             <div class="addresses-wrap" v-cloak>
               <div class="row">
                 <div class="col-6" v-for="address, index in addresses" :key="index" v-if="addresses.length">
@@ -34,10 +34,10 @@
                     <div class="zipcode">@{{ address.zipcode }}</div>
                     <div class="address-info">@{{ address.country }} @{{ address.zone }} @{{ address.city }} @{{ address.address_1 }}</div>
                     <div class="address-bottom">
-                      <div><span class="badge bg-success" v-if="address.default">默认地址</span></div>
+                      <div><span class="badge bg-success" v-if="address.default">{{ __('shop/account.addresses.default_address') }}</span></div>
                       <div>
-                        <a class="me-2" @click.stop="deleteAddress(index)">删除</a>
-                        <a @click.stop="editAddress(index)">编辑</a>
+                        <a class="me-2" @click.stop="deleteAddress(index)">{{ __('shop/account.addresses.delete') }}</a>
+                        <a @click.stop="editAddress(index)">{{ __('shop/account.addresses.edit') }}</a>
                       </div>
                     </div>
                   </div>
@@ -87,11 +87,11 @@
         },
 
         rules: {
-          name: [{required: true, message: '请输入姓名', trigger: 'blur'}, ],
-          phone: [{required: true, message: '请输入联系电话', trigger: 'blur'}, ],
-          address_1: [{required: true, message: '请输入详细地址 1', trigger: 'blur'}, ],
-          zone_id: [{required: true, message: '请选择省份', trigger: 'blur'}, ],
-          city: [{required: true, message: '请填写 city', trigger: 'blur'}, ],
+          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'}, ],
+          zone_id: [{required: true, message: '{{ __('shop/account.addresses.select_province') }}', trigger: 'blur'}, ],
+          city: [{required: true, message: '{{ __('shop/account.addresses.enter_city') }}', trigger: 'blur'}, ],
         }
       },
 
@@ -114,9 +114,9 @@
         },
 
         deleteAddress(index) {
-          this.$confirm('确定要删除地址吗？', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
+          this.$confirm('{{ __('shop/account.addresses.confirm_delete') }}', '{{ __('shop/account.addresses.hint') }}', {
+            confirmButtonText: '{{ __('shop/common.confirm') }}',
+            cancelButtonText: '{{ __('shop/common.cancel') }}',
             type: 'warning'
           }).then(() => {
             $http.delete('/account/addresses/' + this.addresses[index].id).then((res) => {
diff --git a/themes/default/account/wishlist.blade.php b/themes/default/account/wishlist.blade.php
index 533e47d4..752a2127 100644
--- a/themes/default/account/wishlist.blade.php
+++ b/themes/default/account/wishlist.blade.php
@@ -4,12 +4,15 @@
 
 @section('content')
   <div class="container">
-    <nav aria-label="breadcrumb">
+
+    <x-shop-breadcrumb type="static" value="account.wishlist.index" /> 
+
+    {{-- <nav aria-label="breadcrumb">
       <ol class="breadcrumb">
         <li class="breadcrumb-item"><a href="#">Home</a></li>
         <li class="breadcrumb-item active" aria-current="page">Library</li>
       </ol>
-    </nav>
+    </nav> --}}
 
     <div class="row">
       <x-shop-sidebar/>
diff --git a/themes/default/shared/address-form.blade.php b/themes/default/shared/address-form.blade.php
index 4e6ab7c7..12a53a61 100644
--- a/themes/default/shared/address-form.blade.php
+++ b/themes/default/shared/address-form.blade.php
@@ -34,7 +34,7 @@
         </div>
         <div class="col-4 mt-2 mt-sm-0">
           <el-form-item prop="city">
-            <el-input v-model="{{ $address_form_key }}.city" placeholder="输入 city"></el-input>
+            <el-input v-model="{{ $address_form_key }}.city" placeholder="输入城市"></el-input>
           </el-form-item>
         </div>
       </div>