From 0bd3580af59a3d61175fa3b5d72c492d332ee8f3 Mon Sep 17 00:00:00 2001 From: sl <2436637291@qq.com> Date: Thu, 18 Aug 2022 16:27:39 +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 | 34 +++++++++++++++++ themes/default/account/order_info.blade.php | 37 ++++++++++--------- .../default/account/order_success.blade.php | 25 +++++++------ 3 files changed, 68 insertions(+), 28 deletions(-) diff --git a/resources/lang/zh_cn/shop/account.php b/resources/lang/zh_cn/shop/account.php index db62ba7e..f1975178 100644 --- a/resources/lang/zh_cn/shop/account.php +++ b/resources/lang/zh_cn/shop/account.php @@ -50,6 +50,40 @@ return [ 'operate' => '操作', 'order_number' => '订单号', 'check' => '查看', + + 'order_info' => [ + 'index' => '订单详情', + 'order_details' => '订单详情', + 'to_pay' => '去支付', + 'confirm_receipt' => '确认收货', + 'order_number' => '订单号', + 'order_date' => '下单日期', + 'state' => '状态', + 'order_amount' => '订单金额', + 'order_items' => '订购商品', + 'apply_after_sales' => '申请售后', + 'order_total' => '合计订单', + 'logistics_status' => '物流状态', + 'order_status' => '订单状态', + 'remark' => '备注', + 'update_time' => '更新时间', + ], + + 'order_success' => [ + 'order_success' => '恭喜您，订单生成成功！', + 'order_number' => '订单编号', + 'amounts_payable' => '应付金额 ', + 'payment_method' => '支付方式 ', + 'view_order' => '查看订单详情 ', + 'pay_now' => '立即支付 ', + 'kind_tips' => '温馨提示：您的订单已生成成功，请尽快完成支付哦～ ', + 'also' => '您还可以', + 'continue_purchase' => '继续采购', + 'contact_customer_service' => '如果您在订单过程中有任何问题，可以随时联系我们客服人员', + 'emaill' => '邮箱', + 'service_hotline' => '服务热线', + ], + ], 'addresses' => [ diff --git a/themes/default/account/order_info.blade.php b/themes/default/account/order_info.blade.php index 6a964188..56cddb90 100644 --- a/themes/default/account/order_info.blade.php +++ b/themes/default/account/order_info.blade.php @@ -4,12 +4,15 @@ @section('content')
- --}}
@@ -17,13 +20,13 @@
-
订单详情
+
{{ __('shop/account.order.order_info.order_details') }}
@if ($order->status == 'unpaid') - 去支付 + {{ __('shop/account.order.order_info.to_pay') }} @endif @if ($order->status == 'shipped') - + @endif
@@ -33,10 +36,10 @@ - - - - + + + + @@ -56,7 +59,7 @@
-
订购商品
+
{{ __('shop/account.order.order_info.order_items') }}
@foreach ($order->orderProducts as $product) @@ -70,7 +73,7 @@
@if ($order->status == 'completed') 申请售后 + class="btn btn-outline-primary btn-sm">{{ __('shop/account.order.order_info.apply_after_sales') }} @endif
@endforeach @@ -79,7 +82,7 @@
-
Order Total
+
{{ __('shop/account.order.order_info.order_total') }}
订单号下单日期状态订单金额{{ __('shop/account.order.order_info.order_number') }}{{ __('shop/account.order.order_info.order_date') }}{{ __('shop/account.order.order_info.state') }}{{ __('shop/account.order.order_info.order_amount') }}
@@ -100,7 +103,7 @@ @if (0)
-
物流状态
+
{{ __('shop/account.order.order_info.logistics_status') }}
@@ -111,15 +114,15 @@ @if ($order->orderHistories->count())
-
订单状态
+
{{ __('shop/account.order.order_info.order_status') }}
- - - + + + diff --git a/themes/default/account/order_success.blade.php b/themes/default/account/order_success.blade.php index 944803c5..2c497fa0 100644 --- a/themes/default/account/order_success.blade.php +++ b/themes/default/account/order_success.blade.php @@ -4,6 +4,9 @@ @section('content')
+ + +
@include('shared.steps', ['steps' => 3])
@@ -15,33 +18,33 @@
-

恭喜您，订单生成成功！

+

{{ __('shop/account.order.order_success.order_success') }}

状态备注更新时间{{ __('shop/account.order.order_info.state') }}{{ __('shop/account.order.order_info.remark') }}{{ __('shop/account.order.order_info.update_time') }}
- - + + - - + + - +
订单编号：{{ $order['number'] }}应付金额：{{ $order['total'] }}{{ __('shop/account.order.order_success.order_number') }}：{{ $order['number'] }}{{ __('shop/account.order.order_success.amounts_payable') }}：{{ $order['total'] }}
支付方式：{{ $order['payment_method_name'] }}查看订单详情{{ __('shop/account.order.order_success.payment_method') }}：{{ $order['payment_method_name'] }}{{ __('shop/account.order.order_success.view_order') }}
立即支付{{ __('shop/account.order.order_success.pay_now') }}
-
温馨提示：您的订单已生成成功，请尽快完成支付哦～
-
您还可以：继续采购
+
{{ __('shop/account.order.order_success.kind_tips') }}
+
{{ __('shop/account.order.order_success.also') }}：{{ __('shop/account.order.order_success.continue_purchase') }}
-
如果您在订单过程中有任何问题，可以随时联系我们客服人员：
-
Emaill: {{ system_setting('base.email', '') }}
-
服务热线: {{ system_setting('base.telephone', '') }}
+
{{ __('shop/account.order.order_success.contact_customer_service') }}：
+
{{ __('shop/account.order.order_success.emaill') }}: {{ system_setting('base.email', '') }}
+
{{ __('shop/account.order.order_success.service_hotline') }}: {{ system_setting('base.telephone', '') }}