From 7f08b8c97c7130f87df5302e829e01c73045d90f Mon Sep 17 00:00:00 2001
From: sl <2436637291@qq.com>
Date: Thu, 18 Aug 2022 11:49:33 +0800
Subject: [PATCH] wip

---
 resources/lang/zh_cn/shop/account.php      | 16 +++++++-
 themes/default/account/account.blade.php   | 32 +++++++--------
 themes/default/account/edit.blade.php      |  7 +++-
 themes/default/account/forgotten.blade.php | 45 ++++++++++++----------
 4 files changed, 60 insertions(+), 40 deletions(-)

diff --git a/resources/lang/zh_cn/shop/account.php b/resources/lang/zh_cn/shop/account.php
index f03c305d..189d3f36 100644
--- a/resources/lang/zh_cn/shop/account.php
+++ b/resources/lang/zh_cn/shop/account.php
@@ -12,7 +12,21 @@
 return [
     'index' => '个人中心',
     'revise_info' => '修改信息',
-
+    'collect' => '收藏',
+    'coupon' => '优惠券',
+    'my_order' => '我的订单',
+    'orders' => '全部订单',
+    'pending_payment' => '待付款',
+    'pending_send' => '待发货',
+    'pending_receipt' => '待收货',
+    'after_sales' => '售后',
+    'no_order' => '您还没有订单！',
+    'to_buy' => '去下单',
+    'order_number' => '订单号',
+    'order_time' => '下单时间',
+    'state' => '状态',
+    'amount' => '金额',
+    'check_details' => '查看详情',
 
     'wishlist' => [
         'index' => '收藏列表',
diff --git a/themes/default/account/account.blade.php b/themes/default/account/account.blade.php
index 7d9eb054..a4d4bda0 100644
--- a/themes/default/account/account.blade.php
+++ b/themes/default/account/account.blade.php
@@ -19,7 +19,7 @@
             </ul>
           </div>
         @endif
-        @if (1)
+        @if (0)
         <div class="card mb-4 account-card">
           <div class="card-header d-flex justify-content-between align-items-center">
             <h5 class="card-title">{{ __('shop/account.index') }}</h5>
@@ -28,36 +28,36 @@
           <div class="card-body">
             <div class="d-flex flex-nowrap card-items py-2">
               <a href="{{ shop_route('account.wishlist.index') }}" class="d-flex flex-column align-items-center"><i class="iconfont">&#xe77f;</i><span
-                  class="text-muted">收藏</span></a>
+                  class="text-muted">{{ __('shop/account.collect') }}</span></a>
               <a href="http://" class="d-flex flex-column align-items-center"><i class="iconfont">&#xe6a3;</i><span
-                  class="text-muted">优惠券</span></a>
+                  class="text-muted">{{ __('shop/account.coupon') }}</span></a>
               <a href="http://" class="d-flex flex-column align-items-center"><i class="iconfont">&#xe6a3;</i><span
-                  class="text-muted">优惠券</span></a>
+                  class="text-muted">{{ __('shop/account.coupon') }}</span></a>
             </div>
           </div>
         </div>
         @endif
         <div class="card account-card">
           <div class="card-header d-flex justify-content-between align-items-center">
-            <h5 class="card-title">我的订单</h5>
-            <a href="{{ shop_route('account.order.index') }}" class="text-muted">全部订单</a>
+            <h5 class="card-title">{{ __('shop/account.my_order') }}</h5>
+            <a href="{{ shop_route('account.order.index') }}" class="text-muted">{{ __('shop/account.orders') }}</a>
           </div>
           <div class="card-body">
             <div class="d-flex flex-nowrap card-items mb-4 py-3">
               <a href="{{ shop_route('account.order.index', ['status' => 'unpaid']) }}" class="d-flex flex-column align-items-center"><i class="iconfont">&#xf12f;</i><span
-                  class="text-muted">待付款</span></a>
+                  class="text-muted">{{ __('shop/account.pending_payment') }}</span></a>
               <a href="{{ shop_route('account.order.index', ['status' => 'paid']) }}" class="d-flex flex-column align-items-center"><i class="iconfont">&#xf130;</i><span
-                  class="text-muted">待发货</span></a>
+                  class="text-muted">{{ __('shop/account.pending_send') }}</span></a>
               <a href="{{ shop_route('account.order.index', ['status' => 'shipped']) }}" class="d-flex flex-column align-items-center"><i class="iconfont">&#xf131;</i><span
-                  class="text-muted">待收货</span></a>
+                  class="text-muted">{{ __('shop/account.pending_receipt') }}</span></a>
               <a href="{{ shop_route('account.rma.index') }}" class="d-flex flex-column align-items-center"><i class="iconfont">&#xf132;</i><span
-                  class="text-muted">售后</span></a>
+                  class="text-muted">{{ __('shop/account.after_sales') }}</span></a>
             </div>
             <div class="order-wrap">
               @if (!$latest_orders)
                 <div class="no-order d-flex flex-column align-items-center">
                   <div class="icon mb-2"><i class="iconfont">&#xe60b;</i></div>
-                  <div class="text mb-3 text-muted">您还没有订单！<a href="">去下单</a></div>
+                  <div class="text mb-3 text-muted">{{ __('shop/account.no_order') }}<a href="">{{ __('shop/account.to_buy') }}</a></div>
                 </div>
               @else
                 {{-- <p class="text-muted">近期订单</p> --}}
@@ -72,19 +72,19 @@
                           </div>
                         </td>
                         <td>
-                          <div class="mb-2">订单号：{{ $order->number }} <span class="vr lh-1 mx-2 bg-secondary"></span> 共 {{ count($order->orderProducts) }} 件商品</div>
-                          <div class="text-muted">下单时间：{{ $order->created_at }}</div>
+                          <div class="mb-2">{{ __('shop/account.order_number') }}：{{ $order->number }} <span class="vr lh-1 mx-2 bg-secondary"></span> 共 {{ count($order->orderProducts) }} 件商品</div>
+                          <div class="text-muted">{{ __('shop/account.order_time') }}：{{ $order->created_at }}</div>
                         </td>
                         <td>
-                          <span class="ms-4 d-inline-block">状态：{{ $order->status }}</span>
+                          <span class="ms-4 d-inline-block">{{ __('shop/account.state') }}：{{ $order->status }}</span>
                         </td>
                         <td>
-                          <span class="ms-3 d-inline-block">金额：{{ $order->total }}</span>
+                          <span class="ms-3 d-inline-block">{{ __('shop/account.amount') }}：{{ $order->total }}</span>
                         </td>
 
                         <td>
                           <a href="{{ shop_route('account.order.show', ['number' => $order->number]) }}"
-                            class="btn btn-outline-secondary btn-sm">查看详情</a>
+                            class="btn btn-outline-secondary btn-sm">{{ __('shop/account.check_details') }}</a>
                         </td>
                       </tr>
                       @endforeach
diff --git a/themes/default/account/edit.blade.php b/themes/default/account/edit.blade.php
index 158a7ab4..c6145083 100644
--- a/themes/default/account/edit.blade.php
+++ b/themes/default/account/edit.blade.php
@@ -10,12 +10,15 @@
 
 @section('content')
   <div class="container" id="address-app">
-    <nav aria-label="breadcrumb">
+
+    <x-shop-breadcrumb type="static" value="account.edit.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/account/forgotten.blade.php b/themes/default/account/forgotten.blade.php
index e9458aec..d4de5a67 100644
--- a/themes/default/account/forgotten.blade.php
+++ b/themes/default/account/forgotten.blade.php
@@ -11,42 +11,45 @@
 
 @section('content')
   <div class="container" id="page-forgotten" v-cloak>
-    <nav aria-label="breadcrumb">
+
+    <x-shop-breadcrumb type="static" value="forgotten.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="hero-content pb-5 text-center"><h1 class="hero-heading">找回密码</h1></div> --}}
     <div class="row my-5 justify-content-md-center">
       <div class="col-lg-5 col-xxl-4">
         <div class="card">
           <el-form ref="form" :model="form" :rules="rules">
             <div class="card-body p-0">
-              <h4 class="fw-bold">请根据提示找回您的密码</h4>
-              <p class="text-muted" v-if="!isCode">请输入邮箱地址获取验证码</p>
-              <p class="text-muted" v-else>请输入新密码</p>
+              <h4 class="fw-bold">{{ __('shop/forgotten.follow_prompt') }}</h4>
+              <p class="text-muted" v-if="!isCode">{{ __('shop/forgotten.email_forCode') }}</p>
+              <p class="text-muted" v-else>{{ __('shop/forgotten.enter_password') }}</p>
 
-              <el-form-item label="邮箱" prop="email" v-if="!isCode">
-                <el-input v-model="form.email" placeholder="邮箱地址"></el-input>
+              <el-form-item label="{{ __('shop/forgotten.email') }}" prop="email" v-if="!isCode">
+                <el-input v-model="form.email" placeholder="{{ __('shop/forgotten.email_address') }}"></el-input>
               </el-form-item>
 
-              <el-form-item label="验证码" prop="code" class="mb-3" v-if="isCode">
-                <el-input  v-model="form.code" placeholder="密码"></el-input>
+              <el-form-item label="{{ __('shop/forgotten.verification_code') }}" prop="code" class="mb-3" v-if="isCode">
+                <el-input  v-model="form.code" placeholder="{{ __('shop/forgotten.verification_code') }}"></el-input>
               </el-form-item>
 
-              <el-form-item label="密码" prop="password" class="mb-3" v-if="isCode">
-                <el-input type="password" v-model="form.password" placeholder="密码"></el-input>
+              <el-form-item label="{{ __('shop/forgotten.password') }}" prop="password" class="mb-3" v-if="isCode">
+                <el-input type="password" v-model="form.password" placeholder="{{ __('shop/forgotten.password') }}"></el-input>
               </el-form-item>
 
-              <el-form-item label="确认密码" prop="password_confirmation" v-if="isCode">
-                <el-input type="password" v-model="form.password_confirmation" placeholder="确认密码"></el-input>
+              <el-form-item label="{{ __('shop/forgotten.confirm_password') }}" prop="password_confirmation" v-if="isCode">
+                <el-input type="password" v-model="form.password_confirmation" placeholder="{{ __('shop/forgotten.confirm_password') }}"></el-input>
               </el-form-item>
 
               <div class="mt-5 mb-3 d-flex justify-content-between">
-                <button type="button" @click="submitForm('form')" class="btn w-50 btn-dark">@{{ !isCode ? '发送验证码' : '提交' }}</button>
+                <button type="button" @click="submitForm('form')" class="btn w-50 btn-dark">@{{ !isCode ? '发送验证码'  :  '提交'  }}</button>
               </div>
-              <a href="javascript:void(0)" v-if="isCode" @click="isCode = false" class="text-muted">返回上一步</a>
+              <a href="javascript:void(0)" v-if="isCode" @click="isCode = false" class="text-muted">{{ __('shop/forgotten.to_back') }}</a>
             </div>
           </el-form>
         </div>
@@ -59,7 +62,7 @@
   <script>
     var validatePass = (rule, value, callback) => {
       if (value === '') {
-        callback(new Error('请输入密码'));
+        callback(new Error('{{ __('shop/forgotten.enter_password') }}'));
       } else {
         if (value !== '') {
           app.$refs.form.validateField('password_confirmation');
@@ -70,9 +73,9 @@
 
     var validatePass2 = (rule, value, callback) => {
       if (value === '') {
-        callback(new Error('请输入确认密码'));
+        callback(new Error('{{ __('shop/forgotten.please_confirm') }}'));
       } else if (value !== app.form.password) {
-        callback(new Error('两次输入密码不一致!'));
+        callback(new Error('{{ __('shop/forgotten.password_err') }}'));
       } else {
         callback();
       }
@@ -93,11 +96,11 @@
 
         rules: {
           email: [
-            {required: true, message: '请输入邮箱', trigger: 'blur'},
-            {type: 'email', message: '请输入正确邮箱地址', trigger: 'blur'},
+            {required: true, message: '{{ __('shop/forgotten.enter_email') }}', trigger: 'blur'},
+            {type: 'email', message: '{{ __('shop/forgotten.email_err') }}', trigger: 'blur'},
           ],
           code: [
-            {required: true, message: '请输入验证码', trigger: 'blur'}
+            {required: true, message: '{{ __('shop/forgotten.enter_code') }}', trigger: 'blur'}
           ],
           password: [
             {required: true, validator: validatePass, trigger: 'blur'}