diff --git a/beike/Shop/Http/Controllers/Account/OrderController.php b/beike/Shop/Http/Controllers/Account/OrderController.php index 17a96621..ec169038 100644 --- a/beike/Shop/Http/Controllers/Account/OrderController.php +++ b/beike/Shop/Http/Controllers/Account/OrderController.php @@ -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]); - } - /** * 订单支付页面 * diff --git a/beike/Shop/Routes/shop.php b/beike/Shop/Routes/shop.php index 2c9f1c2f..ff180a80 100644 --- a/beike/Shop/Routes/shop.php +++ b/beike/Shop/Routes/shop.php @@ -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'); diff --git a/resources/beike/admin/views/pages/file_manager/index.blade.php b/resources/beike/admin/views/pages/file_manager/index.blade.php index 05f093ce..ca8d5972 100644 --- a/resources/beike/admin/views/pages/file_manager/index.blade.php +++ b/resources/beike/admin/views/pages/file_manager/index.blade.php @@ -9,7 +9,6 @@ - {{-- --}} @@ -151,7 +150,7 @@ @close="uploadFileDialogClose" custom-class="upload-wrap"> @@ -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); diff --git a/themes/default/account/order_success.blade.php b/themes/default/account/order_success.blade.php deleted file mode 100644 index 967b0655..00000000 --- a/themes/default/account/order_success.blade.php +++ /dev/null @@ -1,57 +0,0 @@ -@extends('layout.master') - -@section('body-class', 'page-order-success') - -@section('content') -
- - {{-- --}} - -
-
@include('shared.steps', ['steps' => 3])
-
- -
-
-
-
- -
-
-

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

-
- - - - - - - - - @if (current_customer()) - - @endif - - - - - -
{{ __('shop/account.order.order_success.order_number') }}:{{ $order['number'] }}{{ __('shop/account.order.order_success.amounts_payable') }}:{{ currency_format($order['total']) }}
{{ __('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') }}
-
-
-
-
{{ __('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', '') }}
-
-
-
-
-@endsection -@push('add-scripts') - -@endpush diff --git a/themes/default/product.blade.php b/themes/default/product.blade.php index eb1eaf7a..0f1511cf 100644 --- a/themes/default/product.blade.php +++ b/themes/default/product.blade.php @@ -137,6 +137,8 @@ diff --git a/themes/default/shared/product.blade.php b/themes/default/shared/product.blade.php index da8f837f..94a16caa 100644 --- a/themes/default/shared/product.blade.php +++ b/themes/default/shared/product.blade.php @@ -12,7 +12,9 @@ @if (!request('style_list') || request('style_list') == 'grid')