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