- +
@yield('title')
@@ -57,6 +55,8 @@ @endif const lang = { file_manager: '{{ __('admin/file_manager.file_manager') }}', + error_form: '{{ __('common.error_form') }}', + text_hint: '{{ __('common.text_hint') }}', } const config = { diff --git a/resources/beike/admin/views/pages/account/index.blade.php b/resources/beike/admin/views/pages/account/index.blade.php new file mode 100644 index 00000000..7b7d85cd --- /dev/null +++ b/resources/beike/admin/views/pages/account/index.blade.php @@ -0,0 +1,86 @@ +@extends('admin::layouts.master') + +@section('title', __('admin/common.account_index')) + +@section('page-title-right') + +@endsection + +@section('content') +
+
+
+ @csrf + @method('PUT') + @if (session('success')) + + @endif + + + +
+
+ + + +
{{ __('admin/account.password_text') }}
+
+ +
+
+ +
+ + + + + + + + + + + + + + + +
Token{{ __('common.action') }}
+ + + +
+ +
+
+
+
+
+ +
+
+@endsection + +@push('footer') + +@endpush diff --git a/resources/beike/admin/views/pages/admin_users/index.blade.php b/resources/beike/admin/views/pages/admin_users/index.blade.php index f135944a..3a90a51d 100644 --- a/resources/beike/admin/views/pages/admin_users/index.blade.php +++ b/resources/beike/admin/views/pages/admin_users/index.blade.php @@ -67,7 +67,7 @@ - + diff --git a/resources/beike/admin/views/pages/attribute_group/index.blade.php b/resources/beike/admin/views/pages/attribute_group/index.blade.php index d694a879..1f978115 100644 --- a/resources/beike/admin/views/pages/attribute_group/index.blade.php +++ b/resources/beike/admin/views/pages/attribute_group/index.blade.php @@ -3,7 +3,7 @@ @section('title', __('admin/attribute_group.index')) @section('content') -
+
diff --git a/resources/beike/admin/views/pages/attributes/index.blade.php b/resources/beike/admin/views/pages/attributes/index.blade.php index e3a05ff6..aa5368b0 100644 --- a/resources/beike/admin/views/pages/attributes/index.blade.php +++ b/resources/beike/admin/views/pages/attributes/index.blade.php @@ -35,7 +35,7 @@
-
diff --git a/resources/beike/admin/views/pages/brands/index.blade.php b/resources/beike/admin/views/pages/brands/index.blade.php index f2af946e..2af15186 100644 --- a/resources/beike/admin/views/pages/brands/index.blade.php +++ b/resources/beike/admin/views/pages/brands/index.blade.php @@ -25,7 +25,7 @@ @{{ brand.id }} @{{ brand.name }} -
+
@{{ brand.sort_order }} @{{ brand.first }} @@ -43,7 +43,7 @@
+ :total="brands.total" :current-page.sync="page">
{ this.brands = res.data.brands; }) diff --git a/resources/beike/admin/views/pages/categories/form-vue.blade.php b/resources/beike/admin/views/pages/categories/form-vue.blade.php deleted file mode 100644 index dc54c821..00000000 --- a/resources/beike/admin/views/pages/categories/form-vue.blade.php +++ /dev/null @@ -1,92 +0,0 @@ -@extends('admin::admin.layouts.master') - -@section('title', '分类管理') - -@section('content') -
- -
- 编辑分类 -
- - - - -
- @foreach (locales() as $locale) - - - - @endforeach -
-
- - -
- @foreach (locales() as $locale) - - - - @endforeach -
-
- - - - @foreach ($categories as $_category) - - @endforeach - - - - - - 启用 - 禁用 - - - - - 立即创建 - 取消 - -
-
-
-@endsection - -@push('footer') - -@endpush diff --git a/resources/beike/admin/views/pages/categories/form.blade.php b/resources/beike/admin/views/pages/categories/form.blade.php index 5c30d980..cf60fc4c 100644 --- a/resources/beike/admin/views/pages/categories/form.blade.php +++ b/resources/beike/admin/views/pages/categories/form.blade.php @@ -21,7 +21,7 @@ - {{-- --}} + @php diff --git a/resources/beike/admin/views/pages/categories/index.blade.php b/resources/beike/admin/views/pages/categories/index.blade.php index 09b6f822..9fc1895c 100644 --- a/resources/beike/admin/views/pages/categories/index.blade.php +++ b/resources/beike/admin/views/pages/categories/index.blade.php @@ -5,7 +5,7 @@ @section('body-class', 'page-categories') @section('content') -
+
{{ __('admin/category.categories_create') }}
diff --git a/resources/beike/admin/views/pages/currencies/index.blade.php b/resources/beike/admin/views/pages/currencies/index.blade.php index 22b35c89..2341d610 100644 --- a/resources/beike/admin/views/pages/currencies/index.blade.php +++ b/resources/beike/admin/views/pages/currencies/index.blade.php @@ -2,6 +2,10 @@ @section('title', __('admin/common.currency')) +@section('page-title-right') + {{ __('admin/setting.rate_api_key') }} +@endsection + @section('content')
@@ -168,7 +172,12 @@ type: 'warning' }).then(() => { $http.delete('currencies/' + id).then((res) => { - this.$message.success(res.message); + if (res.status == 'fail') { + layer.msg(res.message, () => {}); + return; + } + + layer.msg(res.message); self.currencies.splice(index, 1) }) }).catch(()=>{}) diff --git a/resources/beike/admin/views/pages/customer_groups/index.blade.php b/resources/beike/admin/views/pages/customer_groups/index.blade.php index 102f4411..48c40689 100644 --- a/resources/beike/admin/views/pages/customer_groups/index.blade.php +++ b/resources/beike/admin/views/pages/customer_groups/index.blade.php @@ -3,7 +3,7 @@ @section('title', __('admin/common.customer_groups_index')) @section('content') -
+
@@ -15,7 +15,7 @@ ID {{ __('common.name') }} {{ __('admin/region.describe') }} - {{ __('customer_group.level') }} + {{-- {{ __('customer_group.level') }} --}} {{ __('common.created_at') }} {{ __('common.action') }} @@ -28,7 +28,7 @@
@{{ stringLengthInte(group.description?.description || '') }}
- @{{ group.level }} + {{-- @{{ group.level }} --}} @{{ group.created_at }} diff --git a/resources/beike/admin/views/pages/customers/form.blade.php b/resources/beike/admin/views/pages/customers/form.blade.php index a5041bff..57fbdaf5 100644 --- a/resources/beike/admin/views/pages/customers/form.blade.php +++ b/resources/beike/admin/views/pages/customers/form.blade.php @@ -40,7 +40,7 @@ ID - {{ __('common.name') }} + {{ __('address.name') }} {{ __('common.phone') }} {{ __('common.created_at') }} {{ __('common.action') }} @@ -76,7 +76,7 @@ - + diff --git a/resources/beike/admin/views/pages/customers/index.blade.php b/resources/beike/admin/views/pages/customers/index.blade.php index cd98648b..97c3392c 100644 --- a/resources/beike/admin/views/pages/customers/index.blade.php +++ b/resources/beike/admin/views/pages/customers/index.blade.php @@ -3,10 +3,10 @@ @section('title', __('admin/common.customer')) @section('content') -
+
- +
@@ -34,7 +34,7 @@
- +
diff --git a/resources/beike/admin/views/pages/design/builder/component/image_selector.blade.php b/resources/beike/admin/views/pages/design/builder/component/image_selector.blade.php index 46c14afa..c0b424a1 100644 --- a/resources/beike/admin/views/pages/design/builder/component/image_selector.blade.php +++ b/resources/beike/admin/views/pages/design/builder/component/image_selector.blade.php @@ -93,7 +93,11 @@ methods: { removeImage() { - this.src = ''; + if (this.isLanguage) { + this.src[this.tabActiveId] = ''; + } else { + this.src = ''; + } }, tabClick(e) { diff --git a/resources/beike/admin/views/pages/design/builder/component/rich_text_i18n.blade.php b/resources/beike/admin/views/pages/design/builder/component/rich_text_i18n.blade.php index 28b94947..0f4b89c1 100644 --- a/resources/beike/admin/views/pages/design/builder/component/rich_text_i18n.blade.php +++ b/resources/beike/admin/views/pages/design/builder/component/rich_text_i18n.blade.php @@ -104,21 +104,21 @@ Vue.component('rich-text-i18n', { toolbar_mode: 'wrap', font_formats: "微软雅黑='Microsoft YaHei';黑体=黑体;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Georgia=georgia,palatino;Helvetica=helvetica;Times New Roman=times new roman,times;Verdana=verdana,geneva", - fontsize_formats: "10px 12px 14px 18px 24px 36px", + fontsize_formats: "10px 12px 14px 18px 24px 36px 48px 56px 72px 96px", + lineheight_formats: "1 1.1 1.2 1.3 1.4 1.5 1.7 2.4 3 4", relative_urls : true, - // init_instance_callback: function (ed) { - // let code = ed.getElement().dataset.code - // ed.setContent(self.value[code]) - // }, setup: function(ed) { ed.ui.registry.addButton('toolbarImageButton', { - // text: '', icon: 'image', onAction:function() { bk.fileManagerIframe(images => { if (images.length) { images.forEach(e => { - ed.insertContent(``); + if (e.mime == 'video/mp4') { + ed.insertContent(`
@@ -51,14 +51,13 @@ {{ __('admin/dashboard.yesterday') }}
- {{--
{{ __('admin/dashboard.customer_new') }}
--}}
{{ $customers['total'] }}
- {{--
--}}
-
{{ $customers['percentage'] }}% {{ __('admin/dashboard.day_before') }}
+
{{ $customers['percentage'] }}% + {{ __('admin/dashboard.day_before') }}
@@ -69,15 +68,14 @@ {{ __('admin/dashboard.yesterday') }}
- {{--
{{ __('admin/dashboard.order_amount') }}
--}}
{{ $order_totals['total'] }}
- {{--
--}}
-
{{ $order_totals['percentage'] }}% {{ __('admin/dashboard.day_before') }}
+
{{ $order_totals['percentage'] }}% + {{ __('admin/dashboard.day_before') }}
diff --git a/resources/beike/admin/views/pages/marketing/index.blade.php b/resources/beike/admin/views/pages/marketing/index.blade.php index abe2da27..f1dc5023 100644 --- a/resources/beike/admin/views/pages/marketing/index.blade.php +++ b/resources/beike/admin/views/pages/marketing/index.blade.php @@ -53,7 +53,7 @@
-
+
{ const value = this.filter[key]; if (value !== '' && value !== null) { filter[key] = value; } - } + }) const query = Object.keys(filter).map(key => key + '=' + filter[key]).join('&'); diff --git a/resources/beike/admin/views/pages/marketing/show.blade.php b/resources/beike/admin/views/pages/marketing/show.blade.php index 4d7ad308..4fb7fb85 100644 --- a/resources/beike/admin/views/pages/marketing/show.blade.php +++ b/resources/beike/admin/views/pages/marketing/show.blade.php @@ -5,227 +5,400 @@ @section('body-class', 'page-marketing-info') @push('header') - - - + + + @endpush @section('content') - @php - $data = $plugin['data']; - @endphp -
-
{{ __('admin/marketing.marketing_show') }}
-
-
-
-
-

{{ $data['name'] }}

-
-
{{ __('admin/marketing.download_count') }}:{{ $data['downloaded'] }}
-
{{ __('admin/marketing.last_update') }}:{{ $data['updated_at'] }}
-
{{ __('admin/marketing.text_version') }}:{{ $data['version'] }}
-
+@php +$data = $plugin['data']; +@endphp +
+
+
{{ __('admin/marketing.marketing_show') }}
+
+
+
+
+ + +
+
- + - - - -
{{ __('admin/marketing.get_token_text') }} {{ __('admin/marketing.get_token') }}
-
- - {{ __('common.cancel') }} - {{ __('common.confirm') }} - + + + - - @if ($data['description']) -
-
{{ __('admin/marketing.download_description') }}
-
- {!! $data['description'] !!}
+ +
+ +@if ($data['description']) +
+
+
{{ __('admin/marketing.download_description') }}
- @endif +
+ {!! $data['description'] !!} +
+
+@endif @endsection @push('footer') - + }, + + destroyed() { + window.clearInterval(this.timer) + } + }) + @endpush diff --git a/resources/beike/admin/views/pages/multi_filter/index.blade.php b/resources/beike/admin/views/pages/multi_filter/index.blade.php new file mode 100644 index 00000000..14431577 --- /dev/null +++ b/resources/beike/admin/views/pages/multi_filter/index.blade.php @@ -0,0 +1,98 @@ +@extends('admin::layouts.master') + +@section('title', __('admin/common.multi_filter_index')) + +@section('content') +
+
+
+ @csrf + @if (session('success')) + + @endif +
{{ __('common.data') }}
+ + +
+
+ + +
+
+
+ + @{{ item.name }} +
+ + +
+
+
{{ __('admin/setting.multi_filter_helper') }}
+
+
+
+ + + + + + + +
+
+@endsection + +@push('footer') + +@endpush + + + diff --git a/resources/beike/admin/views/pages/orders/form.blade.php b/resources/beike/admin/views/pages/orders/form.blade.php index 9e9fcc7e..a13f65f2 100644 --- a/resources/beike/admin/views/pages/orders/form.blade.php +++ b/resources/beike/admin/views/pages/orders/form.blade.php @@ -68,7 +68,7 @@
{{ __('order.address_info') }}
- +
@@ -121,7 +121,7 @@ {{ $order->status_format }} - @if ($order->status != 'completed') + @if (count($statuses)) {{ $product->product_id }} @@ -208,7 +208,52 @@ @endhookwrapper + @if ($order->orderPayments) + @hookwrapper('admin.order.form.payments') +
+
{{ __('admin/order.payments_history') }}
+
+
+
{{ __('order.shipping_address') }}
-
{{ $product->name }} +
{{ $product->name }}
{{ $product->product_sku }}
+ + + + + + + + + + + + + + @foreach ($order->orderPayments as $payment) + + + + + + + + + + + @endforeach + +
{{ __('admin/order.order_id') }}{{ __('admin/order.text_transaction_id') }}{{ __('admin/order.text_request') }}{{ __('admin/order.text_response') }}{{ __('admin/order.text_callback') }}{{ __('admin/order.text_receipt') }}{{ __('order.created_at') }}{{ __('order.updated_at') }}
{{ $payment->order_id }}{{ $payment->transaction_id }}{{ $payment->request }}{{ $payment->response }}{{ $payment->callback }} + @if ($payment->receipt) + {{ __('admin/order.text_click_view') }} + @endif + {{ $payment->created_at }}{{ $payment->updated_at }}
+
+
+
+ @endhookwrapper + @endif + @if ($order->orderShipments) + @hookwrapper('admin.order.form.shipments')
{{ __('order.order_shipments') }}
@@ -218,7 +263,7 @@ {{ __('order.express_company') }} {{ __('order.express_number') }} - {{ __('order.history_created_at') }} + {{ __('order.updated_at') }} @@ -252,6 +297,7 @@
+ @endhookwrapper @endif
@@ -263,7 +309,7 @@ {{ __('order.history_status') }} {{ __('order.history_comment') }} - {{ __('order.history_created_at') }} + {{ __('order.updated_at') }} diff --git a/resources/beike/admin/views/pages/page_categories/form.blade.php b/resources/beike/admin/views/pages/page_categories/form.blade.php index ca252139..75d23fff 100644 --- a/resources/beike/admin/views/pages/page_categories/form.blade.php +++ b/resources/beike/admin/views/pages/page_categories/form.blade.php @@ -4,7 +4,7 @@ @section('page-title-right') - + @endsection @@ -25,6 +25,7 @@
@csrf @@ -100,12 +101,6 @@ @push('footer') -@endpush + layer.confirm('{{ __('common.confirm_delete') }}', { + title: "{{ __('common.text_hint') }}", + btn: ['{{ __('common.cancel') }}', '{{ __('common.confirm') }}'], + area: ['400px'], + btn2: () => { + $http.delete(`page_categories/${id}`).then((res) => { + layer.msg(res.message); + window.location.reload(); + }) + } + }) + }); + +@endpush \ No newline at end of file diff --git a/resources/beike/admin/views/pages/pages/form.blade.php b/resources/beike/admin/views/pages/pages/form.blade.php index 6c60e6b6..94e90771 100644 --- a/resources/beike/admin/views/pages/pages/form.blade.php +++ b/resources/beike/admin/views/pages/pages/form.blade.php @@ -5,19 +5,16 @@ @section('body-class', 'page-pages-form') @push('header') - - @endpush @section('page-title-right') - + @endsection @section('content') -
- @if (!equal_route('shop.carts.index')) -
- @endif +
diff --git a/themes/default/layout/master.blade.php b/themes/default/layout/master.blade.php index 2144297e..96846606 100644 --- a/themes/default/layout/master.blade.php +++ b/themes/default/layout/master.blade.php @@ -15,13 +15,15 @@ + - + @if (system_setting('base.head_code')) {!! system_setting('base.head_code') !!} @endif + @hook('layout.header.code') @stack('header') diff --git a/themes/default/mails/order_new.blade.php b/themes/default/mails/order_new.blade.php index 48a17ccc..d73e14cf 100644 --- a/themes/default/mails/order_new.blade.php +++ b/themes/default/mails/order_new.blade.php @@ -72,6 +72,12 @@ +

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

