diff --git a/resources/beike/shop/default/css/global.scss b/resources/beike/shop/default/css/global.scss index f5795799..3ef4c04f 100644 --- a/resources/beike/shop/default/css/global.scss +++ b/resources/beike/shop/default/css/global.scss @@ -20,6 +20,11 @@ body[class^="page-account-"] { src: url('/fonts/poppins/Poppins-Regular.ttf'); } +@font-face {font-family: 'poppins'; + src: url('/fonts/poppins/Poppins-Bold.ttf'); + font-weight: bold; +} + @font-face {font-family: 'Poppins-Medium'; src: url('/fonts/poppins/Poppins-Medium.ttf'); } diff --git a/resources/beike/shop/default/css/page-product.scss b/resources/beike/shop/default/css/page-product.scss index 4f0cad4b..5c08deb2 100644 --- a/resources/beike/shop/default/css/page-product.scss +++ b/resources/beike/shop/default/css/page-product.scss @@ -166,7 +166,10 @@ body.page-product { } .peoduct-info { - h1 { + .product-name { + font-size: 1.5rem; + line-height: 1.4; + @media (max-width: 768px) { font-size: 1.2rem; } diff --git a/resources/lang/de/common.php b/resources/lang/de/common.php index 61f124e1..9fe3ce50 100644 --- a/resources/lang/de/common.php +++ b/resources/lang/de/common.php @@ -71,6 +71,8 @@ return [ 'created_at' => 'Erstellungszeit', 'updated_at' => 'geänderte Zeit', 'sort_order' => 'sortieren', + 'error_page' => 'Die Daten, auf die Sie zugegriffen haben, existieren nicht oder wurden gelöscht~', + 'error_page_btn' => 'Zurück zur vorherigen Seite', 'order' => [ 'unpaid' => 'zu bezahlen', diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php index cf7c69a1..b458dd2d 100644 --- a/resources/lang/en/common.php +++ b/resources/lang/en/common.php @@ -72,6 +72,8 @@ return [ 'created_at' => 'Created At', 'updated_at' => 'Updated At', 'sort_order' => 'Sort Order', + 'error_page' => 'The data you accessed does not exist or has been deleted~', + 'error_page_btn' => 'Return to previous page', 'order' => [ 'unpaid' => 'Unpaid', diff --git a/resources/lang/es/common.php b/resources/lang/es/common.php index ddccdbfa..60f432c6 100644 --- a/resources/lang/es/common.php +++ b/resources/lang/es/common.php @@ -71,6 +71,8 @@ return [ 'created_at' => 'tiempo de creación', 'updated_at' => 'cambiar el tiempo', 'sort_order' => 'clasificar', + 'error_page' => 'Los datos a los que accedió no existen o han sido eliminados~', + 'error_page_btn' => 'Volver a la página anterior', 'order' => [ 'unpaid' => 'A pagar', diff --git a/resources/lang/fr/common.php b/resources/lang/fr/common.php index fe8ac046..afe1b915 100644 --- a/resources/lang/fr/common.php +++ b/resources/lang/fr/common.php @@ -71,6 +71,8 @@ return [ 'created_at' => 'temps de creation', 'updated_at' => 'Changer l\'heure', 'sort_order' => 'trier', + 'error_page' => 'Les données auxquelles vous avez accédé n\'existent pas ou ont été supprimées~', + 'error_page_btn' => 'Retour à la page précédente', 'order' => [ 'unpaid' => 'Être payé', diff --git a/resources/lang/it/common.php b/resources/lang/it/common.php index 13e98f29..746bd3d3 100644 --- a/resources/lang/it/common.php +++ b/resources/lang/it/common.php @@ -71,6 +71,8 @@ return [ 'created_at' => 'tempo di creazione', 'updated_at' => 'Cambia l\'ora', 'sort_order' => 'ordinare', + 'error_page' => 'I dati a cui hai effettuato l\'accesso non esistono o sono stati eliminati~', + 'error_page_btn' => 'Torna alla pagina precedente', 'order' => [ 'unpaid' => 'Essere pagato', diff --git a/resources/lang/ja/common.php b/resources/lang/ja/common.php index 94b7d25d..df598dc9 100644 --- a/resources/lang/ja/common.php +++ b/resources/lang/ja/common.php @@ -71,6 +71,8 @@ return [ 'created_at' => '作成時間', 'updated_at' => '時間を変更する', 'sort_order' => '選別', + 'error_page' => 'アクセスしたデータは存在しないか削除されています~', + 'error_page_btn' => '前のページに戻る', 'order' => [ 'unpaid' => '支払われる', diff --git a/resources/lang/ru/common.php b/resources/lang/ru/common.php index 07a7a8cf..9f5787f7 100644 --- a/resources/lang/ru/common.php +++ b/resources/lang/ru/common.php @@ -71,6 +71,8 @@ return [ 'created_at' => 'время создания', 'updated_at' => 'измененное время', 'sort_order' => 'сортировать', + 'error_page' => 'Данные, к которым вы обращались, не существуют или были удалены~', + 'error_page_btn' => 'Вернуться на предыдущую страницу', 'order' => [ 'unpaid' => 'подлежит оплате', diff --git a/resources/lang/zh_cn/common.php b/resources/lang/zh_cn/common.php index b64ca2dd..fc37f279 100644 --- a/resources/lang/zh_cn/common.php +++ b/resources/lang/zh_cn/common.php @@ -72,6 +72,8 @@ return [ 'created_at' => '创建时间', 'updated_at' => '修改时间', 'sort_order' => '排序', + 'error_page' => '您访问的数据不存在或已被删除~', + 'error_page_btn' => '返回上一页', 'order' => [ 'unpaid' => '待支付', diff --git a/resources/lang/zh_hk/common.php b/resources/lang/zh_hk/common.php index 27dfef27..4b450a78 100644 --- a/resources/lang/zh_hk/common.php +++ b/resources/lang/zh_hk/common.php @@ -71,6 +71,8 @@ return [ 'created_at' => '創建時間', 'updated_at' => '修改時間', 'sort_order' => '排序', + 'error_page' => '您訪問的數據不存在或已被刪除~', + 'error_page_btn' => '返回上一頁', 'order' => [ 'unpaid' => '待支付', diff --git a/themes/default/brand/info.blade.php b/themes/default/brand/info.blade.php index be7e7685..09c353e7 100644 --- a/themes/default/brand/info.blade.php +++ b/themes/default/brand/info.blade.php @@ -1,5 +1,6 @@ @extends('layout.master') @section('body-class', 'page-categories') +@section('title', $brand->name) @section('content')
diff --git a/themes/default/category.blade.php b/themes/default/category.blade.php index 99dfbb0a..ff3edbdd 100644 --- a/themes/default/category.blade.php +++ b/themes/default/category.blade.php @@ -1,5 +1,6 @@ @extends('layout.master') @section('body-class', 'page-categories') +@section('title', system_setting('base.meta_title', 'BeikeShop开源好用的跨境电商系统 - BeikeShop官网') .' - '. $category->description->name) @section('content')
diff --git a/themes/default/components/no-data.blade.php b/themes/default/components/no-data.blade.php index 44ecd46f..d08eb46f 100644 --- a/themes/default/components/no-data.blade.php +++ b/themes/default/components/no-data.blade.php @@ -1,4 +1,7 @@
-
{{ $text }}
+
{{ $text }}
+ @if ($link) + {{ $btn }} + @endif
\ No newline at end of file diff --git a/themes/default/errors/404.blade.php b/themes/default/errors/404.blade.php index 7549540d..47bd8a07 100644 --- a/themes/default/errors/404.blade.php +++ b/themes/default/errors/404.blade.php @@ -1,5 +1,6 @@ -@extends('errors::minimal') +@extends('errors.layout') +@section('title', __('common.error_page')) -@section('title', __('Not Found')) -@section('code', '404') -@section('message', __('Not Found')) +@section('content') + +@endsection diff --git a/themes/default/errors/layout.blade.php b/themes/default/errors/layout.blade.php index 019c2cde..42f64e22 100644 --- a/themes/default/errors/layout.blade.php +++ b/themes/default/errors/layout.blade.php @@ -1,53 +1,21 @@ - - - - @yield('title') + + + + @yield('title') + + - - - - -
-
-
- @yield('message') -
-
-
- diff --git a/themes/default/product.blade.php b/themes/default/product.blade.php index 99ae1b53..918a6e6d 100644 --- a/themes/default/product.blade.php +++ b/themes/default/product.blade.php @@ -1,6 +1,6 @@ @extends('layout.master') - @section('body-class', 'page-product') +@section('title', $product['name']) @push('header') @@ -51,7 +51,7 @@
-

{{ $product['name'] }}

+

{{ $product['name'] }}

@{{ product.price_format }}
@{{ product.origin_price_format }}
diff --git a/themes/default/shared/menu-mobile.blade.php b/themes/default/shared/menu-mobile.blade.php index b99c2c84..38419668 100644 --- a/themes/default/shared/menu-mobile.blade.php +++ b/themes/default/shared/menu-mobile.blade.php @@ -1,52 +1,45 @@