Merge pull request #599 from carolcoral/main
fix: 修复"关于"页面中“十年”进度超过100%的显示问题
This commit is contained in:
commit
4e2340303d
|
@ -42,7 +42,8 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="author-title" th:text="${singlePage.spec.title}"></div>
|
<div class="author-title" th:text="${singlePage.spec.title}"></div>
|
||||||
|
|
||||||
<th:block th:replace="~{modules/about-widgets :: about-widgets(${theme.config.about.widgetList})}"></th:block>
|
<th:block
|
||||||
|
th:replace="~{modules/about-widgets :: about-widgets(${theme.config.about.widgetList})}"></th:block>
|
||||||
|
|
||||||
<div class="author-content">
|
<div class="author-content">
|
||||||
<div class="create-site-post author-content-item single" th:utext="${theme.config.about.xjlc}">
|
<div class="create-site-post author-content-item single" th:utext="${theme.config.about.xjlc}">
|
||||||
|
@ -56,7 +57,8 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<th:block th:if="${theme.config.about.tenyear.tenyear_enable}">
|
<th:block th:if="${theme.config.about.tenyear.tenyear_enable}">
|
||||||
<link rel="stylesheet" th:href="${assets_link + '/css/tenyear.css' + theme_version}" media="all" onload="this.media='all'">
|
<link rel="stylesheet" th:href="${assets_link + '/css/tenyear.css' + theme_version}" media="all"
|
||||||
|
onload="this.media='all'">
|
||||||
<script> (() => {
|
<script> (() => {
|
||||||
const t = document.querySelector(".progress"),
|
const t = document.querySelector(".progress"),
|
||||||
n = document.querySelector(".past-time"),
|
n = document.querySelector(".past-time"),
|
||||||
|
@ -66,8 +68,9 @@
|
||||||
a = new Date("[(${theme.config.about.tenyear.start_time})]").getTime(),
|
a = new Date("[(${theme.config.about.tenyear.start_time})]").getTime(),
|
||||||
i = new Date("[(${theme.config.about.tenyear.end_time})]").getTime(),
|
i = new Date("[(${theme.config.about.tenyear.end_time})]").getTime(),
|
||||||
c = ((new Date).getTime() - a) / (i - a) * 100,
|
c = ((new Date).getTime() - a) / (i - a) * 100,
|
||||||
u = c <= 100 ? c + "%" : "100%";
|
u = c <= 100 ? c + "%" : "100%",
|
||||||
n.style.setProperty("--past-time-percentage", c + "%"), t.style.setProperty("--progress-percentage", u), o.textContent = c.toFixed(0) + "%", o.style.left = `calc(${c}% - 33px)`, r.textContent = "" + new Date(a).toLocaleDateString(), s.textContent = "" + new Date(i).toLocaleDateString(), setTimeout(() => {
|
m = c <= 100 ? c.toFixed(0) + "%" : "已达标 ";
|
||||||
|
n.style.setProperty("--past-time-percentage", c + "%"), t.style.setProperty("--progress-percentage", u), o.textContent = m, o.style.left = `calc(${c}% - 33px)`, r.textContent = "" + new Date(a).toLocaleDateString(), s.textContent = "" + new Date(i).toLocaleDateString(), setTimeout(() => {
|
||||||
o.style.visibility = "visible"
|
o.style.visibility = "visible"
|
||||||
}, 2500);
|
}, 2500);
|
||||||
})()
|
})()
|
||||||
|
|
Loading…
Reference in New Issue