pushuo
Edward Yang
parent
8f167ac2b0
commit
fb8ac8dea4
|
|
@ -57,21 +57,6 @@ class OrderController extends Controller
|
|||
return view('account/order_info', $data);
|
||||
}
|
||||
|
||||
/**
|
||||
* 订单提交成功页
|
||||
*
|
||||
* @param Request $request
|
||||
* @param $number
|
||||
* @return View
|
||||
*/
|
||||
public function success(Request $request, $number): View
|
||||
{
|
||||
$customer = current_customer();
|
||||
$order = OrderRepo::getOrderByNumber($number, $customer);
|
||||
|
||||
return view('account/order_success', ['order' => $order]);
|
||||
}
|
||||
|
||||
/**
|
||||
* 订单支付页面
|
||||
*
|
||||
|
|
|
|||
|
|
@ -80,7 +80,6 @@ Route::prefix('/')
|
|||
Route::put('checkout', [CheckoutController::class, 'update'])->name('checkout.update');
|
||||
Route::get('checkout/success', [CheckoutController::class, 'success'])->name('checkout.success');
|
||||
Route::post('checkout/confirm', [CheckoutController::class, 'confirm'])->name('checkout.confirm');
|
||||
Route::get('orders/{number}/success', [OrderController::class, 'success'])->name('orders.success');
|
||||
Route::get('orders/{number}/pay', [OrderController::class, 'pay'])->name('orders.pay');
|
||||
Route::post('orders/{number}/cancel', [OrderController::class, 'cancel'])->name('orders.cancel');
|
||||
Route::post('orders/{number}/complete', [OrderController::class, 'complete'])->name('orders.complete');
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
<meta name="asset" content="{{ asset('/') }}">
|
||||
<script src="{{ asset('vendor/vue/2.7/vue.js') }}"></script>
|
||||
<script src="{{ asset('vendor/element-ui/2.15.9/index.js') }}"></script>
|
||||
{{-- <script src="{{ asset('vendor/element-ui/2.15.6/js.js') }}"></script> --}}
|
||||
<script src="{{ asset('vendor/cookie/js.cookie.min.js') }}"></script>
|
||||
<script src="{{ asset('vendor/jquery/jquery-3.6.0.min.js') }}"></script>
|
||||
<script src="{{ asset('vendor/layer/3.5.1/layer.js') }}"></script>
|
||||
|
|
@ -151,7 +150,7 @@
|
|||
@close="uploadFileDialogClose" custom-class="upload-wrap">
|
||||
<el-upload class="photos-upload" target="photos-upload" id="photos-upload" element-loading-text="{{ __('admin/file_manager.image_uploading') }}..."
|
||||
element-loading-background="rgba(0, 0, 0, 0.6)" drag action="" :show-file-list="false"
|
||||
accept=".jpg,.jpeg,.png,.JPG,.JPEG,.PNG,.mp4,.MP4" :before-upload="beforePhotoUpload"
|
||||
accept=".jpg,.jpeg,.png,.JPG,.JPEG,.PNG,.mp4,.MP4,.gif,.webp" :before-upload="beforePhotoUpload"
|
||||
:on-success="handlePhotoSuccess" :on-change="handleUploadChange" :http-request="uploadFile"
|
||||
:multiple="true">
|
||||
<i class="el-icon-upload"></i>
|
||||
|
|
@ -299,10 +298,6 @@
|
|||
this.uploadFileDialog.show = true
|
||||
},
|
||||
|
||||
openFileSort() {
|
||||
console.log(11);
|
||||
},
|
||||
|
||||
beforePhotoUpload(file) {
|
||||
// this.editing.photoLoading = true;
|
||||
},
|
||||
|
|
@ -319,9 +314,6 @@
|
|||
uploadFile(file) {
|
||||
const that = this;
|
||||
let newFile = {};
|
||||
if (file.file.type != 'image/png' && file.file.type != 'image/jpeg') {
|
||||
return;
|
||||
}
|
||||
|
||||
var formData = new FormData();
|
||||
formData.append("file", file.file, file.file.name);
|
||||
|
|
|
|||
|
|
@ -1,57 +0,0 @@
|
|||
@extends('layout.master')
|
||||
|
||||
@section('body-class', 'page-order-success')
|
||||
|
||||
@section('content')
|
||||
<div class="container">
|
||||
|
||||
{{-- <x-shop-breadcrumb type="static" value="account.order.index" /> --}}
|
||||
|
||||
<div class="row mt-5 justify-content-center mb-5">
|
||||
<div class="col-12 col-md-9">@include('shared.steps', ['steps' => 3])</div>
|
||||
</div>
|
||||
|
||||
<div class="card order-wrap border">
|
||||
<div class="card-body main-body">
|
||||
<div class="order-top border-bottom">
|
||||
<div class="left">
|
||||
<i class="bi bi-check2-circle"></i>
|
||||
</div>
|
||||
<div class="right">
|
||||
<h3 class="order-title">{{ __('shop/account.order.order_success.order_success') }}</h3>
|
||||
<div class="order-info">
|
||||
<table class="table table-borderless">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>{{ __('shop/account.order.order_success.order_number') }}：<span class="fw-bold">{{ $order['number'] }}</span></td>
|
||||
<td>{{ __('shop/account.order.order_success.amounts_payable') }}：<span class="fw-bold">{{ currency_format($order['total']) }}</span></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>{{ __('shop/account.order.order_success.payment_method') }}：<span class="fw-bold">{{ $order['payment_method_name'] }}</span></td>
|
||||
@if (current_customer())
|
||||
<td><a href="{{ shop_route('account.order.show', ['number' => $order->number]) }}">{{ __('shop/account.order.order_success.view_order') }}</a></td>
|
||||
@endif
|
||||
</tr>
|
||||
<tr>
|
||||
<td><a href="{{ shop_route('orders.pay', [$order['number']]) }}" class="btn btn-primary">{{ __('shop/account.order.order_success.pay_now') }}</a></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="text-muted mt-4">{{ __('shop/account.order.order_success.kind_tips') }}</div>
|
||||
<div class="mt-3">{{ __('shop/account.order.order_success.also') }}：<a href="/">{{ __('shop/account.order.order_success.continue_purchase') }}</a></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="order-bottom">
|
||||
<div class="text-muted">{{ __('shop/account.order.order_success.contact_customer_service') }}：</div>
|
||||
<div>{{ __('shop/account.order.order_success.emaill') }}: {{ system_setting('base.email', '') }}</div>
|
||||
<div>{{ __('shop/account.order.order_success.service_hotline') }}: {{ system_setting('base.telephone', '') }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
@push('add-scripts')
|
||||
<script></script>
|
||||
@endpush
|
||||
|
|
@ -137,6 +137,8 @@
|
|||
</div>
|
||||
<button
|
||||
class="btn btn-outline-dark ms-md-3 add-cart fw-bold"
|
||||
:product-id="product.id"
|
||||
:product-price="product.price"
|
||||
:disabled="!product.quantity"
|
||||
@click="addCart(false, this)"
|
||||
><i class="bi bi-cart-fill me-1"></i>{{ __('shop/products.add_to_cart') }}
|
||||
|
|
@ -144,6 +146,8 @@
|
|||
<button
|
||||
class="btn btn-dark ms-3 fw-bold"
|
||||
:disabled="!product.quantity"
|
||||
:product-id="product.id"
|
||||
:product-price="product.price"
|
||||
@click="addCart(true, this)"
|
||||
><i class="bi bi-bag-fill me-1"></i>{{ __('shop/products.buy_now') }}
|
||||
</button>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,9 @@
|
|||
@if (!request('style_list') || request('style_list') == 'grid')
|
||||
<div class="button-wrap">
|
||||
<button
|
||||
class="btn btn-dark text-light mx-1 rounded-3"
|
||||
class="btn btn-dark text-light btn-quick-view mx-1 rounded-3"
|
||||
product-id="{{ $product['sku_id'] }}"
|
||||
product-price="{{ $product['price'] }}"
|
||||
data-bs-toggle="tooltip"
|
||||
data-bs-placement="top"
|
||||
title="{{ __('common.quick_view') }}"
|
||||
|
|
@ -20,7 +22,9 @@
|
|||
<i class="bi bi-eye"></i>
|
||||
</button>
|
||||
<button
|
||||
class="btn btn-dark text-light mx-1 rounded-3"
|
||||
class="btn btn-dark text-light btn-wishlist mx-1 rounded-3"
|
||||
product-id="{{ $product['sku_id'] }}"
|
||||
product-price="{{ $product['price'] }}"
|
||||
data-bs-toggle="tooltip"
|
||||
data-bs-placement="top"
|
||||
title="{{ __('shop/products.add_to_favorites') }}"
|
||||
|
|
@ -29,7 +33,9 @@
|
|||
<i class="bi bi-heart{{ $product['in_wishlist'] ? '-fill' : '' }}"></i>
|
||||
</button>
|
||||
<button
|
||||
class="btn btn-dark text-light mx-1 rounded-3"
|
||||
class="btn btn-dark text-light btn-add-cart mx-1 rounded-3"
|
||||
product-id="{{ $product['sku_id'] }}"
|
||||
product-price="{{ $product['price'] }}"
|
||||
data-bs-toggle="tooltip"
|
||||
data-bs-placement="top"
|
||||
title="{{ __('shop/products.add_to_cart') }}"
|
||||
|
|
|
|||
Loading…
Reference in New Issue