diff --git a/resources/beike/admin/css/_header.scss b/resources/beike/admin/css/_header.scss index 81381e93..27696e45 100644 --- a/resources/beike/admin/css/_header.scss +++ b/resources/beike/admin/css/_header.scss @@ -20,14 +20,21 @@ .header-left { width: 190px; - display: flex; - align-items: center; // flex-start | center - justify-content: center; // flex-end | center | space-between // flex-wrap: wrap; .logo { - max-width: 76%; - max-height: 30px; + a { + max-width: 76%; + height: 40px; + margin: auto; + display: flex; + align-items: center; // flex-start | center + justify-content: center; // flex-end | center | space-between + + img { + max-height: 100%; + } + } } } @@ -146,8 +153,14 @@ box-shadow: 0 2px 14px 0 rgba(0, 0, 0, .05); > .logo { - max-width: 150px; - max-height: 30px; + a { + max-width: 150px; + height: 40px; + margin: auto; + display: flex; + align-items: center; // flex-start | center + justify-content: center; // flex-end | center | space-between + } img { max-height: 100%; 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 49e528c1..6e702f70 100644 --- a/resources/beike/admin/views/pages/customer_groups/index.blade.php +++ b/resources/beike/admin/views/pages/customer_groups/index.blade.php @@ -62,6 +62,7 @@ + @if (0) @@ -81,6 +82,7 @@ + @endif
@@ -115,6 +117,7 @@ name: {}, description: {}, total: '', //消费额度 + level: '1', discount_factor: '', // 折扣率 reward_point_factor: '', // 奖励积分系数使用积分系数 use_point_factor: '', // 使用积分系数 diff --git a/resources/beike/shop/default/css/page-account-order.scss b/resources/beike/shop/default/css/page-account-order.scss index ae57e908..4ea25b5e 100644 --- a/resources/beike/shop/default/css/page-account-order.scss +++ b/resources/beike/shop/default/css/page-account-order.scss @@ -100,7 +100,7 @@ body.page-account-order-info { font-size: .9375rem; .name { - font-weight: bold; + // font-weight: bold; margin-bottom: .4rem; color: #1a1a1a; } diff --git a/resources/beike/shop/default/css/page-categories.scss b/resources/beike/shop/default/css/page-categories.scss index 26d42cf3..d37d79f6 100644 --- a/resources/beike/shop/default/css/page-categories.scss +++ b/resources/beike/shop/default/css/page-categories.scss @@ -9,13 +9,13 @@ */ body.page-categories { - .right-column { + .col-lg-9.right-column { @media (min-width: 992px) { width: 78%; } } - .left-column { + .col-lg-3.left-column { @media (min-width: 992px) { width: 22%; } @@ -89,12 +89,17 @@ body.page-categories { position: absolute; top: 50%; border-radius: 0; - height: 2px; - margin-top: -1px; + height: 3px; + margin-top: -3px; } - .ui-slider-active { - border: none; + .slider-bg { + background: #e3e3e3; + position: absolute; + top: 50%; + width: 100%; + height: 3px; + margin-top: -3px; } .ui-slider-handle { @@ -104,6 +109,7 @@ body.page-categories { border: none !important; border-radius: 0; background: $primary; + outline: none !important; } } } diff --git a/resources/lang/de/common.php b/resources/lang/de/common.php index 2be4fd48..d4887969 100644 --- a/resources/lang/de/common.php +++ b/resources/lang/de/common.php @@ -71,6 +71,10 @@ return [ 'high' => 'hoch', 'sales' => 'Verkauf', 'showing_page' => 'Showing 1-:per_page of :total item(s)', + 'text_grid' => 'Gitter', + 'text_list' => 'Liste', + 'text_form' => 'von', + 'text_to' => 'an', 'id' => 'ID', 'created_at' => 'Erstellungszeit', diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php index d3ae1363..78beeb94 100644 --- a/resources/lang/en/common.php +++ b/resources/lang/en/common.php @@ -71,7 +71,11 @@ return [ 'low' => 'Low', 'high' => 'High', 'sales' => 'Sales', - 'showing_page' => 'Showing 1-:per_page of :total item(s)', + 'showing_page' => 'Showing 1-:per_page of :total products', + 'text_grid' => 'Grid', + 'text_list' => 'List', + 'text_form' => 'From', + 'text_to' => 'To', 'id' => 'ID', 'created_at' => 'Created At', diff --git a/resources/lang/es/common.php b/resources/lang/es/common.php index bd88c74f..b13a87e4 100644 --- a/resources/lang/es/common.php +++ b/resources/lang/es/common.php @@ -71,6 +71,10 @@ return [ 'high' => 'alto', 'sales' => 'ventas', 'showing_page' => 'Showing 1-:per_page of :total item(s)', + 'text_grid' => 'cuadrícula', + 'text_list' => 'lista', + 'text_form' => 'desde', + 'texto_a' => 'a', 'id' => 'ID', 'created_at' => 'tiempo de creación', diff --git a/resources/lang/fr/common.php b/resources/lang/fr/common.php index 14886ee6..781aafce 100644 --- a/resources/lang/fr/common.php +++ b/resources/lang/fr/common.php @@ -71,6 +71,10 @@ return [ 'high' => 'élevé', 'sales' => 'ventes', 'showing_page' => 'Showing 1-:per_page of :total item(s)', + 'text_grid' => 'grille', + 'text_list' => 'liste', + 'text_form' => 'de', + 'text_to' => 'à', 'id' => 'ID', 'created_at' => 'temps de creation', diff --git a/resources/lang/it/common.php b/resources/lang/it/common.php index 1877515b..c1371a7c 100644 --- a/resources/lang/it/common.php +++ b/resources/lang/it/common.php @@ -71,6 +71,10 @@ return [ 'high' => 'alto', 'sales' => 'vendite', 'showing_page' => 'Showing 1-:per_page of :total item(s)', + 'text_grid' => 'griglia', + 'text_list' => 'lista', + 'text_form' => 'da', + 'text_to' => 'a', 'id' => 'ID', 'created_at' => 'tempo di creazione', diff --git a/resources/lang/ja/common.php b/resources/lang/ja/common.php index 8b7de828..93e1fa8f 100644 --- a/resources/lang/ja/common.php +++ b/resources/lang/ja/common.php @@ -71,6 +71,10 @@ return [ 'high' => '高い', 'sales' => '売上', 'showing_page' => 'Showing 1-:per_page of :total item(s)', + 'text_grid' => 'グリッド', + 'text_list' => 'リスト', + 'text_form' => 'From', + 'text_to' => 'To', 'id' => 'ID', 'created_at' => '作成時間', diff --git a/resources/lang/ru/common.php b/resources/lang/ru/common.php index 6c828658..f96e971a 100644 --- a/resources/lang/ru/common.php +++ b/resources/lang/ru/common.php @@ -71,6 +71,10 @@ return [ 'high' => 'высокий', 'sales' => 'продажи', 'showing_page' => 'Showing 1-:per_page of :total item(s)', + 'text_grid' => 'сетка', + 'text_list' => 'список', + 'text_form' => 'от', + 'text_to' => 'кому', 'id' => 'ID', 'created_at' => 'время создания', diff --git a/resources/lang/zh_cn/common.php b/resources/lang/zh_cn/common.php index a6b500fa..0088ce1f 100644 --- a/resources/lang/zh_cn/common.php +++ b/resources/lang/zh_cn/common.php @@ -72,6 +72,10 @@ return [ 'high' => '高', 'sales' => '销量', 'showing_page' => '1-:per_page 共 :total 条数据', + 'text_grid' => '网格', + 'text_list' => '列表', + 'text_form' => '从', + 'text_to' => '到', 'id' => 'ID', 'created_at' => '创建时间', diff --git a/resources/lang/zh_hk/common.php b/resources/lang/zh_hk/common.php index 4a153b28..b3ba7d51 100644 --- a/resources/lang/zh_hk/common.php +++ b/resources/lang/zh_hk/common.php @@ -71,6 +71,10 @@ return [ 'high' => '高', 'sales' => '銷量', 'showing_page' => '1-:per_page 共 :total 条数据', + 'text_grid' => '網格', + 'text_list' => '列表', + 'text_form' => '從', + 'text_to' => '到', 'id' => 'ID', 'created_at' => '創建時間', diff --git a/themes/default/category.blade.php b/themes/default/category.blade.php index 06c5a655..2a5498c3 100644 --- a/themes/default/category.blade.php +++ b/themes/default/category.blade.php @@ -4,75 +4,14 @@ @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')
-
-
-

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

- -
- -
- @if ($filter_data['price']['min'] != $filter_data['price']['max']) -
-
-

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

-
-
-
- {{ currency_format($filter_data['price']['select_min'], current_currency_code()) }} - - - {{ currency_format($filter_data['price']['select_max'], current_currency_code()) }} -
- - -
-
-
- @endif - - @foreach ($filter_data['attr'] as $index => $attr) -
-
-

{{ $attr['name'] }}

-
-
    - @foreach ($attr['values'] as $value_index => $value) -
  • - -
    • - @endforeach -
-
- @endforeach -
+
+ @include('shared.filter_sidebar_block')
@@ -120,8 +59,7 @@ $('.filter-value-wrap li').click(function(event) { let [attr, val] = [$(this).data('attr'),$(this).data('attrval')]; if ($(this).hasClass('delete-all')) { - deleteFilterAll(); - return; + return deleteFilterAll(); } filterAttr[attr].values[val].selected = false; @@ -132,23 +70,6 @@ $('.filter-value-wrap').removeClass('d-none') } - $(document).ready(function () { - $("#slider").slider({ - range: true, - min: {{ $filter_data['price']['min'] ?? 0 }}, - max: {{ $filter_data['price']['max'] ?? 0 }}, - values: [{{ $filter_data['price']['select_min'] }}, {{ $filter_data['price']['select_max'] }}], - change: function(event, ui) { - $('input.price-min').val(ui.values[0]) - $('input.price-max').val(ui.values[1]) - filterProductData(); - }, - slide: function(event, ui) { - $('.price-range').html(`${ui.values[0]} - ${ui.values[1]}`) - } - }); - }); - $('.child-category').each(function(index, el) { if ($(this).hasClass('active')) { $(this).parent('ul').addClass('show').siblings('button').removeClass('collapsed') @@ -166,25 +87,6 @@ filterProductData(); }); - function filterAttrChecked(data) { - let filterAtKey = []; - data.forEach((item) => { - let checkedAtValues = []; - - item.values.forEach((val) => { - if (val.selected) { - checkedAtValues.push(val.id) - } - }) - - if (checkedAtValues.length) { - filterAtKey.push(`${item.id}:${checkedAtValues.join('/')}`) - } - }) - - return filterAtKey.join('|') - } - function filterProductData() { let url = bk.removeURLParameters(window.location.href, 'attr', 'price', 'sort', 'order'); let [priceMin, priceMax] = [$('.price-min').val(), $('.price-max').val()]; @@ -219,6 +121,19 @@ location = url; } + function filterAttrChecked(data) { + let filterAtKey = []; + data.forEach((item) => { + let checkedAtValues = []; + item.values.forEach((val) => val.selected ? checkedAtValues.push(val.id) : '') + if (checkedAtValues.length) { + filterAtKey.push(`${item.id}:${checkedAtValues.join('/')}`) + } + }) + + return filterAtKey.join('|') + } + function deleteFilterAll() { let url = bk.removeURLParameters(window.location.href, 'attr', 'price'); location = url; diff --git a/themes/default/shared/filter_bar_block.blade.php b/themes/default/shared/filter_bar_block.blade.php index c7a2c353..7a50013e 100644 --- a/themes/default/shared/filter_bar_block.blade.php +++ b/themes/default/shared/filter_bar_block.blade.php @@ -1,11 +1,19 @@
@if (!is_mobile())
-