Compare commits

..

No commits in common. "66417cb5118bd78e3c8435bc60252c4204945678" and "371b6052680e3668a5dfcc50723aadde611b0aa0" have entirely different histories.

6 changed files with 291 additions and 319 deletions

View File

@ -379,24 +379,10 @@ let halo = {
function getPower() { function getPower() {
const url = GLOBAL_CONFIG.source.power.url; const url = GLOBAL_CONFIG.source.power.url;
let powerStar = document.getElementById("power-star")
powerStar.href = GLOBAL_CONFIG.source.power.powerLink
fetch(url) fetch(url)
.then(response => { .then(res => res.json())
// 检查响应状态码
if (!response.ok) {
// 如果响应状态码不是 200抛出一个错误
powerStar.innerHTML = `
<div id="power-star-image" style="background-image: url('/themes/theme-hao/assets/images/afadian/afadian.webp')">
</div>
<div class="power-star-body">
<div id="power-star-title">还没有人赞助</div>
<div id="power-star-desc">为爱发电点击赞助</div>
</div>`;
}
return response.json(); // 只有在状态码为 200 时才解析 JSON
})
.then(data => { .then(data => {
console.log(data)
if (200 === data["ec"]) { if (200 === data["ec"]) {
const values = data["data"]["list"]; const values = data["data"]["list"];
saveToLocal.set('power-data', JSON.stringify(values), 10 / (60 * 24)) saveToLocal.set('power-data', JSON.stringify(values), 10 / (60 * 24))
@ -404,6 +390,8 @@ let halo = {
} }
}) })
.catch(error => { .catch(error => {
let powerStar = document.getElementById("power-star")
powerStar.href = GLOBAL_CONFIG.source.power.powerLink
powerStar.innerHTML = ` powerStar.innerHTML = `
<div id="power-star-image" style="background-image: url('/themes/theme-hao/assets/images/afadian/afadian.webp')"> <div id="power-star-image" style="background-image: url('/themes/theme-hao/assets/images/afadian/afadian.webp')">
</div> </div>

View File

@ -115,7 +115,7 @@ var heo = {
function getLinks() { function getLinks() {
const fetchUrl = const fetchUrl =
"/apis/api.plugin.halo.run/v1alpha1/plugins/PluginLinks/links?keyword=" "/apis/api.plugin.halo.run/v1alpha1/plugins/PluginLinks/links?keyword=&sort=priority,asc"
fetch(fetchUrl) fetch(fetchUrl)
.then(res => res.json()) .then(res => res.json())
.then(json => { .then(json => {

View File

@ -7477,7 +7477,7 @@ span.fund_name {
height: 60px; height: 60px;
border-radius: 50%; border-radius: 50%;
background-size: cover; background-size: cover;
/* margin-right: 12px; */ margin-right: 12px;
border: var(--style-border-always); border: var(--style-border-always);
transition: .3s ease-out transition: .3s ease-out
} }
@ -7533,8 +7533,7 @@ div#power-star-title {
flex-wrap: wrap; flex-wrap: wrap;
position: relative; position: relative;
width: calc(100% - 68px); width: calc(100% - 68px);
justify-content: center; justify-content: center
padding-left: 12px;
} }
/* 商务广告-设计周刊 */ /* 商务广告-设计周刊 */
@ -10016,7 +10015,7 @@ span.recent-post-top-text {
} }
/* 作者打招呼 */ /* 作者打招呼 */
/* div#author-info__sayhi { div#author-info__sayhi {
text-align: left; text-align: left;
color: var(--heo-white); color: var(--heo-white);
background: var(--heo-white-op); background: var(--heo-white-op);
@ -10028,7 +10027,7 @@ span.recent-post-top-text {
cursor: pointer; cursor: pointer;
-webkit-user-select: none; -webkit-user-select: none;
transition: 0.3s; transition: 0.3s;
} */ }
div#author-info__sayhi:hover { div#author-info__sayhi:hover {
background: var(--heo-white-op); background: var(--heo-white-op);
@ -10440,7 +10439,7 @@ a.extend.prev {
} }
#post-info .post-title { #post-info .post-title {
width: 1200px; width: 1100px;
font-size: 2.6rem !important; font-size: 2.6rem !important;
} }
} }
@ -16337,7 +16336,7 @@ span.hexo-douban-pagenum {
padding: 1rem; padding: 1rem;
border-radius: 12px; border-radius: 12px;
border: var(--style-border-always); border: var(--style-border-always);
width: calc((100% / 4) - 0.5rem); width: calc((100% / 6) - 0.5rem);
margin: 0rem 0.25rem 0.5rem 0.25rem; margin: 0rem 0.25rem 0.5rem 0.25rem;
box-shadow: var(--heo-shadow-border); box-shadow: var(--heo-shadow-border);
} }
@ -16349,12 +16348,11 @@ span.hexo-douban-pagenum {
@media screen and (max-width: 1200px) { @media screen and (max-width: 1200px) {
.author-content-item.single.reward .reward-list-all .reward-list-item { .author-content-item.single.reward .reward-list-all .reward-list-item {
width: calc((100% / 3) - 0.5rem); width: calc((100% / 4) - 0.5rem);
} }
.author-content-item.single.reward .reward-list-all .reward-list-item .reward-list-item-avatar { .author-content-item.single.reward .reward-list-all .reward-list-item .reward-list-item-avatar {
/* display: none; */ width: 32%;
/* width: 32%; */
} }
} }
@ -16363,19 +16361,19 @@ span.hexo-douban-pagenum {
width: calc((100% / 2) - 0.5rem); width: calc((100% / 2) - 0.5rem);
} }
/* .author-content-item.single.reward .reward-list-all .reward-list-item .reward-list-item-avatar { .author-content-item.single.reward .reward-list-all .reward-list-item .reward-list-item-avatar {
width: 20%; width: 20%;
} */ }
} }
@media screen and (max-width: 768px) { @media screen and (max-width: 768px) {
.author-content-item.single.reward .reward-list-all .reward-list-item { .author-content-item.single.reward .reward-list-all .reward-list-item {
width: calc((100% / 2) - 0.5rem); width: 100%;
} }
/* .author-content-item.single.reward .reward-list-all .reward-list-item .reward-list-item-avatar { .author-content-item.single.reward .reward-list-all .reward-list-item .reward-list-item-avatar {
width: 9%; width: 9%;
} */ }
} }
@media screen and (max-width: 520px) { @media screen and (max-width: 520px) {
@ -16383,9 +16381,9 @@ span.hexo-douban-pagenum {
width: 100%; width: 100%;
} }
/* .author-content-item.single.reward .reward-list-all .reward-list-item .reward-list-item-avatar { .author-content-item.single.reward .reward-list-all .reward-list-item .reward-list-item-avatar {
width: 20%; width: 20%;
} */ }
} }
.author-content-item.single.reward .author-content-item-description { .author-content-item.single.reward .author-content-item-description {
@ -16408,34 +16406,19 @@ span.hexo-douban-pagenum {
width: 100%; width: 100%;
} }
.author-content-item.single.reward .reward-list-all .reward-list-item .reward-list-item-container {
display: flex;
justify-content: flex-start;
justify-content: space-between;
height: auto;
}
.author-content-item.single.reward .reward-list-all .reward-list-item .reward-list-item-container .reward-list-item-content {
flex: 2;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-left: 15px;
}
.author-content-item.single.reward .reward-list-all .reward-list-item .reward-list-item-avatar { .author-content-item.single.reward .reward-list-all .reward-list-item .reward-list-item-avatar {
width: 80px; width: 32%;
float: left; float: left;
z-index: 10; z-index: 10;
position: static; position: static;
height: 80px; height: 40px;
/* transform: translateY(-40%); */ transform: translateY(-40%);
} }
.author-content-item.single.reward .reward-list-all .reward-list-item .reward-list-item-avatar img { .author-content-item.single.reward .reward-list-all .reward-list-item .reward-list-item-avatar img {
border-radius: 50%; border-radius: 50%;
width: 80px; width: 80%;
/* margin-top: 0.4rem; */ margin-top: 0.2rem;
} }
.author-content-item.single.reward .reward-list-all .reward-list-item .reward-list-item-avatar-group { .author-content-item.single.reward .reward-list-all .reward-list-item .reward-list-item-avatar-group {

View File

@ -61,17 +61,14 @@
<div class="reward-list-item" th:each="authorReward : ${authorRewardList}"> <div class="reward-list-item" th:each="authorReward : ${authorRewardList}">
<div th:if="${not #strings.isEmpty(authorReward.avatar)}"> <div th:if="${not #strings.isEmpty(authorReward.avatar)}">
<div class="reward-list-item-container"> <div>
<!-- 头像 -->
<div class="reward-list-item-avatar"> <div class="reward-list-item-avatar">
<img th:src="${authorReward.avatar}" th:alt="${authorReward.name}"> <img th:src="${authorReward.avatar}" th:alt="${authorReward.name}">
</div> </div>
<div class="reward-list-item-content">
<!-- 名称 -->
<div style="z-index:20;float: left;" class="reward-list-item-avatar-group"> <div style="z-index:20;float: left;" class="reward-list-item-avatar-group">
<div class="reward-list-item-name">[[${authorReward.name}]]</div> <div class="reward-list-item-name">[[${authorReward.name}]]</div>
</div> </div>
<!-- 金额及时间 --> </div>
<div class="reward-list-bottom-group"> <div class="reward-list-bottom-group">
<div th:if="${#conversions.convert(authorReward.amount, 'java.math.BigDecimal') < #conversions.convert(theme.config.aboutReward.rewardNumber, 'java.math.BigDecimal')}" class="reward-list-item-money">¥ <div th:if="${#conversions.convert(authorReward.amount, 'java.math.BigDecimal') < #conversions.convert(theme.config.aboutReward.rewardNumber, 'java.math.BigDecimal')}" class="reward-list-item-money">¥
[[${authorReward.amount}]] [[${authorReward.amount}]]
@ -82,9 +79,6 @@
<time class="datatime reward-list-item-time">[[${authorReward.datatime}]]</time> <time class="datatime reward-list-item-time">[[${authorReward.datatime}]]</time>
</div> </div>
</div> </div>
</div>
</div>
<div th:if="${#strings.isEmpty(authorReward.avatar)}"> <div th:if="${#strings.isEmpty(authorReward.avatar)}">
<div class="reward-list-item-name">[[${authorReward.name}]]</div> <div class="reward-list-item-name">[[${authorReward.name}]]</div>
<div class="reward-list-bottom-group"> <div class="reward-list-bottom-group">

View File

@ -6,7 +6,8 @@
<div class="author-content-item-tips">数据</div> <div class="author-content-item-tips">数据</div>
<span class="author-content-item-title">访问统计</span> <span class="author-content-item-title">访问统计</span>
<div id="statistic"></div> <div id="statistic"></div>
<div class="post-tips">统计信息来自 <a href="https://v6.51.la/" rel="noopener nofollow" <div class="post-tips">统计信息来自 <a href="https://invite.51.la/1NzKqTeb?target=V6"
rel="noopener nofollow"
target="_blank">51la网站统计</a></div> target="_blank">51la网站统计</a></div>
<div class="banner-button-group"> <div class="banner-button-group">
<a class="banner-button" onclick="pjax.loadUrl('/archives')" data-pjax-state=""> <a class="banner-button" onclick="pjax.loadUrl('/archives')" data-pjax-state="">
@ -28,19 +29,24 @@
th:if="${not #lists.isEmpty(theme.config.about.map.authorInfo)}" th:if="${not #lists.isEmpty(theme.config.about.map.authorInfo)}"
th:with="texts = ${theme.config.about.map.authorInfo}"> th:with="texts = ${theme.config.about.map.authorInfo}">
<div th:if="${theme.config.about.map.authorInfo.size()}>'0'"> <div th:if="${theme.config.about.map.authorInfo.size()}>'0'">
<span class="selfInfo-title" th:text="${texts[0].authorInfoTitle}">生于</span><span <span class="selfInfo-title"
class="selfInfo-content" id="selfInfo-content-year" th:text="${texts[0].authorInfoTitle}">生于</span><span
th:style="'color:' + ${texts[0].authorInfoColor}" class="selfInfo-content"
id="selfInfo-content-year" th:style="'color:' + ${texts[0].authorInfoColor}"
th:text="${texts[0].authorInfoContent}">2000</span> th:text="${texts[0].authorInfoContent}">2000</span>
</div> </div>
<div th:if="${theme.config.about.map.authorInfo.size()}>'1'"> <div th:if="${theme.config.about.map.authorInfo.size()}>'1'">
<span class="selfInfo-title" th:text="${texts[1].authorInfoTitle}">太原理工大学</span><span <span class="selfInfo-title"
class="selfInfo-content" th:style="'color:' + ${texts[1].authorInfoColor}" th:text="${texts[1].authorInfoTitle}">太原理工大学</span><span
class="selfInfo-content"
th:style="'color:' + ${texts[1].authorInfoColor}"
th:text="${texts[1].authorInfoContent}">计算机科学</span> th:text="${texts[1].authorInfoContent}">计算机科学</span>
</div> </div>
<div th:if="${theme.config.about.map.authorInfo.size()}>'2'"> <div th:if="${theme.config.about.map.authorInfo.size()}>'2'">
<span class="selfInfo-title" th:text="${texts[2].authorInfoTitle}">现在职业</span><span <span class="selfInfo-title"
class="selfInfo-content" th:style="'color:' + ${texts[2].authorInfoColor}" th:text="${texts[2].authorInfoTitle}">现在职业</span><span
class="selfInfo-content"
th:style="'color:' + ${texts[2].authorInfoColor}"
th:text="${texts[2].authorInfoContent}">BI工程师</span> th:text="${texts[2].authorInfoContent}">BI工程师</span>
</div> </div>
</div> </div>
@ -176,5 +182,6 @@
} }
initAboutPage(); initAboutPage();
</script> </script>
</div> </div>

View File

@ -51,5 +51,5 @@ spec:
repo: https://gitea.uptoz.cn/UPToZ/halo-theme-hao repo: https://gitea.uptoz.cn/UPToZ/halo-theme-hao
settingName: "theme-hao-setting" settingName: "theme-hao-setting"
configMapName: "theme-hao-configMap" configMapName: "theme-hao-configMap"
version: "1.0.2-ce" version: "1.0.1-ce"
require: ">=2.10.0" require: ">=2.10.0"