diff --git a/lib/get-bgmv0-data.js b/lib/get-bgmv0-data.js index ec57c53..22051bf 100644 --- a/lib/get-bgmv0-data.js +++ b/lib/get-bgmv0-data.js @@ -110,6 +110,7 @@ var getData = /*#__PURE__*/function () { score: (_bangumi$subject$scor = bangumi === null || bangumi === void 0 || (_bangumi$subject6 = bangumi.subject) === null || _bangumi$subject6 === void 0 ? void 0 : _bangumi$subject6.score) !== null && _bangumi$subject$scor !== void 0 ? _bangumi$subject$scor : '-', des: "".concat(bangumi === null || bangumi === void 0 || (_bangumi$subject7 = bangumi.subject) === null || _bangumi$subject7 === void 0 || (_bangumi$subject7 = _bangumi$subject7.short_summary) === null || _bangumi$subject7 === void 0 ? void 0 : _bangumi$subject7.trim(), "...") || '-', collect: (bangumi === null || bangumi === void 0 || (_bangumi$subject8 = bangumi.subject) === null || _bangumi$subject8 === void 0 ? void 0 : _bangumi$subject8.collection_total) || '-', + myStars: bangumi.rate || null, myComment: bangumi.comment || '-', progress: Math.round(((bangumi === null || bangumi === void 0 ? void 0 : bangumi.ep_status) || 0) / ((bangumi === null || bangumi === void 0 || (_bangumi$subject9 = bangumi.subject) === null || _bangumi$subject9 === void 0 ? void 0 : _bangumi$subject9.eps) || 1) * 100), tags: (bangumi === null || bangumi === void 0 || (_bangumi$subject10 = bangumi.subject) === null || _bangumi$subject10 === void 0 || (_bangumi$subject10 = _bangumi$subject10.tags) === null || _bangumi$subject10 === void 0 || (_bangumi$subject10 = _bangumi$subject10[0]) === null || _bangumi$subject10 === void 0 ? void 0 : _bangumi$subject10.name) || '-', diff --git a/lib/templates/bgm-template.ejs b/lib/templates/bgm-template.ejs index af059e5..70eed04 100644 --- a/lib/templates/bgm-template.ejs +++ b/lib/templates/bgm-template.ejs @@ -32,15 +32,20 @@
>

<%= __('summary') %>:<%= item.des || __('noSummary') %>

- <% if (showMyComment && item.myComment) { %> -
<%= __('myScore') %>: - <% if (item.myStars) { %> - - <% } %> -
- <%= __('comment') %>:<%= item.myComment %> -
- <% } %>
- + <% if (showMyComment && (item.myComment || item.myStars)) { %> +
> +
+ <%= __('myScore') %>: + <% if (item.myStars) { %> + + <% } else { %> + 暂无 + <% } %> +
+ <%= __('comment') %>:<%= item.myComment %> +
+
+ <% } %> diff --git a/lib/templates/bgmv0-template.ejs b/lib/templates/bgmv0-template.ejs index 96a464b..3f91d40 100644 --- a/lib/templates/bgmv0-template.ejs +++ b/lib/templates/bgmv0-template.ejs @@ -36,17 +36,24 @@
<% } %> -
-

<%= __('summary') %>:<%= item.des || __('noSummary') %>

- <% if (showMyComment && item.myComment) { %> -
- <% if (item.myStars) { %> - <%= __('myScore') %>: -
- <% } %> - <%= __('comment') %>:<%= item.myComment %> -
- <% } %> +
> +

+ <%= __('summary') %>:<%= item.des || __('noSummary') %> +

