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 @@ @endif - @if (1) + @if (0)
{{ __('shop/account.index') }}
@@ -28,36 +28,36 @@
收藏 + class="text-muted">{{ __('shop/account.collect') }} 优惠券 + class="text-muted">{{ __('shop/account.coupon') }} 优惠券 + class="text-muted">{{ __('shop/account.coupon') }}
@endif
-
我的订单
- 全部订单 +
{{ __('shop/account.my_order') }}
+ {{ __('shop/account.orders') }}
待付款 + class="text-muted">{{ __('shop/account.pending_payment') }} 待发货 + class="text-muted">{{ __('shop/account.pending_send') }} 待收货 + class="text-muted">{{ __('shop/account.pending_receipt') }} 售后 + class="text-muted">{{ __('shop/account.after_sales') }}
@if (!$latest_orders)
-
您还没有订单!去下单
+
{{ __('shop/account.no_order') }}{{ __('shop/account.to_buy') }}
@else {{--

近期订单

--}} @@ -72,19 +72,19 @@
-
订单号:{{ $order->number }} 共 {{ count($order->orderProducts) }} 件商品
-
下单时间:{{ $order->created_at }}
+
{{ __('shop/account.order_number') }}:{{ $order->number }} 共 {{ count($order->orderProducts) }} 件商品
+
{{ __('shop/account.order_time') }}:{{ $order->created_at }}
- 状态:{{ $order->status }} + {{ __('shop/account.state') }}:{{ $order->status }} - 金额:{{ $order->total }} + {{ __('shop/account.amount') }}:{{ $order->total }} 查看详情 + class="btn btn-outline-secondary btn-sm">{{ __('shop/account.check_details') }} @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')
- --}}
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')
- --}} {{--

找回密码

--}}
-

请根据提示找回您的密码

-

请输入邮箱地址获取验证码

-

请输入新密码

+

{{ __('shop/forgotten.follow_prompt') }}

+

{{ __('shop/forgotten.email_forCode') }}

+

{{ __('shop/forgotten.enter_password') }}

- - + + - - + + - - + + - - + +
- +
- 返回上一步 + {{ __('shop/forgotten.to_back') }}
@@ -59,7 +62,7 @@