diff --git a/archive.php b/archive.php
index 012c2c1d..8ea3c55b 100644
--- a/archive.php
+++ b/archive.php
@@ -21,9 +21,16 @@
搜索到
getTotal(); ?>
- 篇与
- _keywords; ?>
- 的结果
+ 篇
+ %s ';
+ $this->archiveTitle(array(
+ 'category' => '分类为'.$sp.'的文章',
+ 'search' => '包含关键字'.$sp.'的文章',
+ 'tag' => '标签为'.$sp.'的文章',
+ 'author' => $sp.'发布的文章')
+ , '', '');
+ ?>
diff --git a/assets/js/joe.global.js b/assets/js/joe.global.js
index 38bd01d2..582749c3 100644
--- a/assets/js/joe.global.js
+++ b/assets/js/joe.global.js
@@ -332,10 +332,28 @@ document.addEventListener('DOMContentLoaded', () => {
window.location.reload();
}
},
- error() {
+ error(res) {
isSubmit = false;
$('.joe_comment__respond-form .foot .submit button').html('发表评论');
- Qmsg.warning('发送失败！请刷新重试！');
+ /*
+ *解析其他错误提示。
+ *如未登录状态下，使用注册用户的昵称回复，可正常显示错误提示：您所使用的用户名已经被注册,请登录后再次提交
+ */
+ if(res.responseText){
+ let arr = [],
+ str = '';
+ arr = $(res.responseText).contents();
+ Array.from(arr).forEach(_ => {
+ if (_.parentNode.className === 'container') str = _;
+ });
+ if (!/Joe/.test(res.responseText)) {
+ Qmsg.warning(str.textContent.trim() || '');
+ }else{
+ Qmsg.warning('发送失败！请刷新重试！');
+ }
+ }else{
+ Qmsg.warning('发送失败！请刷新重试！');
+ }
}
});
});
diff --git a/assets/js/joe.global.min.js b/assets/js/joe.global.min.js
index 897ea95b..604cc988 100644
--- a/assets/js/joe.global.min.js
+++ b/assets/js/joe.global.min.js
@@ -1 +1,24 @@
-document.addEventListener("DOMContentLoaded",()=>{localStorage.getItem("data-night")?($(".joe_action_item.mode .icon-1").addClass("active"),$(".joe_action_item.mode .icon-2").removeClass("active")):($("html").removeAttr("data-night"),$(".joe_action_item.mode .icon-1").removeClass("active"),$(".joe_action_item.mode .icon-2").addClass("active")),$(".joe_action_item.mode").on("click",()=>{localStorage.getItem("data-night")?($(".joe_action_item.mode .icon-1").removeClass("active"),$(".joe_action_item.mode .icon-2").addClass("active"),$("html").removeAttr("data-night"),localStorage.removeItem("data-night")):($(".joe_action_item.mode .icon-1").addClass("active"),$(".joe_action_item.mode .icon-2").removeClass("active"),$("html").attr("data-night","night"),localStorage.setItem("data-night","night"))}),Joe.IS_MOBILE||"off"===Joe.DYNAMIC_BACKGROUND||!Joe.DYNAMIC_BACKGROUND||Joe.WALLPAPER_BACKGROUND_PC||$.getScript(window.Joe.THEME_URL+`assets/backdrop/${Joe.DYNAMIC_BACKGROUND}`),$(".joe_header__above-search .input").on("click",e=>{e.stopPropagation(),$(".joe_header__above-search .result").addClass("active")}),$(document).on("click",function(){$(".joe_header__above-search .result").removeClass("active")}),$(".joe_dropdown").each(function(e,t){const o=$(this).find(".joe_dropdown__menu"),a=$(t).attr("trigger")||"click",n=$(t).attr("placement")||$(this).height()||0;o.css("top",n),"hover"===a?$(this).hover(()=>$(this).addClass("active"),()=>$(this).removeClass("active")):($(this).on("click",function(e){$(this).toggleClass("active"),$(document).one("click",()=>$(this).removeClass("active")),e.stopPropagation()}),o.on("click",e=>e.stopPropagation()))});{let e=null;const t=()=>(document.documentElement.scrollTop||document.body.scrollTop)>300?$(".joe_action_item.scroll").addClass("active"):$(".joe_action_item.scroll").removeClass("active");t(),$(document).on("scroll",()=>{clearTimeout(e),e=setTimeout(t,80)}),$(".joe_action_item.scroll").on("click",()=>window.scrollTo({top:0,behavior:"smooth"}))}if($(".joe_aside__item.timelife").length){let e=[{title:"今日已经过去",endTitle:"小时",num:0,percent:"0%"},{title:"这周已经过去",endTitle:"天",num:0,percent:"0%"},{title:"本月已经过去",endTitle:"天",num:0,percent:"0%"},{title:"今年已经过去",endTitle:"个月",num:0,percent:"0%"}];{let t=+new Date,o=new Date((new Date).toLocaleDateString()).getTime(),a=(t-o)/1e3/60/60,n=a/24*100;e[0].num=parseInt(a),e[0].percent=parseInt(n)+"%"}{let t={0:7,1:1,2:2,3:3,4:4,5:5,6:6},o=t[(new Date).getDay()],a=o/7*100;e[1].num=parseInt(o),e[1].percent=parseInt(a)+"%"}{let t=(new Date).getFullYear(),o=(new Date).getDate(),a=(new Date).getMonth()+1,n=new Date(t,a,0).getDate(),i=o/n*100;e[2].num=o,e[2].percent=parseInt(i)+"%"}{let t=(new Date).getMonth()+1,o=t/12*100;e[3].num=t,e[3].percent=parseInt(o)+"%"}let t="";e.forEach((e,o)=>{t+=`\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t
\n\t\t\t\t\t\t\t\t${e.title}\n\t\t\t\t\t\t\t\t${e.num}\n\t\t\t\t\t\t\t\t${e.endTitle}\n\t\t\t\t\t\t\t
\n\t\t\t\t\t\t\t
\n\t\t\t\t\t\t\t\t
\n\t\t\t\t\t\t\t\t\t
\n\t\t\t\t\t\t\t\t
\n\t\t\t\t\t\t\t\t
${e.percent}
\n\t\t\t\t\t\t\t
\n\t\t\t\t\t\t
${a}
`,o+=`\n \n `}$(".joe_owo__contain").html(`\n OωO
\n \n `),$(document).on("click",function(){$(".joe_owo__contain .box").stop().slideUp("fast")}),$(".joe_owo__contain .seat").on("click",function(e){e.stopPropagation(),$(this).siblings(".box").stop().slideToggle("fast")}),$(".joe_owo__contain .box .bar .item").on("click",function(e){e.stopPropagation(),$(this).addClass("active").siblings().removeClass("active");const t='.joe_owo__contain .box .scroll[data-type="'+$(this).attr("data-type")+'"]';$(t).show().siblings(".scroll").hide()}),$(".joe_owo__contain .scroll .item").on("click",function(){const e=$(this).attr("data-text");$(".joe_owo__target").insertContent(e)}),$(".joe_owo__contain .box .bar .item").first().click()}});{let e=Joe.MOTTO;e||(e="有钱终成眷属，没钱亲眼目睹"),e.includes("http")?$.ajax({url:e,dataType:"text",success:e=>$(".joe_motto").html(e)}):$(".joe_motto").html(e)}if(!window.Joe.IS_MOBILE){let e=!0;const t=t=>{if(window.pageYOffset>=$(".joe_header").height()&&t<=0){if(e)return;$(".joe_header").addClass("active"),$(".joe_aside .joe_aside__item:last-child").css("top",$(".joe_header").height()-60+15),e=!0}else{if(!e)return;$(".joe_header").removeClass("active"),$(".joe_aside .joe_aside__item:last-child").css("top",$(".joe_header").height()+15),e=!1}};let o=window.pageYOffset;t(o);let a=Date.now();document.addEventListener("scroll",()=>{let e=Date.now();e-a>15&&(t(o-window.pageYOffset),o=window.pageYOffset),a=e})}});
\ No newline at end of file
+document.addEventListener("DOMContentLoaded",()=>{localStorage.getItem("data-night")?($(".joe_action_item.mode .icon-1").addClass("active"),$(".joe_action_item.mode .icon-2").removeClass("active")):($("html").removeAttr("data-night"),$(".joe_action_item.mode .icon-1").removeClass("active"),$(".joe_action_item.mode .icon-2").addClass("active")),$(".joe_action_item.mode").on("click",()=>{localStorage.getItem("data-night")?($(".joe_action_item.mode .icon-1").removeClass("active"),$(".joe_action_item.mode .icon-2").addClass("active"),$("html").removeAttr("data-night"),localStorage.removeItem("data-night")):($(".joe_action_item.mode .icon-1").addClass("active"),$(".joe_action_item.mode .icon-2").removeClass("active"),$("html").attr("data-night","night"),localStorage.setItem("data-night","night"))}),Joe.IS_MOBILE||"off"===Joe.DYNAMIC_BACKGROUND||!Joe.DYNAMIC_BACKGROUND||Joe.WALLPAPER_BACKGROUND_PC||$.getScript(window.Joe.THEME_URL+`assets/backdrop/${Joe.DYNAMIC_BACKGROUND}`),$(".joe_header__above-search .input").on("click",e=>{e.stopPropagation(),$(".joe_header__above-search .result").addClass("active")}),$(document).on("click",function(){$(".joe_header__above-search .result").removeClass("active")}),$(".joe_dropdown").each(function(e,t){const o=$(this).find(".joe_dropdown__menu");var a=$(t).attr("trigger")||"click",t=$(t).attr("placement")||$(this).height()||0;o.css("top",t),"hover"===a?$(this).hover(()=>$(this).addClass("active"),()=>$(this).removeClass("active")):($(this).on("click",function(e){$(this).toggleClass("active"),$(document).one("click",()=>$(this).removeClass("active")),e.stopPropagation()}),o.on("click",e=>e.stopPropagation()))});{let e=null;const o=()=>300<(document.documentElement.scrollTop||document.body.scrollTop)?$(".joe_action_item.scroll").addClass("active"):$(".joe_action_item.scroll").removeClass("active");o(),$(document).on("scroll",()=>{clearTimeout(e),e=setTimeout(o,80)}),$(".joe_action_item.scroll").on("click",()=>window.scrollTo({top:0,behavior:"smooth"}))}if($(".joe_aside__item.timelife").length){let e=[{title:"\u4eca\u65e5\u5df2\u7ecf\u8fc7\u53bb",endTitle:"\u5c0f\u65f6",num:0,percent:"0%"},{title:"\u8fd9\u5468\u5df2\u7ecf\u8fc7\u53bb",endTitle:"\u5929",num:0,percent:"0%"},{title:"\u672c\u6708\u5df2\u7ecf\u8fc7\u53bb",endTitle:"\u5929",num:0,percent:"0%"},{title:"\u4eca\u5e74\u5df2\u7ecf\u8fc7\u53bb",endTitle:"\u4e2a\u6708",num:0,percent:"0%"}];var t=(+new Date-new Date((new Date).toLocaleDateString()).getTime())/1e3/60/60,a=t/24*100;e[0].num=parseInt(t),e[0].percent=parseInt(a)+"%";var n={0:7,1:1,2:2,3:3,4:4,5:5,6:6}[(new Date).getDay()],t=n/7*100;e[1].num=parseInt(n),e[1].percent=parseInt(t)+"%";a=(new Date).getFullYear(),n=(new Date).getDate(),t=(new Date).getMonth()+1,t=n/new Date(a,t,0).getDate()*100;e[2].num=n,e[2].percent=parseInt(t)+"%";n=(new Date).getMonth()+1,t=n/12*100;e[3].num=n,e[3].percent=parseInt(t)+"%";let o="";e.forEach((e,t)=>{o+=`
+
+
+ ${e.title}
+ ${e.num}
+ ${e.endTitle}
+
+
+
${t}
`,a+=`
+
+ `}$(".joe_owo__contain").html(`
+ OωO
+
+ `),$(document).on("click",function(){$(".joe_owo__contain .box").stop().slideUp("fast")}),$(".joe_owo__contain .seat").on("click",function(e){e.stopPropagation(),$(this).siblings(".box").stop().slideToggle("fast")}),$(".joe_owo__contain .box .bar .item").on("click",function(e){e.stopPropagation(),$(this).addClass("active").siblings().removeClass("active");e='.joe_owo__contain .box .scroll[data-type="'+$(this).attr("data-type")+'"]';$(e).show().siblings(".scroll").hide()}),$(".joe_owo__contain .scroll .item").on("click",function(){var e=$(this).attr("data-text");$(".joe_owo__target").insertContent(e)}),$(".joe_owo__contain .box .bar .item").first().click()}});{let e=Joe.MOTTO;e=e||"\u6709\u94b1\u7ec8\u6210\u7737\u5c5e\uff0c\u6ca1\u94b1\u4eb2\u773c\u76ee\u7779",e.includes("http")?$.ajax({url:e,dataType:"text",success:e=>$(".joe_motto").html(e)}):$(".joe_motto").html(e)}if(!window.Joe.IS_MOBILE){let t=!0;const m=e=>{window.pageYOffset>=$(".joe_header").height()&&e<=0?t||($(".joe_header").addClass("active"),$(".joe_aside .joe_aside__item:last-child").css("top",$(".joe_header").height()-60+15),t=!0):t&&($(".joe_header").removeClass("active"),$(".joe_aside .joe_aside__item:last-child").css("top",$(".joe_header").height()+15),t=!1)};let o=window.pageYOffset;m(o);let a=Date.now();document.addEventListener("scroll",()=>{var e=Date.now();15');
- src: url('') format('');
+ src: url('') format('');
}