+

@@ -81,6 +87,7 @@

+ diff --git a/themes/default/mails/order_update.blade.php b/themes/default/mails/order_update.blade.php index 3fa47afe..34a15af4 100644 --- a/themes/default/mails/order_update.blade.php +++ b/themes/default/mails/order_update.blade.php @@ -61,6 +61,12 @@ @endif +

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

+

diff --git a/themes/default/order_info.blade.php b/themes/default/order_info.blade.php new file mode 100644 index 00000000..1ef3913b --- /dev/null +++ b/themes/default/order_info.blade.php @@ -0,0 +1,11 @@ +@extends('layout.master') + +@section('body-class', 'page-account-order-info') + +@section('content') +

+
+ @include('shared.order_info') +
+
+@endsection \ No newline at end of file diff --git a/themes/default/page_categories/home.blade.php b/themes/default/page_categories/home.blade.php index d20ecf69..645e1c4c 100644 --- a/themes/default/page_categories/home.blade.php +++ b/themes/default/page_categories/home.blade.php @@ -1,9 +1,14 @@ @extends('layout.master') @section('body-class', 'page-categories-home') +@push('header') + +@endpush + @section('content') + {{ $breadcrumb->render() }} +
- {{ $breadcrumb->render() }}
@@ -28,7 +33,7 @@ @if ($active_page_categories)
-
+
{{ __('product.category') }}
diff --git a/themes/default/page_categories/show.blade.php b/themes/default/page_categories/show.blade.php index 3806e892..e4470c38 100644 --- a/themes/default/page_categories/show.blade.php +++ b/themes/default/page_categories/show.blade.php @@ -5,20 +5,22 @@ @section('keywords', $category->description->meta_keywords ?: system_setting('base.meta_keyword')) @section('description', $category->description->meta_description ?: system_setting('base.meta_description')) +@push('header') + +@endpush + @section('content') + +
-
-
-
-

