From fae739affd1b7aa0efb6f582c4e09e7030784857 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期四, 04 九月 2025 08:20:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jx-fyxc-wms' into jx-fyxc-wms
---
src/main/webapp/views/index.html | 81 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 78 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index 1b0d9a7..2ddc33e 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -10,6 +10,8 @@
<link rel="stylesheet" href="../static/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../static/css/admin.css?v=318" media="all">
<link rel="stylesheet" href="../static/css/loader.css" media="all">
+ <link rel="stylesheet" href="../static/css/layx.min.css" type="text/css" />
+ <script src="../static/js/tools/layx.min.js"></script>
<style>
.layui-logo img {
width: 25px;
@@ -18,6 +20,27 @@
font-size: 18px;
font-weight: 400;
/*margin-left: 5px;*/
+ }
+ /* 寮圭獥鏍峰紡 */
+ .popup {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0,0,0,0.5);
+ display: none;
+ justify-content: center;
+ align-items: center;
+ z-index: 9999;
+ }
+
+ .popup-content {
+ background-color: #fff;
+ padding: 20px;
+ border-radius: 5px;
+ box-shadow: 0px 0px 20px rgba(0,0,0,0.3);
+ text-align: center;
}
</style>
</head>
@@ -41,9 +64,9 @@
</li>
</ul>
<ul class="layui-nav layui-layout-right">
-<!-- <li class="layui-nav-item" lay-unselect id="licenseShow" style="display: none;user-select: none;">-->
-<!-- <div style="color: red;">璁稿彲璇佹湁鏁堟湡锛�<span id="licenseDays">29</span>澶�</div>-->
-<!-- </li>-->
+ <li class="layui-nav-item" lay-unselect id="licenseShow" style="display: none;user-select: none;">
+ <div style="color: red;">浠撳偍绯荤粺璁稿彲鏈夋晥鏈燂細<span id="licenseDays">29</span>澶�</div>
+ </li>
<li class="layui-nav-item layui-hide-xs" lay-unselect>
<a ew-event="fullScreen" title="鍏ㄥ睆"><i class="layui-icon layui-icon-screen-full"></i></a>
</li>
@@ -85,12 +108,64 @@
<div class="layuimini-loader">
<div class="layuimini-loader-inner"></div>
</div>
+<!-- 寮圭獥鍐呭 -->
+<div class="popup" id="popup">
+ <div class="popup-content">
+ <h2 style="font-size: 28px;margin-bottom: 10px;">璁稿彲璇佸嵆灏嗚繃鏈�</h2>
+ <div id="popup-text" style="font-size: 28px;color: red"></div>
+ <button style="background-color: #007bff;color: #fff;border: none;padding: 10px 20px;border-radius: 5px;cursor: pointer;font-size: 16px;" onclick="hidePopup()">鍏抽棴</button>
+ </div>
+</div>
+<script>
+ // 鏄剧ず寮圭獥
+ function showPopup(res) {
+ document.getElementById('popup').style.display = 'block';
+ // 鑾峰彇寮瑰嚭绐楀彛鍐呭鐨勫鍣ㄥ厓绱�
+ var popupText = document.getElementById('popup-text');
+ // 鍋囪鍚庡彴杩斿洖鐨勫瓧绗︿覆涓� responseString
+ if (res!==""){
+ // 鑾峰彇褰撳墠鏃ユ湡
+ const currentDate = new Date();
+ // 鍒涘缓鏂版棩鏈熷璞″苟娣诲姞澶╂暟
+ const newDate = new Date();
+ newDate.setDate(currentDate.getDate() + res + 1);
+ // 灏嗗瓧绗︿覆璁剧疆涓哄脊绐楀唴瀹圭殑鏂囨湰
+ popupText.textContent = "璁稿彲璇佸皢浜�" + new Intl.DateTimeFormat('zh-CN').format(newDate) + "杩囨湡锛屽墿浣欐湁鏁堟湡:" + res + "澶╋紒";
+ }else {
+ document.getElementById('popup').style.display = 'none';
+ }
+ }
+ // 闅愯棌寮圭獥
+ function hidePopup() {
+ document.getElementById('popup').style.display = 'none';
+ }
+</script>
<script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../static/layui/layui.js"></script>
<script type="text/javascript" src="../static/js/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../static/js/common.js"></script>
<script>
+ f()
+ function f() {
+ $.ajax({
+ url: baseUrl + "/license/getLicenseDays",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ if (res.code == 200) {
+ let days = res.data
+ if (days <= 15) {
+ showPopup(res.data)
+ } else {
+ showPopup("");
+ }
+ }
+ }
+ });
+ }
+</script>
+<script>
console.log('%c 涓壃绔嬪簱骞冲彴 %c 1.0.0','background-color:rgb(53,73,94);color: #fff;border-radius:2px 0 0 2px;padding:2px 4px;','background-color:rgb(25,190,107);color: #fff;border-radius:0 2px 2px 0;padding:2px 4px;font: 9pt "Apercu Regular", Georgia, "Times New Roman", Times, serif;');
$(function () {
if ("" === localStorage.getItem('token')) {
--
Gitblit v1.9.1