diff --git a/beike/Shop/Http/Controllers/Account/OrderController.php b/beike/Shop/Http/Controllers/Account/OrderController.php index c1a48d46..d4ab9c49 100644 --- a/beike/Shop/Http/Controllers/Account/OrderController.php +++ b/beike/Shop/Http/Controllers/Account/OrderController.php @@ -54,7 +54,6 @@ class OrderController extends Controller { $customer = current_customer(); $order = OrderRepo::getOrderByNumber($number, $customer); - dd($order); - return view('account/order_success', ['data' => $order]); + return view('account/order_success', ['order' => $order]); } } diff --git a/public/build/beike/shop/default/css/app.css b/public/build/beike/shop/default/css/app.css index 27c2b326..9599c97e 100644 --- a/public/build/beike/shop/default/css/app.css +++ b/public/build/beike/shop/default/css/app.css @@ -670,3 +670,43 @@ body.page-checkout .radio-line-wrap .radio-line-item .right .title { .el-input__inner { border-radius: 0 !important; } + +body.page-order-success .order-wrap .card-body { + padding: 3rem; + padding-left: 7rem; +} +body.page-order-success .order-wrap .card-body .order-top { + border-bottom: 1px solid #eee; + padding-bottom: 2.7rem; + margin-bottom: 2.7rem; + display: flex; + justify-content: center; +} +body.page-order-success .order-wrap .card-body .order-top .left { + margin-top: -6px; +} +body.page-order-success .order-wrap .card-body .order-top .left i { + color: #4caf50; + font-size: 80px; + line-height: 1; +} +body.page-order-success .order-wrap .card-body .order-top .right { + flex: 1; + margin-left: 2rem; +} +body.page-order-success .order-wrap .card-body .order-top .right .table { + margin-bottom: 0; +} +body.page-order-success .order-wrap .card-body .order-top .right .order-title { + margin-bottom: 1.2rem; + font-weight: 400; +} +body.page-order-success .order-wrap .card-body .order-top .right .order-info { + padding: 0.7rem; + background-color: #fffaf0; + border: 1px solid #ffe1ad; +} +body.page-order-success .order-wrap .card-body .order-bottom { + margin-left: calc(2rem + 80px); + line-height: 2; +} diff --git a/public/build/beike/shop/default/css/bootstrap.css b/public/build/beike/shop/default/css/bootstrap.css index a86debce..62a67763 100644 --- a/public/build/beike/shop/default/css/bootstrap.css +++ b/public/build/beike/shop/default/css/bootstrap.css @@ -6976,7 +6976,7 @@ sup { } a { - color: #1f1f1f; + color: #3480e7; text-decoration: none; } a:hover { @@ -10210,7 +10210,7 @@ textarea.form-control-lg { .btn-link { font-weight: 400; - color: #1f1f1f; + color: #3480e7; text-decoration: none; } .btn-link:hover { @@ -10681,7 +10681,7 @@ textarea.form-control-lg { .nav-link { display: block; padding: 0.5rem 1rem; - color: #1f1f1f; + color: #3480e7; transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out; } @media (prefers-reduced-motion: reduce) { @@ -11541,7 +11541,7 @@ textarea.form-control-lg { .page-link { position: relative; display: block; - color: #1f1f1f; + color: #3480e7; background-color: #fff; border: 1px solid #dee2e6; transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; diff --git a/resources/beike/shop/default/css/app.scss b/resources/beike/shop/default/css/app.scss index 7590b1f0..b19851bb 100644 --- a/resources/beike/shop/default/css/app.scss +++ b/resources/beike/shop/default/css/app.scss @@ -17,3 +17,4 @@ $primary: #fd560f; @import './cart'; @import './page-checkout'; @import './element-ui'; +@import './order-success'; diff --git a/resources/beike/shop/default/css/bootstrap/bootstrap.scss b/resources/beike/shop/default/css/bootstrap/bootstrap.scss index 2b8d5d2e..677a5ce7 100644 --- a/resources/beike/shop/default/css/bootstrap/bootstrap.scss +++ b/resources/beike/shop/default/css/bootstrap/bootstrap.scss @@ -35,7 +35,7 @@ $input-btn-font-size: 0.9rem; // $input-btn-padding-x: .75rem !default; $link-decoration: none; -$link-color: #1f1f1f; +$link-color: #3480e7; $link-hover-color: $primary; $btn-focus-box-shadow: 0 0 11px 0 rgba($color: $primary, $alpha: .1); $input-btn-focus-box-shadow: 0 0 11px 0 rgba($color: $primary, $alpha: .1); diff --git a/resources/beike/shop/default/css/order-success.scss b/resources/beike/shop/default/css/order-success.scss new file mode 100644 index 00000000..071de7d3 --- /dev/null +++ b/resources/beike/shop/default/css/order-success.scss @@ -0,0 +1,53 @@ +@charset "UTF-8"; + +body.page-order-success { + .order-wrap { + .card-body { + padding: 3rem; + padding-left: 7rem; + + .order-top { + border-bottom: 1px solid #eee; + padding-bottom: 2.7rem; + margin-bottom: 2.7rem; + display: flex; + justify-content: center; // flex-end | center | space-between + + .left { + margin-top: -6px; + + i { + color: #4caf50; + font-size: 80px; + line-height: 1; + } + } + + .right { + flex: 1; + margin-left: 2rem; + + .table { + margin-bottom: 0; + } + + .order-title { + margin-bottom: 1.2rem; + font-weight: 400; + } + + .order-info { + padding: .7rem; + background-color: #fffaf0; + border: 1px solid #ffe1ad; + } + } + } + + .order-bottom { + margin-left: calc(2rem + 80px); + line-height: 2; + } + } + } +} \ No newline at end of file diff --git a/themes/default/account/order_success.blade.php b/themes/default/account/order_success.blade.php index e69de29b..f2afa568 100644 --- a/themes/default/account/order_success.blade.php +++ b/themes/default/account/order_success.blade.php @@ -0,0 +1,56 @@ +@extends('layout.master') + +@section('body-class', 'page-order-success') + +@section('content') +
+ + +
+
@include('shared.steps', ['steps' => 3])
+
+ +
+
+
+
+ +
+
+

恭喜您，订单生成成功！

+
+ + + + + + + + + + + +
订单编号：{{ $order['number'] }}应付金额：{{ $order['total'] }}
支付方式：{{ $order['payment_method_name'] }}查看订单详情
+
+ +
温馨提示：温馨提示温馨提示温馨提示温馨提示温馨提示温馨提示温馨提示
+
您还可以：继续采购
+
+
+
+
如果您在订单过程中有任何问题，可以随时联系我们客服人员：
+
Emaill: ceshi@opencart.cn
+
服务热线: +86 1878017xxxx
+
+
+
+
+@endsection +@push('add-scripts') + +@endpush \ No newline at end of file diff --git a/themes/default/checkout.blade.php b/themes/default/checkout.blade.php index 8f13791b..26b0f6e6 100644 --- a/themes/default/checkout.blade.php +++ b/themes/default/checkout.blade.php @@ -288,8 +288,7 @@ checkedBtnCheckoutConfirm() { $http.post('/checkout/confirm', this.form).then((res) => { - - location = 'orders/' + res.number + '/success&type=create' + location = 'orders/' + res.number + '/success?type=create' }) } }