{{ $category->description->title }}

-
{{ $category->description->summary }}
-
-
- -
+
+
+

{{ $category->description->title }}

+
{{ $category->description->summary }}
+
@if ($category_pages->count() > 0) @foreach ($category_pages as $page)
@@ -48,7 +50,7 @@ @if ($active_page_categories)
-
+
{{ __('product.category') }}
diff --git a/themes/default/pages/article.blade.php b/themes/default/pages/article.blade.php deleted file mode 100644 index 26825445..00000000 --- a/themes/default/pages/article.blade.php +++ /dev/null @@ -1,104 +0,0 @@ -@extends('layout.master') -@section('body-class', 'page-pages') -@section('title', $page->description->meta_title ?: $page->description->title) -@section('keywords', $page->description->meta_keywords) -@section('description', $page->description->meta_description) - -@push('header') - - -@endpush - -@section('content') -
- -
-
-
-
-

{{ $page->description->title }}

-
- {{ __('page_category.author') }}: {{ $page->author }} - {{ __('page_category.created_at') }}: {{ $page->created_at }} - {{ __('page_category.views') }}: {{ $page->views }} -
- {!! $page_format['content'] !!} - - - @if ($products) -
-
-
{{ __('admin/product.product_relations') }}
-
-
-
- @foreach ($products as $item) -
- @include('shared.product', ['product' => $item]) -
- @endforeach -
-
-
-
-
-
-
-
- @endif -
-
-
- - @if ($page->category) -
-
-
-
{{ __('product.category') }}
-
-
- -
-
-
- @endif -
-
-@endsection - -@push('add-scripts') - -@endpush \ No newline at end of file diff --git a/themes/default/pages/single.blade.php b/themes/default/pages/single.blade.php index 929f95d5..c7931983 100644 --- a/themes/default/pages/single.blade.php +++ b/themes/default/pages/single.blade.php @@ -1,16 +1,109 @@ @extends('layout.master') @section('body-class', 'page-pages') -@section('title', $page['meta_title'] ?: $page['title']) -@section('keywords', $page['meta_keywords']) -@section('description', $page['meta_description']) +@section('title', $page->description->meta_title ?: $page->description->title) +@section('keywords', $page->description->meta_keywords) +@section('description', $page->description->meta_description) + +@push('header') + + + +@endpush @section('content') +
- -
-
- {!! $page_format['content'] !!} +
+
+
+
+