+ <% if (showMyComment && (item.myComment || item.myStars)) { %> +
> +
+ <%= __('myScore') %>: + <% if (item.myStars) { %> + + <% } else { %> + 暂无 + <% } %> +
+ <%= __('comment') %>:<%= item.myComment %> +
+
<% } %> diff --git a/lib/templates/index.css b/lib/templates/index.css index 5883fc5..4991c01 100644 --- a/lib/templates/index.css +++ b/lib/templates/index.css @@ -1 +1 @@ -.bangumi-tabs{margin-bottom:15px;margin-top:15px}.bangumi-tab{padding:5px}a.bangumi-tab{text-decoration:none}.bangumi-active{background:#657b83;color:#fff}.bangumi-item{position:relative;clear:both;padding:10px 0;border-bottom:1px solid #ddd;min-height:180px}@media screen and (max-width:600px){.bangumi-item{width:100%}}.bangumi-picture{position:absolute;left:0;top:10px;width:110px}.bangumi-picture img{margin:10px 0}.bangumi-info{padding-left:120px;margin-top:10px}.bangumi-meta{font-size:12px;padding-right:10px;height:45px}.bangumi-comments{font-size:12px;margin-top:10px}.bangumi-comments>p{word-break:break-all;text-overflow:ellipsis;overflow:hidden;white-space:normal;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:3}.bangumi-pagination{margin-top:15px;text-align:center;margin-bottom:10px}.bangumi-button{padding:5px}.bangumi-button:hover{background:#657b83;color:#fff}.bangumi-hide{display:none}.bangumi-show{display:block}.bangumi-title{font-size:18px;font-weight:700}.bangumi-title a{line-height:1;text-decoration:none}.bangumi-info-items{font-size:12px;color:#2fd8d8;padding-top:10px;line-height:1;float:left;width:100%}.bangumi-info-item{display:inline-block;width:13%;border-right:1px solid #2fd8d8;text-align:center;height:34px}.bangumi-info-label{display:block;line-height:12px}.bangumi-info-item em{display:block;padding-top:6px;line-height:17px;font-style:normal;font-weight:700}.bangumi-info-total{padding-top:11px;display:block;line-height:12px;font-weight:700}.bangumi-info-item-score{border-right:1px solid #0000;width:50px}.bangumi-info-label-em{color:transparent;opacity:0;visibility:hidden;line-height:6px!important;padding:0!important}@media (max-width:650px){.bangumi-coin,.bangumi-type{display:none}.bangumi-info-item{width:16%}}@media (max-width:590px){.bangumi-danmaku,.bangumi-wish{display:none}.bangumi-info-item{width:19%}}@media (max-width:520px){.bangumi-doing,.bangumi-play{display:none}.bangumi-info-item{width:24%}}@media (max-width:480px){.bangumi-collect,.bangumi-follow{display:none}.bangumi-info-item{width:30%}}@media (max-width:400px){.bangumi-area{display:none}.bangumi-info-item{width:45%}}.bangumi-my-comments{border:1px dashed #8f8f8f;padding:3px;border-radius:5px;margin-left:-120px}.bangumi-starstop{background:url(https://cdn.jsdelivr.net/npm/hexo-bilibili-bangumi@1.7.9/lib/img/rate_star_2x.png) 100% 100%/10px 19.5px repeat-x;height:10px;width:50px;display:inline-block;float:none}.bangumi-starlight{background:url(https://cdn.jsdelivr.net/npm/hexo-bilibili-bangumi@1.7.9/lib/img/rate_star_2x.png) 0 0/10px 19.5px repeat-x;height:10px;display:block;width:100%}.bangumi-starlight.stars1{width:5px}.bangumi-starlight.stars2{width:10px}.bangumi-starlight.stars3{width:15px}.bangumi-starlight.stars4{width:20px}.bangumi-starlight.stars5{width:25px}.bangumi-starlight.stars6{width:30px}.bangumi-starlight.stars7{width:35px}.bangumi-starlight.stars8{width:40px}.bangumi-starlight.stars9{width:45px}.bangumi-starlight.stars10{width:50px}.bangumi-info .bangumi-progress{width:100%;height:24px;background-color:#f2f2f2;border-radius:5px;overflow:hidden;font-size:16px;text-align:center;position:relative}.bangumi-info .bangumi-progress-text{z-index:100;position:relative;color:#3c4858;line-height:24px}.bangumi-info .bangumi-progress .progress-bar{z-index:50;height:100%;background-color:#007bffad;border-radius:5px;position:absolute;top:0} \ No newline at end of file +.bangumi-tabs{margin-bottom:15px;margin-top:15px}.bangumi-tab{padding:5px}a.bangumi-tab{text-decoration:none}.bangumi-active{background:#657b83;color:#fff}.bangumi-item{position:relative;clear:both;padding:10px 0;border-bottom:1px solid #ddd;min-height:180px}@media screen and (max-width:600px){.bangumi-item{width:100%}}.bangumi-picture{position:absolute;left:0;top:10px;width:110px}.bangumi-picture img{margin:10px 0}.bangumi-info{padding-left:120px;margin-top:10px}.bangumi-meta{font-size:12px;padding-right:10px;height:45px}.bangumi-summary{font-size:12px;margin-top:10px}.bangumi-summary>p{word-break:break-all;text-overflow:ellipsis;overflow:hidden;white-space:normal;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:3}.bangumi-comments{font-size:12px}.bangumi-pagination{margin-top:15px;text-align:center;margin-bottom:10px}.bangumi-button{padding:5px}.bangumi-button:hover{background:#657b83;color:#fff}.bangumi-hide{display:none}.bangumi-show{display:block}.bangumi-title{font-size:18px;font-weight:700}.bangumi-title a{line-height:1;text-decoration:none}.bangumi-info-items{font-size:12px;color:#2fd8d8;padding-top:10px;line-height:1;float:left;width:100%}.bangumi-info-item{display:inline-block;width:13%;border-right:1px solid #2fd8d8;text-align:center;height:34px}.bangumi-info-label{display:block;line-height:12px}.bangumi-info-item em{display:block;padding-top:6px;line-height:17px;font-style:normal;font-weight:700}.bangumi-info-total{padding-top:11px;display:block;line-height:12px;font-weight:700}.bangumi-info-item-score{border-right:1px solid #0000;width:50px}.bangumi-info-label-em{color:transparent;opacity:0;visibility:hidden;line-height:6px!important;padding:0!important}@media (max-width:650px){.bangumi-coin,.bangumi-type{display:none}.bangumi-info-item{width:16%}}@media (max-width:590px){.bangumi-danmaku,.bangumi-wish{display:none}.bangumi-info-item{width:19%}}@media (max-width:520px){.bangumi-doing,.bangumi-play{display:none}.bangumi-info-item{width:24%}}@media (max-width:480px){.bangumi-collect,.bangumi-follow{display:none}.bangumi-info-item{width:30%}}@media (max-width:400px){.bangumi-area{display:none}.bangumi-info-item{width:45%}}.bangumi-my-comments{border:1px dashed #8f8f8f;padding:3px;border-radius:5px}.bangumi-starstop{background:url(https://cdn.jsdelivr.net/npm/hexo-bilibili-bangumi@1.7.9/lib/img/rate_star_2x.png) 100% 100%/10px 19.5px repeat-x;height:10px;width:50px;display:inline-block;float:none}.bangumi-starlight{background:url(https://cdn.jsdelivr.net/npm/hexo-bilibili-bangumi@1.7.9/lib/img/rate_star_2x.png) 0 0/10px 19.5px repeat-x;height:10px;display:block;width:100%}.bangumi-starlight.stars1{width:5px}.bangumi-starlight.stars2{width:10px}.bangumi-starlight.stars3{width:15px}.bangumi-starlight.stars4{width:20px}.bangumi-starlight.stars5{width:25px}.bangumi-starlight.stars6{width:30px}.bangumi-starlight.stars7{width:35px}.bangumi-starlight.stars8{width:40px}.bangumi-starlight.stars9{width:45px}.bangumi-starlight.stars10{width:50px}.bangumi-info .bangumi-progress{width:100%;height:24px;background-color:#f2f2f2;border-radius:5px;overflow:hidden;font-size:16px;text-align:center;position:relative}.bangumi-info .bangumi-progress-text{z-index:100;position:relative;color:#3c4858;line-height:24px}.bangumi-info .bangumi-progress .progress-bar{z-index:50;height:100%;background-color:#007bffad;border-radius:5px;position:absolute;top:0} \ No newline at end of file diff --git a/package.json b/package.json index d1140cc..6b0b11c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hexo-bilibili-bangumi", - "version": "1.10.3", + "version": "1.10.4", "description": "hexo bilibili番剧页", "main": "index.js", "scripts": { diff --git a/src/lib/get-bgmv0-data.js b/src/lib/get-bgmv0-data.js index 7ab28e3..d3e8f37 100644 --- a/src/lib/get-bgmv0-data.js +++ b/src/lib/get-bgmv0-data.js @@ -48,6 +48,7 @@ const getData = async (vmid, status, typeNum, pn, coverMirror) => { score: bangumi?.subject?.score ?? '-', des: `${bangumi?.subject?.short_summary?.trim()}...` || '-', collect: bangumi?.subject?.collection_total || '-', + myStars: bangumi.rate || null, myComment: bangumi.comment || '-', progress: Math.round(((bangumi?.ep_status || 0) / (bangumi?.subject?.eps || 1)) * 100), tags: bangumi?.subject?.tags?.[0]?.name || '-', diff --git a/src/lib/templates/index.css b/src/lib/templates/index.css index 007f4b7..451fb9e 100644 --- a/src/lib/templates/index.css +++ b/src/lib/templates/index.css @@ -53,12 +53,12 @@ a.bangumi-tab { height: 45px; } -.bangumi-comments { +.bangumi-summary { font-size: 12px; - margin-top: 10px + margin-top: 10px; } -.bangumi-comments>p { +.bangumi-summary>p { word-break: break-all; text-overflow: ellipsis; overflow: hidden; @@ -69,6 +69,10 @@ a.bangumi-tab { -webkit-line-clamp: 3; } +.bangumi-comments { + font-size: 12px; +} + .bangumi-pagination { margin-top: 15px; text-align: center; @@ -214,7 +218,6 @@ a.bangumi-tab { border: 1px dashed #8f8f8f; padding: 3px; border-radius: 5px; - margin-left: -120px; } .bangumi-starstop {