From b964a7ea73a3eff3368de62c04a4be7fdc0f8e2e Mon Sep 17 00:00:00 2001 From: pushuo <229102104@qq.com> Date: Mon, 29 Aug 2022 09:40:00 +0800 Subject: [PATCH] https://guangdagit.com/beike/beikeshop/issues/202 --- .../Admin/Providers/AdminServiceProvider.php | 2 + beike/Admin/View/Components/NoData.php | 20 +++ public/image/no-data.svg | 97 +++++++++++++ .../admin/views/components/no-data.blade.php | 4 + .../admin/views/pages/orders/index.blade.php | 136 ++++++++++-------- .../admin/views/pages/rmas/index.blade.php | 78 +++++----- resources/lang/en/common.php | 1 + resources/lang/zh_cn/common.php | 1 + 8 files changed, 238 insertions(+), 101 deletions(-) create mode 100644 beike/Admin/View/Components/NoData.php create mode 100644 public/image/no-data.svg create mode 100644 resources/beike/admin/views/components/no-data.blade.php diff --git a/beike/Admin/Providers/AdminServiceProvider.php b/beike/Admin/Providers/AdminServiceProvider.php index 55fc0e95..b207f477 100644 --- a/beike/Admin/Providers/AdminServiceProvider.php +++ b/beike/Admin/Providers/AdminServiceProvider.php @@ -11,6 +11,7 @@ use Beike\Admin\View\Components\Filter; use Beike\Admin\View\Components\Header; use Beike\Admin\View\Components\Sidebar; use Beike\Admin\View\Components\Alert; +use Beike\Admin\View\Components\NoData; use Beike\Admin\View\Components\Form\Image; use Beike\Admin\View\Components\Form\Input; use Beike\Admin\View\Components\Form\Select; @@ -57,6 +58,7 @@ class AdminServiceProvider extends ServiceProvider 'form-select' => Select::class, 'form-image' => Image::class, 'form-textarea' => Textarea::class, + 'no-data' => NoData::class, ]); $this->registerGuard(); diff --git a/beike/Admin/View/Components/NoData.php b/beike/Admin/View/Components/NoData.php new file mode 100644 index 00000000..67e2e262 --- /dev/null +++ b/beike/Admin/View/Components/NoData.php @@ -0,0 +1,20 @@ +text = $text ?: trans('common.no_data'); + } + + public function render() + { + return view('admin::components.no-data'); + } +} diff --git a/public/image/no-data.svg b/public/image/no-data.svg new file mode 100644 index 00000000..2e95e923 --- /dev/null +++ b/public/image/no-data.svg @@ -0,0 +1,97 @@ + + 暂无数据 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/beike/admin/views/components/no-data.blade.php b/resources/beike/admin/views/components/no-data.blade.php new file mode 100644 index 00000000..44ecd46f --- /dev/null +++ b/resources/beike/admin/views/components/no-data.blade.php @@ -0,0 +1,4 @@ +
+ +
{{ $text }}
+
\ No newline at end of file diff --git a/resources/beike/admin/views/pages/orders/index.blade.php b/resources/beike/admin/views/pages/orders/index.blade.php index 385fed4b..4af7575b 100644 --- a/resources/beike/admin/views/pages/orders/index.blade.php +++ b/resources/beike/admin/views/pages/orders/index.blade.php @@ -3,76 +3,86 @@ @section('title', __('admin/order.list')) @section('content') -
+
-
- -
- - + @if (count($orders)) +
+ +
+ + + + + + + + + + +
+ + + + + + - + + + + - - - - - - -
- - - - - - - - - - - + -
- -
- - - +
+ +
+ + + +
-
- - - - - - - - - - - - - - - - @foreach ($orders as $order) +
{{ __('order.id') }}{{ __('order.number') }}{{ __('order.customer_name') }}{{ __('order.payment_method') }}{{ __('order.status') }}{{ __('order.total') }}{{ __('order.created_at') }}{{ __('order.updated_at') }}{{ __('common.action') }}
+ - - - - - - - - - + + + + + + + + + - @endforeach - -
{{ $order->id }}{{ $order->number }}{{ sub_string($order->customer_name, 14) }}{{ $order->payment_method_name }}{{ $order->status_format }}{{ $order->total_format }}{{ $order->created_at }}{{ $order->updated_at }}查看 - {{ __('order.id') }}{{ __('order.number') }}{{ __('order.customer_name') }}{{ __('order.payment_method') }}{{ __('order.status') }}{{ __('order.total') }}{{ __('order.created_at') }}{{ __('order.updated_at') }}{{ __('common.action') }}
- - {{ $orders->withQueryString()->links('admin::vendor/pagination/bootstrap-4') }} + + + @foreach ($orders as $order) + + {{ $order->id }} + {{ $order->number }} + {{ sub_string($order->customer_name, 14) }} + {{ $order->payment_method_name }} + {{ $order->status_format }} + {{ $order->total_format }} + {{ $order->created_at }} + {{ $order->updated_at }} + 查看 + + + @endforeach + + + {{ $orders->withQueryString()->links('admin::vendor/pagination/bootstrap-4') }} + @else + + @endif
@endsection diff --git a/resources/beike/admin/views/pages/rmas/index.blade.php b/resources/beike/admin/views/pages/rmas/index.blade.php index 24ce82db..591c6f8c 100644 --- a/resources/beike/admin/views/pages/rmas/index.blade.php +++ b/resources/beike/admin/views/pages/rmas/index.blade.php @@ -3,46 +3,48 @@ @section('title', '售后申请列表') @section('content') -
-
- - - - - - - - - - - - - - - - @foreach ($rmas as $rma) - - - - - - - - - - - - @endforeach - -
客户姓名邮箱电话号码商品商品型号数量服务类型状态操作
{{ $rma->name }}{{ $rma->email }}{{ $rma->telephone }}{{ $rma->product_name }}{{ $rma->model }}{{ $rma->quantity }}{{ $rma->type }}{{ $rma->status }}查看
- - {{ $rmas->links('admin::vendor/pagination/bootstrap-4') }} -
+
+
+ @if (count($rmas)) + + + + + + + + + + + + + + + + @foreach ($rmas as $rma) + + + + + + + + + + + + @endforeach + +
客户姓名邮箱电话号码商品商品型号数量服务类型状态操作
{{ $rma->name }}{{ $rma->email }}{{ $rma->telephone }}{{ $rma->product_name }}{{ $rma->model }}{{ $rma->quantity }}{{ $rma->type }}{{ $rma->status }}查看 +
+ {{ $rmas->links('admin::vendor/pagination/bootstrap-4') }} + @else + + @endif
+
@endsection @push('footer') - + @endpush diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php index 540539b0..d5742dd2 100644 --- a/resources/lang/en/common.php +++ b/resources/lang/en/common.php @@ -15,6 +15,7 @@ return [ 'error_required_email' => 'Please enter your email', 'unauthenticated' => 'Please login first', 'success' => 'Success', + 'no_data' => 'No data～', 'created_success' => 'Created Successfully!', 'deleted_success' => 'Deleted Successfully!', 'restored_success' => 'Restore Successfully!', diff --git a/resources/lang/zh_cn/common.php b/resources/lang/zh_cn/common.php index f10f3411..f471d6bf 100644 --- a/resources/lang/zh_cn/common.php +++ b/resources/lang/zh_cn/common.php @@ -14,6 +14,7 @@ return [ 'error_required_email' => '请填写邮箱', 'unauthenticated' => '请先登录', 'success' => '成功', + 'no_data' => '暂无数据～', 'created_success' => '创建成功!', 'deleted_success' => '删除成功!', 'restored_success' => '恢复成功!',