{{ $page->description->title }}

+
+ {{ __('page_category.author') }}: {{ $page->author }} + {{ __('page_category.created_at') }}: {{ $page->created_at }} + {{ __('page_category.views') }}: {{ $page->views }} +
+ {!! $page_format['content'] !!} + + + @if ($products) +
+
+
{{ __('admin/product.product_relations') }}
+
+
+
+ @foreach ($products as $item) +
+ @include('shared.product', ['product' => $item]) +
+ @endforeach +
+
+
+
+
+
+
+
+ @endif +
+
+ + @if ($page->category) +
+
+
+
{{ __('product.category') }}
+
+
+ +
+
+
+ @endif
@endsection + +@push('add-scripts') + +@endpush \ No newline at end of file diff --git a/themes/default/product/product-video.blade.php b/themes/default/product/product-video.blade.php new file mode 100644 index 00000000..6f5e8d6c --- /dev/null +++ b/themes/default/product/product-video.blade.php @@ -0,0 +1,50 @@ +@if ($product['video']) +
+ +
+
+
+@endif + +@push('add-scripts') + +@endpush diff --git a/themes/default/product.blade.php b/themes/default/product/product.blade.php similarity index 86% rename from themes/default/product.blade.php rename to themes/default/product/product.blade.php index 3c370dac..124e19f2 100644 --- a/themes/default/product.blade.php +++ b/themes/default/product/product.blade.php @@ -12,17 +12,27 @@ + @if ($product['video']) + + + @endif @endpush -@section('content') -
- +@php + $iframeClass = request('iframe') ? 'd-none' : ''; +@endphp +@section('content') + @if (!request('iframe')) + + @endif + +
@if(!is_mobile()) -
+
@@ -38,9 +48,11 @@
+ @include('product.product-video')
@else + @include('product.product-video')
@@ -58,6 +70,7 @@ @hookwrapper('product.detail.name')

