From b595085b7ec6e616d7ef369caa385ffb1e00bb6a Mon Sep 17 00:00:00 2001 From: pushuo Date: Wed, 10 May 2023 10:37:27 +0000 Subject: [PATCH] !92 Optimize the checkout process * wip * wip * wip * wip * wip * wip * Optimize the checkout process --- .../Stripe/Views/checkout/payment.blade.php | 8 ++- resources/beike/admin/css/_sidebar.scss | 2 + .../views/pages/products/form/form.blade.php | 17 +++++- resources/lang/en/common.php | 2 + resources/lang/es/admin/common.php | 24 ++++---- resources/lang/fr/admin/common.php | 36 ++++++------ resources/lang/it/admin/common.php | 32 +++++------ resources/lang/ru/admin/common.php | 42 +++++++------- resources/lang/zh_cn.zip | Bin 46608 -> 0 bytes resources/lang/zh_cn/admin/dashboard.php | 2 +- resources/lang/zh_cn/common.php | 2 + resources/lang/zh_cn/shop/login.php | 4 +- resources/lang/zh_hk/common.php | 2 + themes/default/account/address.blade.php | 2 +- themes/default/checkout.blade.php | 2 +- themes/default/checkout/payment.blade.php | 2 +- themes/default/checkout/success.blade.php | 53 ++++++++++++++++-- themes/default/shared/steps.blade.php | 10 +--- 18 files changed, 153 insertions(+), 89 deletions(-) delete mode 100644 resources/lang/zh_cn.zip diff --git a/plugins/Stripe/Views/checkout/payment.blade.php b/plugins/Stripe/Views/checkout/payment.blade.php index dbacb32b..2a5c3ead 100644 --- a/plugins/Stripe/Views/checkout/payment.blade.php +++ b/plugins/Stripe/Views/checkout/payment.blade.php @@ -100,8 +100,12 @@ $http.post(`/stripe/capture`, this.form).then((res) => { layer.msg(res.message) - console.log(res) - location = "{{ shop_route('account.order.show', ['number' => $order->number]) }}" + + @if (current_customer()) + location = "{{ shop_route('account.order.show', ['number' => $order->number]) }}" + @else + location = "{{ shop_route('checkout.success', ['order_number' => $order->number]) }}" + @endif }) }); } diff --git a/resources/beike/admin/css/_sidebar.scss b/resources/beike/admin/css/_sidebar.scss index 90e4322f..909f917a 100644 --- a/resources/beike/admin/css/_sidebar.scss +++ b/resources/beike/admin/css/_sidebar.scss @@ -71,6 +71,8 @@ color: #333; display: flex; text-decoration: none; + // 文字强制换行 + // word-break: break-all; i { margin-right: 7px; diff --git a/resources/beike/admin/views/pages/products/form/form.blade.php b/resources/beike/admin/views/pages/products/form/form.blade.php index fcd50a33..cb956c25 100644 --- a/resources/beike/admin/views/pages/products/form/form.blade.php +++ b/resources/beike/admin/views/pages/products/form/form.blade.php @@ -11,7 +11,7 @@ @endpush @section('page-title-right') - + @endsection @section('content') @@ -197,7 +197,7 @@
- +
@@ -236,7 +236,7 @@
- + @@ -497,6 +497,17 @@ @push('footer')