From 72f7004cf2256e75a8fbd50e8c9b6f984936b069 Mon Sep 17 00:00:00 2001 From: pushuo Date: Fri, 3 Feb 2023 18:16:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=89=88=E6=9C=AC=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/beike/admin/css/_header.scss | 11 +++-- resources/beike/admin/js/app.js | 4 +- resources/beike/admin/js/common.js | 15 ++++++- .../admin/views/components/header.blade.php | 40 ++++++++++++++++--- .../beike/admin/views/pages/home.blade.php | 17 ++++---- resources/lang/de/admin/common.php | 6 +++ resources/lang/en/admin/common.php | 6 +++ resources/lang/es/admin/common.php | 6 +++ resources/lang/fr/admin/common.php | 6 +++ resources/lang/it/admin/common.php | 6 +++ resources/lang/ja/admin/common.php | 6 +++ resources/lang/ru/admin/common.php | 6 +++ resources/lang/zh_cn/admin/common.php | 6 +++ resources/lang/zh_hk/admin/common.php | 6 +++ 14 files changed, 124 insertions(+), 17 deletions(-) diff --git a/resources/beike/admin/css/_header.scss b/resources/beike/admin/css/_header.scss index 27696e45..76f59ed1 100644 --- a/resources/beike/admin/css/_header.scss +++ b/resources/beike/admin/css/_header.scss @@ -121,13 +121,18 @@ &.navbar-right { > li { - html[lang="zh_cn"] &, html[lang="zh_hk"] &, html[lang="en"] & { - padding: 0 .5rem; - } + padding: 0 0.3rem !important; a.nav-link { padding: 0 10px; } + + &.update-btn a { + padding-top: 0.15rem; + padding-bottom: 0.15rem; + border-radius: 2px; + font-size: 12px; + } } } } diff --git a/resources/beike/admin/js/app.js b/resources/beike/admin/js/app.js index 235d3c24..0d2b1741 100644 --- a/resources/beike/admin/js/app.js +++ b/resources/beike/admin/js/app.js @@ -3,7 +3,7 @@ * @link https://beikeshop.com * @Author pu shuo * @Date 2022-08-26 18:18:22 - * @LastEditTime 2022-09-16 20:58:01 + * @LastEditTime 2023-02-03 17:46:06 */ import http from "../../../js/http"; @@ -51,6 +51,8 @@ if (typeof Vue != 'undefined') { } $(document).ready(function ($) { + bk.setVersionUpdateTips(); + $.ajaxSetup({ headers: {'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')}, // beforeSend: function() { layer.load(2, {shade: [0.3,'#fff'] }); }, diff --git a/resources/beike/admin/js/common.js b/resources/beike/admin/js/common.js index cf6138db..46ea038a 100644 --- a/resources/beike/admin/js/common.js +++ b/resources/beike/admin/js/common.js @@ -3,7 +3,7 @@ * @link https://beikeshop.com * @Author pu shuo * @Date 2022-08-22 18:32:26 - * @LastEditTime 2023-02-03 10:12:59 + * @LastEditTime 2023-02-03 17:50:57 */ export default { @@ -100,5 +100,18 @@ export default { } return obj; + }, + + // 设置版本更新提示 + setVersionUpdateTips() { + const version = JSON.parse(localStorage.getItem('beike_version')); + if (version && version.has_new_version) { + localStorage.setItem('version', process.env.VUE_APP_VERSION); + $('.new-version').text(version.latest); + $('.update-date').text(version.release_date); + $('.update-btn').show(); + } else { + $('.update-btn').hide(); + } } } \ No newline at end of file diff --git a/resources/beike/admin/views/components/header.blade.php b/resources/beike/admin/views/components/header.blade.php index ae5f23b8..f183263f 100644 --- a/resources/beike/admin/views/components/header.blade.php +++ b/resources/beike/admin/views/components/header.blade.php @@ -12,6 +12,9 @@ @endforeach
    +
  •  @lang('admin/common.marketing')
    • @@ -48,22 +51,17 @@
    -
    -
    - -
    -
    @@ -106,3 +104,35 @@ + + +@push('footer') + +@endpush \ No newline at end of file diff --git a/resources/beike/admin/views/pages/home.blade.php b/resources/beike/admin/views/pages/home.blade.php index b7224fdd..1399878f 100644 --- a/resources/beike/admin/views/pages/home.blade.php +++ b/resources/beike/admin/views/pages/home.blade.php @@ -119,8 +119,6 @@ @endif - - @endsection @push('footer') @@ -283,14 +281,12 @@ beginAtZero: true, grid: { drawBorder: false, - // drawOnChartArea: false, display: false }, } }, } }); - // console.log(ordersChart) function upDate(chart, label, data) { chart.data.labels = label; @@ -304,11 +300,18 @@ const day = $(this).data('type'); // 天数 const labels = eval(day).period; const data = [eval(day).totals, eval(day).amounts]; - // const labels = Array.from({length: day}, (v, k) => k + 1); - // const data = Array.from({length: day}, () => Math.floor(Math.random() * 123.7)); $(this).addClass('btn-info text-white').siblings().removeClass('btn-info text-white'); - upDate(ordersChart, labels, data); }); + + @endpush diff --git a/resources/lang/de/admin/common.php b/resources/lang/de/admin/common.php index 355888e5..2ad88c45 100644 --- a/resources/lang/de/admin/common.php +++ b/resources/lang/de/admin/common.php @@ -71,4 +71,10 @@ return [ 'customer_groups_index' => 'Kundengruppe', 'countries_index' => 'Landesverwaltung', 'zones_index' => 'Provinzverwaltung', + 'update_nav' => 'aktualisieren', + 'update_title' => 'Neue Version von BeikeShop suchen, jetzt aktualisieren', + 'update_new_version' => 'neueste Version', + 'update_old_version' => 'aktuelle Version', + 'update_date' => 'Aktualisierungsdatum', + 'update_btn' => 'zum Download gehen', ]; diff --git a/resources/lang/en/admin/common.php b/resources/lang/en/admin/common.php index b91731bf..842e0c0a 100644 --- a/resources/lang/en/admin/common.php +++ b/resources/lang/en/admin/common.php @@ -75,4 +75,10 @@ return [ 'customer_groups_index' => 'Customer Groups', 'countries_index' => 'Countries', 'zones_index' => 'Zones', + 'update_nav' => 'Update', + 'update_title' => 'Find a new version of BeikeShop, whether to update now', + 'update_new_version' => 'Latest version', + 'update_old_version' => 'Current version', + 'update_date' => 'Update date', + 'update_btn' => 'Download', ]; diff --git a/resources/lang/es/admin/common.php b/resources/lang/es/admin/common.php index ecdc6f9d..e389e9f1 100644 --- a/resources/lang/es/admin/common.php +++ b/resources/lang/es/admin/common.php @@ -71,4 +71,10 @@ return [ 'customer_groups_index' => 'grupo de clientes', 'countries_index' => 'Administración del Estado', 'zones_index' => 'Gestión de provincia', + 'update_nav' => 'actualizar', + 'update_title' => 'Buscar una nueva versión de BeikeShop, ya sea para actualizar ahora', + 'update_new_version' => 'última versión', + 'update_old_version' => 'versión actual', + 'update_date' => 'fecha de actualización', + 'update_btn' => 'ir a descargar', ]; diff --git a/resources/lang/fr/admin/common.php b/resources/lang/fr/admin/common.php index 8e79eb8a..05c88e86 100644 --- a/resources/lang/fr/admin/common.php +++ b/resources/lang/fr/admin/common.php @@ -71,4 +71,10 @@ return [ 'customer_groups_index' => 'groupe de clients', 'countries_index' => 'Gestion des pays', 'zones_index' => 'gestion des provinces', + 'update_nav' => 'mettre à jour', + 'update_title' => 'Trouver une nouvelle version de BeikeShop, si mettre à jour maintenant', + 'update_new_version' => 'dernière version', + 'update_old_version' => 'version actuelle', + 'update_date' => 'date de mise à jour', + 'update_btn' => 'aller au téléchargement', ]; diff --git a/resources/lang/it/admin/common.php b/resources/lang/it/admin/common.php index 5dde36f1..87f01b3b 100644 --- a/resources/lang/it/admin/common.php +++ b/resources/lang/it/admin/common.php @@ -71,4 +71,10 @@ return [ 'customer_groups_index' => 'Gruppo di clienti', 'countries_index' => 'Gestione statale', 'zones_index' => 'Gestione provinciale', + 'update_nav' => 'aggiorna', + 'update_title' => 'Trova una nuova versione di BeikeShop, se aggiornare ora', + 'update_new_version' => 'ultima versione', + 'update_old_version' => 'versione corrente', + 'update_date' => 'data di aggiornamento', + 'update_btn' => 'vai al download', ]; diff --git a/resources/lang/ja/admin/common.php b/resources/lang/ja/admin/common.php index 2b61b4b5..548ad95c 100644 --- a/resources/lang/ja/admin/common.php +++ b/resources/lang/ja/admin/common.php @@ -71,4 +71,10 @@ return [ 'customer_groups_index' => '顧客グループ', 'countries_index' => '国の管理', 'zones_index' => '州管理', + 'update_nav' => 'アップデート', + 'update_title' => 'BeikeShop の新しいバージョンを見つけて、今すぐ更新するかどうか', + 'update_new_version' => '最新バージョン', + 'update_old_version' => '現在のバージョン', + 'update_date' => '更新日', + 'update_btn' => 'ダウンロードする', ]; diff --git a/resources/lang/ru/admin/common.php b/resources/lang/ru/admin/common.php index 2eabc86f..3796f2b2 100644 --- a/resources/lang/ru/admin/common.php +++ b/resources/lang/ru/admin/common.php @@ -71,4 +71,10 @@ return [ 'customer_groups_index' => 'группа клиентов', 'countries_index' => 'Государственное управление', 'zones_index' => 'Управление провинции', + 'update_nav' => 'обновить', + 'update_title' => 'Найти новую версию BeikeShop, обновить ли сейчас', + 'update_new_version' => 'последняя версия', + 'update_old_version' => 'текущая версия', + 'update_date' => 'дата обновления', + 'update_btn' => 'перейти к загрузке', ]; diff --git a/resources/lang/zh_cn/admin/common.php b/resources/lang/zh_cn/admin/common.php index f837c51e..153c48e7 100644 --- a/resources/lang/zh_cn/admin/common.php +++ b/resources/lang/zh_cn/admin/common.php @@ -75,4 +75,10 @@ return [ 'customer_groups_index' => '客户组', 'countries_index' => '国家管理', 'zones_index' => '省份管理', + 'update_nav' => '更新', + 'update_title' => '发现新的BeikeShop版本，是否立即更新', + 'update_new_version' => '最新版本', + 'update_old_version' => '当前版本', + 'update_date' => '更新日期', + 'update_btn' => '前往下载', ]; diff --git a/resources/lang/zh_hk/admin/common.php b/resources/lang/zh_hk/admin/common.php index 60d31963..825b3289 100644 --- a/resources/lang/zh_hk/admin/common.php +++ b/resources/lang/zh_hk/admin/common.php @@ -73,4 +73,10 @@ return [ 'customer_groups_index' => '客戶組', 'countries_index' => '國家管理', 'zones_index' => '省份管理', + 'update_nav' => '更新', + 'update_title' => '發現新的BeikeShop版本，是否立即更新', + 'update_new_version' => '最新版本', + 'update_old_version' => '當前版本', + 'update_date' => '更新日期', + 'update_btn' => '前往下載', ];