{{ $product['name'] }}

@endhookwrapper + @hookwrapper('product.detail.price')
@{{ product.price_format }}
@@ -87,6 +100,7 @@
+ @endhookwrapper
@hookwrapper('product.detail.quantity')
@@ -146,6 +160,7 @@ @if ($product['active'])
@hook('product.detail.buy.before') + @hookwrapper('product.detail.quantity.input')
@@ -153,25 +168,39 @@
+ @endhookwrapper + @hookwrapper('product.detail.add_to_cart') + @endhookwrapper + @hookwrapper('product.detail.buy_now') + @endhookwrapper @hook('product.detail.buy.after')
-
- -
+ + @if (current_customer() || !request('iframe')) + @hookwrapper('product.detail.wishlist') +
+ +
+ @endhookwrapper + @endif @else {{--
{{ __('product.has_been_inactive') }}
--}} @endif @@ -219,6 +248,9 @@ + + + @hook('product.detail.after')
Submit -
+
@@ -276,11 +309,12 @@ @endforeach
+ @hook('product.tab.after.pane')
- @if ($relations) + @if ($relations && !request('iframe'))
{{ __('admin/product.product_relations') }}
@@ -301,11 +335,14 @@
@endif + + @hook('product.detail.footer') @endsection @push('add-scripts') @endpush diff --git a/themes/default/search.blade.php b/themes/default/search.blade.php index b2482c6c..ed3cddf7 100644 --- a/themes/default/search.blade.php +++ b/themes/default/search.blade.php @@ -2,10 +2,9 @@ @section('body-class', 'page-categories') @section('content') + +
- - -
@if (count($items)) @foreach ($items as $product) diff --git a/themes/default/shared/address-form.blade.php b/themes/default/shared/address-form.blade.php index e61362c9..793a1265 100644 --- a/themes/default/shared/address-form.blade.php +++ b/themes/default/shared/address-form.blade.php @@ -10,9 +10,6 @@ @endif - - -
@@ -40,15 +37,18 @@
- - - + + + + + + @foreach ($all_categories as $key_a => $category_all)
  • - {{ $category_all['name'] }} + {{ $category_all['name'] }} @if ($category_all['children']) @@ -27,28 +27,30 @@ @endpush -
    -
    -

    {{ __('product.price') }}

    -
    -
    -
    -
    -
    - {{ __('common.text_form') }} - {{ currency_format($filter_data['price']['select_min'], current_currency_code()) }} -
    -
    - {{ __('common.text_to') }} - {{ currency_format($filter_data['price']['select_max'], current_currency_code()) }} -
    + @if (system_setting('base.multi_filter.price_filter', 1)) +
    +
    +

    {{ __('product.price') }}

    +
    +
    +
    +
    +
    + {{ __('common.text_form') }} + {{ currency_format($filter_data['price']['select_min'], current_currency_code()) }} +
    +
    + {{ __('common.text_to') }} + {{ currency_format($filter_data['price']['select_max'], current_currency_code()) }} +
    +
    + + + +
    - - - -
    -
    + @endif @endhookwrapper @endif diff --git a/themes/default/shared/menu-mobile.blade.php b/themes/default/shared/menu-mobile.blade.php index 38419668..b781f093 100644 --- a/themes/default/shared/menu-mobile.blade.php +++ b/themes/default/shared/menu-mobile.blade.php @@ -3,7 +3,7 @@ @if ($menu['name'])
    @if (isset($menu['children_group']) && $menu['children_group'])
    - @forelse ($menu['children_group'] as $group) -
    + @forelse ($menu['children_group'] as $c_key => $group) +
    @if ($group['name']) -
    {{ $group['name'] }}
    - @endif - @if ($group['type'] == 'image') -
    - @else - +
    @endif +
    + @if ($group['type'] == 'image') + + @else + + @endif +
    @endforeach
    diff --git a/themes/default/shared/order_info.blade.php b/themes/default/shared/order_info.blade.php new file mode 100644 index 00000000..0b69ee82 --- /dev/null +++ b/themes/default/shared/order_info.blade.php @@ -0,0 +1,215 @@ +@if ($errors->any()) + @foreach ($errors->all() as $error) + + @endforeach +@endif + +
    +
    +
    {{ __('shop/account.order.order_info.order_details') }}
    +
    + @if ($order->status == 'unpaid') + {{ __('shop/account.order.order_info.to_pay') }} + + @endif + @if ($order->status == 'shipped') + + @endif +
    +
    +
    +
    + + + + + + + + + + + + + + + + + +
    {{ __('shop/account.order.order_info.order_number') }}{{ __('shop/account.order.order_info.order_date') }}{{ __('shop/account.order.order_info.state') }}{{ __('shop/account.order.order_info.order_amount') }}
    {{ $order->number }}{{ $order->created_at }} + {{$order->status_format}} + {{ currency_format($order->total, $order->currency_code, $order->currency_value) }}
    +
    +
    +
    +
    +
    {{ __('order.address_info') }}
    +
    + + + + + + + + + + + + + +
    {{ __('order.shipping_address') }}{{ __('order.payment_address') }}
    +
    {{ __('address.name') }}:{{ $order->shipping_customer_name }} ({{ $order->shipping_telephone }})
    +
    + {{ __('address.address') }}: + {{ $order->shipping_address_1 }} + {{ $order->shipping_address_2 }} + {{ $order->shipping_city }} + {{ $order->shipping_zone }} + {{ $order->shipping_country }} +
    +
    {{ __('address.post_code') }}:{{ $order->shipping_zipcode }}
    +
    +
    {{ __('address.name') }}:{{ $order->payment_customer_name }} ({{ $order->payment_telephone }})
    +
    + {{ __('address.address') }}: + {{ $order->payment_address_1 }} + {{ $order->payment_address_2 }} + {{ $order->payment_city }} + {{ $order->payment_zone }} + {{ $order->payment_country }} +
    +
    {{ __('address.post_code') }}:{{ $order->payment_zipcode }}
    +
    +
    +
    +
    +
    +
    {{ __('shop/account.order.order_info.order_items') }}
    +
    +
    + @foreach ($order->orderProducts as $product) +
    +
    +
    +
    + +
    + {{ currency_format($product->price, $order->currency_code, $order->currency_value) }} + x {{ $product->quantity }} + = {{ currency_format($product->price * $product->quantity, $order->currency_code, $order->currency_value) }} +
    +
    +
    + @if ($order->status == 'completed') + {{ __('shop/account.order.order_info.apply_after_sales') }} + @endif +
    + @endforeach +
    +
    + +
    +
    +
    {{ __('shop/account.order.order_info.order_total') }}
    +
    +
    + + + @foreach (array_chunk($order->orderTotals->all(), 2) as $totals) + + @foreach ($totals as $total) + + + @endforeach + + @endforeach + +
    {{ $total->title }}{{ currency_format($total->value, $order->currency_code, $order->currency_value) }}
    +
    +
    + +@foreach ($html_items as $item) + {!! $item !!} +@endforeach + +@hook('account.order_info.after') + +@if ($order->orderShipments->count()) + @hookwrapper('account.order_info.shipments') +
    +
    {{ __('order.order_shipments') }}
    +
    +
    + + + + + + + + + + @foreach ($order->orderShipments as $ship) + + + + + + @endforeach + +
    {{ __('order.express_company') }}{{ __('order.express_number') }}{{ __('order.history_created_at') }}
    {{ $ship->express_company }}{{ $ship->express_number }}{{ $ship->created_at }}
    +
    +
    +
    + @endhookwrapper +@endif + +@if ($order->orderHistories->count()) +
    +
    +
    {{ __('shop/account.order.order_info.order_status') }}
    +
    +
    + + + + + + + + + + @foreach ($order->orderHistories as $orderHistory) + + + + + + @endforeach + +
    {{ __('shop/account.order.order_info.state') }}{{ __('shop/account.order.order_info.remark') }}{{ __('shop/account.order.order_info.update_time') }}
    {{ $orderHistory->status_format }}{{ $orderHistory->comment }}{{ $orderHistory->created_at }}
    +
    +
    +@endif + +@push('add-scripts') + +@endpush \ No newline at end of file diff --git a/themes/default/shared/pagination/bootstrap-4.blade.php b/themes/default/shared/pagination/bootstrap-4.blade.php index 2ff79880..a269f385 100644 --- a/themes/default/shared/pagination/bootstrap-4.blade.php +++ b/themes/default/shared/pagination/bootstrap-4.blade.php @@ -1,43 +1,72 @@ @if ($paginator->hasPages()) - + @if(is_mobile()) +
    + @lang('pagination.previous') +
    + + {{ $paginator->lastPage() }} +
    + @lang('pagination.next') +
    + + + @else + + @endif @endif diff --git a/themes/default/shared/product.blade.php b/themes/default/shared/product.blade.php index 2803c18e..099ff868 100644 --- a/themes/default/shared/product.blade.php +++ b/themes/default/shared/product.blade.php @@ -2,13 +2,29 @@
    - +
    @if (!request('style_list') || request('style_list') == 'grid')
    +