From 523107075d800f718361b7809aa3b2c0535790d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E6=81=92?= <2323333339@qq.com> Date: Fri, 2 Apr 2021 10:07:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- archive.php | 6 +++--- assets/js/joe.index.js | 6 +++--- assets/js/joe.index.min.js | 2 +- assets/js/joe.live.js | 4 ++-- assets/js/joe.live.min.js | 2 +- assets/js/joe.video.js | 4 ++-- assets/js/joe.video.min.js | 2 +- assets/js/joe.wallpaper.js | 2 +- assets/js/joe.wallpaper.min.js | 2 +- core/function.php | 2 +- core/parse.php | 6 +++--- core/route.php | 8 ++++---- friends.php | 2 +- index.php | 10 +++++----- leaving.php | 2 +- package.json | 2 +- public/aside.php | 10 +++++----- public/batten.php | 2 +- public/comment.php | 2 +- public/header.php | 8 ++++---- typecho/write/css/joe.write.min.css | 2 +- typecho/write/css/joe.write.min.scss | 22 ++++++++++------------ 22 files changed, 53 insertions(+), 55 deletions(-) diff --git a/archive.php b/archive.php index 341e4b9..5cfff28 100644 --- a/archive.php +++ b/archive.php @@ -34,7 +34,7 @@
  • - <?php $this->title() ?> + <?php $this->title() ?> @@ -73,7 +73,7 @@ - <?php $this->title() ?> + <?php $this->title() ?> @@ -96,7 +96,7 @@ - <?php $this->title() ?> + <?php $this->title() ?>
    diff --git a/assets/js/joe.index.js b/assets/js/joe.index.js index 2ddabba..2059406 100644 --- a/assets/js/joe.index.js +++ b/assets/js/joe.index.js @@ -27,7 +27,7 @@ document.addEventListener('DOMContentLoaded', () => {
  • - ${_.title} + ${_.title} @@ -73,7 +73,7 @@ document.addEventListener('DOMContentLoaded', () => { - ${_.title} + ${_.title} @@ -96,7 +96,7 @@ document.addEventListener('DOMContentLoaded', () => { ${_.image .map((item, index) => { if (index < 3) { - return `${_.title}`; + return `${_.title}`; } }) .join('')} diff --git a/assets/js/joe.index.min.js b/assets/js/joe.index.min.js index 82fc533..ed5c1f5 100644 --- a/assets/js/joe.index.min.js +++ b/assets/js/joe.index.min.js @@ -1 +1 @@ -document.addEventListener("DOMContentLoaded",()=>{if(0!==$(".joe_index__banner .swiper-container").length){let l="horizontal";Joe.IS_MOBILE||2!==$(".joe_index__banner-recommend .item").length||(l="vertical"),new Swiper(".swiper-container",{keyboard:!1,direction:l,loop:!0,autoplay:!0,mousewheel:!0,pagination:{el:".swiper-pagination"},navigation:{nextEl:".swiper-button-next",prevEl:".swiper-button-prev"}})}{const l=l=>"default"===l.mode?`\n
  • \n
    \n \n ${l.title}\n \n \n \n
    \n \n 置顶${l.title}\n \n ${l.abstract}\n
    \n
      \n
    • ${l.created}
      • \n
    • ${l.views} 阅读
      • \n
    • ${l.commentsNum} 评论
      • \n
    • ${l.agree} 点赞
      • \n
    \n
    \n \n ${l.category.length&&l.category[0].name}\n
    \n
    \n
    \n
    • \n `:"single"===l.mode?`\n
  • \n
    \n
    \n \n 置顶${l.title}\n \n
    \n
      \n
    • ${l.created}
      • \n
    • ${l.views} 阅读
      • \n
    • ${l.commentsNum} 评论
      • \n
    • ${l.agree} 点赞
      • \n
    \n
    \n \n ${l.category.length&&l.category[0].name}\n
    \n
    \n
    \n \n ${l.title}\n \n \n \n
    \n ${l.abstract}\n
    \n
    • \n `:"multiple"===l.mode?`\n
  • \n
    \n
    \n \n 置顶${l.title}\n \n ${l.abstract}\n
    \n \n ${l.image.map((e,t)=>{if(t<3)return`${l.title}`}).join("")}\n \n
    \n \n
    \n \n ${l.category.length&&l.category[0].name}\n
    \n
    \n
    • \n `:`\n
  • \n
    \n
    \n \n 置顶${l.title}\n \n ${l.abstract}\n
    \n
      \n
    • ${l.created}
      • \n
    • ${l.views} 阅读
      • \n
    • ${l.commentsNum} 评论
      • \n
    • ${l.agree} 点赞
      • \n
    \n
    \n \n ${l.category.length&&l.category[0].name}\n
    \n
    \n
    \n
    • \n `;let e={page:1,pageSize:12,type:"created"};const t=()=>{$(".joe_index__list .joe_list").html(""),$(".joe_load").show();let l=$('.joe_index__title-title .item[data-type="'+e.type+'"]'),t=$(".joe_index__title-title .line");l.addClass("active").siblings().removeClass("active"),t.css({left:l.position().left,width:l.width()})},i=()=>new Promise((t,i)=>{$(".joe_load").attr("loading",!0),$(".joe_load").html("loading..."),$(".joe_index__list .joe_list__loading").show(),$.ajax({url:Joe.BASE_API,type:"POST",dataType:"json",data:{routeType:"publish_list",page:e.page,pageSize:e.pageSize,type:e.type},success(e){if(0===e.data.length)return $(".joe_load").removeAttr("loading"),$(".joe_load").html("查看更多"),$(".joe_load").hide(),$(".joe_index__list .joe_list__loading").hide(),Qmsg.warning("没有更多内容了");e.data.forEach(e=>$(".joe_index__list .joe_list").append(l(e))),$(".joe_load").removeAttr("loading"),$(".joe_load").html("查看更多"),$(".joe_index__list .joe_list__loading").hide(),t(e.data.length>0?e.data.length-1:0)}})});t(),i(),$(".joe_index__title-title .item").on("click",async function(){$(this).attr("data-type")!==e.type&&(e={page:1,pageSize:12,type:$(this).attr("data-type")},t(),i())}),$(".joe_load").on("click",async function(){if($(this).attr("loading"))return;e.page++;let l=await i();l=$(".joe_index__list .joe_list .joe_list__item").length-l;const t=`.joe_index__list .joe_list .joe_list__item:nth-child(${l})`,a=$(t).offset().top-$(".joe_header").height();window.scrollTo({top:a-15,behavior:"smooth"})})}{const l=$(".joe_index__list").attr("data-wow");"off"!==l&&l&&new WOW({boxClass:"wow",animateClass:`animated ${l}`,offset:0,mobile:!0,live:!0,scrollContainer:null}).init()}}); \ No newline at end of file +document.addEventListener("DOMContentLoaded",()=>{if(0!==$(".joe_index__banner .swiper-container").length){let l="horizontal";Joe.IS_MOBILE||2!==$(".joe_index__banner-recommend .item").length||(l="vertical"),new Swiper(".swiper-container",{keyboard:!1,direction:l,loop:!0,autoplay:!0,mousewheel:!0,pagination:{el:".swiper-pagination"},navigation:{nextEl:".swiper-button-next",prevEl:".swiper-button-prev"}})}{const l=l=>"default"===l.mode?`\n
  • \n
    \n \n ${l.title}\n \n \n \n
    \n \n 置顶${l.title}\n \n ${l.abstract}\n
    \n
      \n
    • ${l.created}
      • \n
    • ${l.views} 阅读
      • \n
    • ${l.commentsNum} 评论
      • \n
    • ${l.agree} 点赞
      • \n
    \n
    \n \n ${l.category.length&&l.category[0].name}\n
    \n
    \n
    \n
    • \n `:"single"===l.mode?`\n
  • \n
    \n
    \n \n 置顶${l.title}\n \n
    \n
      \n
    • ${l.created}
      • \n
    • ${l.views} 阅读
      • \n
    • ${l.commentsNum} 评论
      • \n
    • ${l.agree} 点赞
      • \n
    \n
    \n \n ${l.category.length&&l.category[0].name}\n
    \n
    \n
    \n \n ${l.title}\n \n \n \n
    \n ${l.abstract}\n
    \n
    • \n `:"multiple"===l.mode?`\n
  • \n
    \n
    \n \n 置顶${l.title}\n \n ${l.abstract}\n
    \n \n ${l.image.map((e,t)=>{if(t<3)return`${l.title}`}).join("")}\n \n
    \n \n
    \n \n ${l.category.length&&l.category[0].name}\n
    \n
    \n
    • \n `:`\n
  • \n
    \n
    \n \n 置顶${l.title}\n \n ${l.abstract}\n
    \n
      \n
    • ${l.created}
      • \n
    • ${l.views} 阅读
      • \n
    • ${l.commentsNum} 评论
      • \n
    • ${l.agree} 点赞
      • \n
    \n
    \n \n ${l.category.length&&l.category[0].name}\n
    \n
    \n
    \n
    • \n `;let e={page:1,pageSize:12,type:"created"};const t=()=>{$(".joe_index__list .joe_list").html(""),$(".joe_load").show();let l=$('.joe_index__title-title .item[data-type="'+e.type+'"]'),t=$(".joe_index__title-title .line");l.addClass("active").siblings().removeClass("active"),t.css({left:l.position().left,width:l.width()})},i=()=>new Promise((t,i)=>{$(".joe_load").attr("loading",!0),$(".joe_load").html("loading..."),$(".joe_index__list .joe_list__loading").show(),$.ajax({url:Joe.BASE_API,type:"POST",dataType:"json",data:{routeType:"publish_list",page:e.page,pageSize:e.pageSize,type:e.type},success(e){if(0===e.data.length)return $(".joe_load").removeAttr("loading"),$(".joe_load").html("查看更多"),$(".joe_load").hide(),$(".joe_index__list .joe_list__loading").hide(),Qmsg.warning("没有更多内容了");e.data.forEach(e=>$(".joe_index__list .joe_list").append(l(e))),$(".joe_load").removeAttr("loading"),$(".joe_load").html("查看更多"),$(".joe_index__list .joe_list__loading").hide(),t(e.data.length>0?e.data.length-1:0)}})});t(),i(),$(".joe_index__title-title .item").on("click",async function(){$(this).attr("data-type")!==e.type&&(e={page:1,pageSize:12,type:$(this).attr("data-type")},t(),i())}),$(".joe_load").on("click",async function(){if($(this).attr("loading"))return;e.page++;let l=await i();l=$(".joe_index__list .joe_list .joe_list__item").length-l;const t=`.joe_index__list .joe_list .joe_list__item:nth-child(${l})`,a=$(t).offset().top-$(".joe_header").height();window.scrollTo({top:a-15,behavior:"smooth"})})}{const l=$(".joe_index__list").attr("data-wow");"off"!==l&&l&&new WOW({boxClass:"wow",animateClass:`animated ${l}`,offset:0,mobile:!0,live:!0,scrollContainer:null}).init()}}); \ No newline at end of file diff --git a/assets/js/joe.live.js b/assets/js/joe.live.js index c192ecd..3c7efb2 100644 --- a/assets/js/joe.live.js +++ b/assets/js/joe.live.js @@ -58,12 +58,12 @@ document.addEventListener('DOMContentLoaded', () => {
    ${_.recommendTagName} - ${_.introduction} + ${_.introduction}
    - ${_.nick} + ${_.nick}
    ${_.nick}

    ${_.introduction}

    diff --git a/assets/js/joe.live.min.js b/assets/js/joe.live.min.js index bba2a34..491c35e 100644 --- a/assets/js/joe.live.min.js +++ b/assets/js/joe.live.min.js @@ -1 +1 @@ -document.addEventListener("DOMContentLoaded",()=>{function a(){function a(){$.ajax({url:"/usr/themes/Joe/assets/json/joe.live.json",dataType:"json",success(a){const e=a[n.index];$(".joe_live__type-title .text").html(e.name);let t='
  • 全部
    • ';e.list.forEach(a=>t+=`
  • ${a.name}
    • `),$(".joe_live__type-list").html(t),$(".joe_live__type-list .item").first().click()}})}function e(){window.scrollTo({top:0,behavior:"smooth"}),n.isLoading=!0,$(".joe_live__list").html(""),$.ajax({url:Joe.BASE_API,type:"POST",dataType:"json",data:{routeType:"huya_list",page:n.page,gameId:n.gameId},success(a){if(1!==a.code)return;let e="";a.data.datas.forEach(a=>{e+=`\n     \n
    \n ${a.recommendTagName}\n ${a.introduction}\n
    \n
    \n
    \n \n ${a.nick}\n
    \n
    ${a.nick}
    \n

    ${a.introduction}

    \n
    \n \n ${i(a.totalCount)}\n ${a.gameFullName}\n
    \n
    \n     \n `}),$(".joe_live__list").html(e),n.totalPage=a.data.totalPage,t()},complete:()=>n.isLoading=!1})}function t(){let a="";1!=n.page&&(a+=`\n \t\t
  • 首页
    • \n \t\t
  • \n \n \t\t
    • \n \t\t
  • ${n.page-1}
    • \n \t`),a+=`
  • ${n.page}
    • `,n.page!=n.totalPage&&(a+=`\n \t\t
  • ${n.page+1}
    • \n \t\t
  • \n \n \t\t
    • \n \t`),n.page末页`),$(".joe_live__pagination").html(a)}function i(a=0){return a>=1e4?Math.round(a/1e3)/10+"万":a}let n={page:1,gameId:"",index:0,isLoading:!1,totalPage:0};$(".joe_live__type-title .icon").on("click",function(){n.isLoading||(3===n.index&&(n.index=0),n.index++,a())}),$(".joe_live__type-list").on("click",".item",function(){n.isLoading||($(this).addClass("active").siblings().removeClass("active"),n.page=1,n.gameId=$(this).attr("data-gameId"),e())}),a(),$(".joe_live__pagination").on("click",".joe_live__pagination-item",function(){const a=$(this).attr("data-page");a&&!n.isLoading&&(n.page=Number(a),e())})}const e=new URLSearchParams(window.location.search);e.get("profileRoom")||a()}); \ No newline at end of file +document.addEventListener("DOMContentLoaded",()=>{function a(){function a(){$.ajax({url:"/usr/themes/Joe/assets/json/joe.live.json",dataType:"json",success(a){const e=a[n.index];$(".joe_live__type-title .text").html(e.name);let t='
  • 全部
    • ';e.list.forEach(a=>t+=`
  • ${a.name}
    • `),$(".joe_live__type-list").html(t),$(".joe_live__type-list .item").first().click()}})}function e(){window.scrollTo({top:0,behavior:"smooth"}),n.isLoading=!0,$(".joe_live__list").html(""),$.ajax({url:Joe.BASE_API,type:"POST",dataType:"json",data:{routeType:"huya_list",page:n.page,gameId:n.gameId},success(a){if(1!==a.code)return;let e="";a.data.datas.forEach(a=>{e+=`\n \n
    \n ${a.recommendTagName}\n ${a.introduction}\n
    \n
    \n
    \n \n ${a.nick}\n
    \n
    ${a.nick}
    \n

    ${a.introduction}

    \n
    \n \n ${i(a.totalCount)}\n ${a.gameFullName}\n
    \n
    \n     \n `}),$(".joe_live__list").html(e),n.totalPage=a.data.totalPage,t()},complete:()=>n.isLoading=!1})}function t(){let a="";1!=n.page&&(a+=`\n \t\t
  • 首页
    • \n \t\t
  • \n \n \t\t
    • \n \t\t
  • ${n.page-1}
    • \n \t`),a+=`
  • ${n.page}
    • `,n.page!=n.totalPage&&(a+=`\n \t\t
  • ${n.page+1}
    • \n \t\t
  • \n \n \t\t
    • \n \t`),n.page末页`),$(".joe_live__pagination").html(a)}function i(a=0){return a>=1e4?Math.round(a/1e3)/10+"万":a}let n={page:1,gameId:"",index:0,isLoading:!1,totalPage:0};$(".joe_live__type-title .icon").on("click",function(){n.isLoading||(3===n.index&&(n.index=0),n.index++,a())}),$(".joe_live__type-list").on("click",".item",function(){n.isLoading||($(this).addClass("active").siblings().removeClass("active"),n.page=1,n.gameId=$(this).attr("data-gameId"),e())}),a(),$(".joe_live__pagination").on("click",".joe_live__pagination-item",function(){const a=$(this).attr("data-page");a&&!n.isLoading&&(n.page=Number(a),e())})}const e=new URLSearchParams(window.location.search);e.get("profileRoom")||a()}); \ No newline at end of file diff --git a/assets/js/joe.video.js b/assets/js/joe.video.js index c1352b9..7d4ac3e 100644 --- a/assets/js/joe.video.js +++ b/assets/js/joe.video.js @@ -56,7 +56,7 @@ document.addEventListener('DOMContentLoaded', () => { ${_.vod_year}
    - ${_.vod_name} + ${_.vod_name}

    ${_.vod_name}

    `; @@ -130,7 +130,7 @@ document.addEventListener('DOMContentLoaded', () => { /* 设置视频详情 */ $('.joe_video__detail-info').html(`
    - ${item.vod_name} + ${item.vod_name} ${item.vod_year}
    diff --git a/assets/js/joe.video.min.js b/assets/js/joe.video.min.js index ac99da7..81edf03 100644 --- a/assets/js/joe.video.min.js +++ b/assets/js/joe.video.min.js @@ -1 +1 @@ -document.addEventListener("DOMContentLoaded",()=>{function t(){function t(){window.scrollTo({top:0,behavior:"smooth"}),$(".joe_video__list-item").css("display","").html(""),o=!0,$.ajax({url:Joe.BASE_API,type:"POST",dataType:"json",data:{routeType:"maccms_list",ac:"videolist",t:a.t,pg:a.pg,wd:a.wd},success(t){if(1!==t.code)return $(".joe_video__list-item").css("display","block").html('

    数据加载失败！请检查！

    ');if(t.data.list.length){let e="";t.data.list.forEach(t=>{e+=`\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t${t.vod_year}\n\t\t\t\t\t\t\t\t\t
    \n\t\t\t\t\t\t\t\t\t\t${t.vod_name}\n\t\t\t\t\t\t\t\t\t
    \n\t\t\t\t\t\t\t\t\t

    ${t.vod_name}

    \n\t\t\t\t\t\t\t\t    `}),$(".joe_video__list-item").html(e)}else $(".joe_video__list-item").css("display","block").html('

    暂无数据！

    ');i=t.data.pagecount,e()},complete:()=>o=!1})}function e(){if(0==i)return $(".joe_video__pagination").hide();$(".joe_video__pagination").show();let t="";1!=a.pg&&(t+=`\n \t\t
  • 首页
    • \n \t\t
  • \n \n \t\t
    • \n \t\t
  • ${a.pg-1}
    • \n \t`),t+=`
  • ${a.pg}
    • `,a.pg!=i&&(t+=`\n \t\t
  • ${a.pg+1}
    • \n \t\t
  • \n \n \t\t
    • \n \t`),a.pg末页`),$(".joe_video__pagination").html(t)}let a={pg:"",t:"",wd:""},i="",o=!1;$.ajax({url:Joe.BASE_API,type:"POST",dataType:"json",data:{routeType:"maccms_list"},success(t){if(1!==t.code)return $(".joe_video__type-list").html(`
  • ${t.data}
    • `);if(!t.data.class.length)return $(".joe_video__type-list").html('
  • 暂无数据！
    • ');let e='
  • 全部
    • ';t.data.class.forEach(t=>e+=`
  • ${t.type_name}
    • `),$(".joe_video__type-list").html(e),$(".joe_video__type-list .item").first().click()}}),$(".joe_video__type-list").on("click",".item",function(){const e=$(this).attr("data-t");o||($(this).addClass("active").siblings().removeClass("active"),a.pg=1,a.t=e,a.wd="",$(".joe_video__list-search input").val(""),t())}),$(".joe_video__pagination").on("click",".joe_video__pagination-item",function(){const e=$(this).attr("data-pg");e&&!o&&(a.pg=Number(e),t())});const s=()=>{const e=$(".joe_video__list-search input").val();o||(a.pg=1,a.t="",a.wd=e,$(".joe_video__type-list .item").first().addClass("active").siblings().removeClass("active"),t())};$(".joe_video__list-search .button").on("click",s),$(".joe_video__list-search .input").on("keyup",t=>13===t.keyCode&&s())}function e(){const t=$(".joe_video__player-play").attr("data-player");$.ajax({url:Joe.BASE_API,type:"POST",dataType:"json",data:{routeType:"maccms_list",ac:"detail",ids:o},success(t){if(1!==t.code)return $(".joe_video__detail-info").html(`

    ${t.data}

    `);if(!t.data.list.length)return $(".joe_video__detail-info").html('

    数据抓取异常！请检查！

    ');const e=t.data.list[0];$(".joe_video__detail-info").html(`\n\t\t\t\t\t
    \n\t\t\t\t\t\t${e.vod_name}\n\t\t\t\t\t\t${e.vod_year}\n\t\t\t\t\t
    \n\t\t\t\t\t
    \n\t\t\t\t\t\t
    ${e.vod_name+(e.vod_remarks?" - "+e.vod_remarks:"")}
    \n\t\t\t\t\t\t
    类型：${e.vod_class||"未知"}
    \n\t\t\t\t\t\t
    主演：${e.vod_actor||"未知"}
    \n\t\t\t\t\t\t
    导演：${e.vod_director||"未知"}
    \n\t\t\t\t\t\t
    简介：${a(e)}
    \n\t\t\t\t\t
    \n\t\t\t\t`),$(".joe_video__player .joe_video__contain-title").html("正在播放："+e.vod_name);let i=t=>{let e="",a=t.split("#");return a.forEach(t=>e+=`
  • ${t.split("$")[0]||""}
    • `),e},o=e.vod_play_from.split("$$$"),s=e.vod_play_url.split("$$$"),l=new Map;o.forEach((t,e)=>l.set(t,s[e]||[]));let d="",n=0;for(let[t,e]of l)n++,d+=`\n\t\t\t\t\t\t
    \n\t\t\t\t\t\t\t
    播放线路 ${n}
    \n\t\t\t\t\t\t\t
      ${i(e)}
    \n\t\t\t\t\t\t
    \n\t\t\t\t\t`;$(".joe_video__player").after(d),$(".joe_video__source").first().find(".joe_video__source-list .item").first().click()}}),$(document).on("click",".joe_video__source-list .item",function(){$(".joe_video__source-list .item").removeClass("active"),$(this).addClass("active");const e=$(this).attr("data-src")||$(this).html();$(".joe_video__player-play").attr({src:t+e});const a=$(".joe_video__player").offset().top-$(".joe_header").height()-15;window.scrollTo({top:a,behavior:"smooth"})})}function a(t){return t.vod_content?t.vod_content.replace(/<[^>]+>/g,""):t.vod_blurb?t.vod_blurb.replace(/<[^>]+>/g,""):"暂无简介"}const i=new URLSearchParams(window.location.search),o=i.get("vod_id");o?e():t()}); \ No newline at end of file +document.addEventListener("DOMContentLoaded",()=>{function t(){function t(){window.scrollTo({top:0,behavior:"smooth"}),$(".joe_video__list-item").css("display","").html(""),o=!0,$.ajax({url:Joe.BASE_API,type:"POST",dataType:"json",data:{routeType:"maccms_list",ac:"videolist",t:i.t,pg:i.pg,wd:i.wd},success(t){if(1!==t.code)return $(".joe_video__list-item").css("display","block").html('

    数据加载失败！请检查！

    ');if(t.data.list.length){let e="";t.data.list.forEach(t=>{e+=`\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t${t.vod_year}\n\t\t\t\t\t\t\t\t\t
    \n\t\t\t\t\t\t\t\t\t\t${t.vod_name}\n\t\t\t\t\t\t\t\t\t
    \n\t\t\t\t\t\t\t\t\t

    ${t.vod_name}

    \n\t\t\t\t\t\t\t\t    `}),$(".joe_video__list-item").html(e)}else $(".joe_video__list-item").css("display","block").html('

    暂无数据！

    ');a=t.data.pagecount,e()},complete:()=>o=!1})}function e(){if(0==a)return $(".joe_video__pagination").hide();$(".joe_video__pagination").show();let t="";1!=i.pg&&(t+=`\n \t\t
  • 首页
    • \n \t\t
  • \n \n \t\t
    • \n \t\t
  • ${i.pg-1}
    • \n \t`),t+=`
  • ${i.pg}
    • `,i.pg!=a&&(t+=`\n \t\t
  • ${i.pg+1}
    • \n \t\t
  • \n \n \t\t
    • \n \t`),i.pg末页`),$(".joe_video__pagination").html(t)}let i={pg:"",t:"",wd:""},a="",o=!1;$.ajax({url:Joe.BASE_API,type:"POST",dataType:"json",data:{routeType:"maccms_list"},success(t){if(1!==t.code)return $(".joe_video__type-list").html(`
  • ${t.data}
    • `);if(!t.data.class.length)return $(".joe_video__type-list").html('
  • 暂无数据！
    • ');let e='
  • 全部
    • ';t.data.class.forEach(t=>e+=`
  • ${t.type_name}
    • `),$(".joe_video__type-list").html(e),$(".joe_video__type-list .item").first().click()}}),$(".joe_video__type-list").on("click",".item",function(){const e=$(this).attr("data-t");o||($(this).addClass("active").siblings().removeClass("active"),i.pg=1,i.t=e,i.wd="",$(".joe_video__list-search input").val(""),t())}),$(".joe_video__pagination").on("click",".joe_video__pagination-item",function(){const e=$(this).attr("data-pg");e&&!o&&(i.pg=Number(e),t())});const s=()=>{const e=$(".joe_video__list-search input").val();o||(i.pg=1,i.t="",i.wd=e,$(".joe_video__type-list .item").first().addClass("active").siblings().removeClass("active"),t())};$(".joe_video__list-search .button").on("click",s),$(".joe_video__list-search .input").on("keyup",t=>13===t.keyCode&&s())}function e(){const t=$(".joe_video__player-play").attr("data-player");$.ajax({url:Joe.BASE_API,type:"POST",dataType:"json",data:{routeType:"maccms_list",ac:"detail",ids:o},success(t){if(1!==t.code)return $(".joe_video__detail-info").html(`

    ${t.data}

    `);if(!t.data.list.length)return $(".joe_video__detail-info").html('

    数据抓取异常！请检查！

    ');const e=t.data.list[0];$(".joe_video__detail-info").html(`\n\t\t\t\t\t
    \n\t\t\t\t\t\t${e.vod_name}\n\t\t\t\t\t\t${e.vod_year}\n\t\t\t\t\t
    \n\t\t\t\t\t
    \n\t\t\t\t\t\t
    ${e.vod_name+(e.vod_remarks?" - "+e.vod_remarks:"")}
    \n\t\t\t\t\t\t
    类型：${e.vod_class||"未知"}
    \n\t\t\t\t\t\t
    主演：${e.vod_actor||"未知"}
    \n\t\t\t\t\t\t
    导演：${e.vod_director||"未知"}
    \n\t\t\t\t\t\t
    简介：${i(e)}
    \n\t\t\t\t\t
    \n\t\t\t\t`),$(".joe_video__player .joe_video__contain-title").html("正在播放："+e.vod_name);let a=t=>{let e="",i=t.split("#");return i.forEach(t=>e+=`
  • ${t.split("$")[0]||""}
    • `),e},o=e.vod_play_from.split("$$$"),s=e.vod_play_url.split("$$$"),l=new Map;o.forEach((t,e)=>l.set(t,s[e]||[]));let d="",n=0;for(let[t,e]of l)n++,d+=`\n\t\t\t\t\t\t
    \n\t\t\t\t\t\t\t
    播放线路 ${n}
    \n\t\t\t\t\t\t\t
      ${a(e)}
    \n\t\t\t\t\t\t
    \n\t\t\t\t\t`;$(".joe_video__player").after(d),$(".joe_video__source").first().find(".joe_video__source-list .item").first().click()}}),$(document).on("click",".joe_video__source-list .item",function(){$(".joe_video__source-list .item").removeClass("active"),$(this).addClass("active");const e=$(this).attr("data-src")||$(this).html();$(".joe_video__player-play").attr({src:t+e});const i=$(".joe_video__player").offset().top-$(".joe_header").height()-15;window.scrollTo({top:i,behavior:"smooth"})})}function i(t){return t.vod_content?t.vod_content.replace(/<[^>]+>/g,""):t.vod_blurb?t.vod_blurb.replace(/<[^>]+>/g,""):"暂无简介"}const a=new URLSearchParams(window.location.search),o=a.get("vod_id");o?e():t()}); \ No newline at end of file diff --git a/assets/js/joe.wallpaper.js b/assets/js/joe.wallpaper.js index 86ad12b..c4a7c28 100644 --- a/assets/js/joe.wallpaper.js +++ b/assets/js/joe.wallpaper.js @@ -45,7 +45,7 @@ document.addEventListener('DOMContentLoaded', () => { res.data.forEach(_ => { htmlStr += ` - 壁纸 + 壁纸 `; }); $('.joe_wallpaper__list').html(htmlStr); diff --git a/assets/js/joe.wallpaper.min.js b/assets/js/joe.wallpaper.min.js index 779cd50..90fe980 100644 --- a/assets/js/joe.wallpaper.min.js +++ b/assets/js/joe.wallpaper.min.js @@ -1 +1 @@ -document.addEventListener("DOMContentLoaded",()=>{function t(){window.scrollTo({top:0,behavior:"smooth"}),$(".joe_wallpaper__list").html(""),l=!0,$.ajax({url:Joe.BASE_API,type:"POST",dataType:"json",data:{routeType:"wallpaper_list",cid:e.cid,start:e.start,count:e.count},success(t){if(1!==t.code)return l=!1;l=!1;let e="";t.data.forEach(t=>{e+=`\n \n 壁纸\n `}),$(".joe_wallpaper__list").html(e),i=t.total,a()}})}function a(){let t="";e.start/e.count!=0&&(t+=`\n
  • 首页
    • \n
  • \n \n
    • \n
  • ${Math.ceil(e.start/e.count)}
    • \n `),t+=`
  • ${Math.ceil(e.start/e.count)+1}
    • `,e.start!=i-e.count&&(t+=`\n
  • ${Math.ceil(e.start/e.count)+2}
    • \n
  • \n \n
    • \n `),e.start末页`),$(".joe_wallpaper__pagination").html(t)}let l=!1,e={cid:-999,start:-999,count:48},i=-999;$.ajax({url:Joe.BASE_API,type:"POST",dataType:"json",data:{routeType:"wallpaper_type"},success(t){if(1!==t.code)return $(".joe_wallpaper__type-list").html('
  • 壁纸抓取失败！请联系作者！
    • ');if(!t.data.length)return $(".joe_wallpaper__type-list").html('
  • 暂无数据！
    • ');let a="";t.data.forEach(t=>a+=`
  • ${t.name}
    • `),$(".joe_wallpaper__type-list").html(a),$(".joe_wallpaper__type-list .item").first().click()}}),$(".joe_wallpaper__type-list").on("click",".item",function(){const a=$(this).attr("data-cid");l||($(this).addClass("active").siblings().removeClass("active"),e.cid=a,e.start=0,t())}),$(".joe_wallpaper__pagination").on("click",".joe_wallpaper__pagination-item",function(){const a=$(this).attr("data-start");a&&!l&&(e.start=Number(a),t())})}); \ No newline at end of file +document.addEventListener("DOMContentLoaded",()=>{function t(){window.scrollTo({top:0,behavior:"smooth"}),$(".joe_wallpaper__list").html(""),l=!0,$.ajax({url:Joe.BASE_API,type:"POST",dataType:"json",data:{routeType:"wallpaper_list",cid:e.cid,start:e.start,count:e.count},success(t){if(1!==t.code)return l=!1;l=!1;let e="";t.data.forEach(t=>{e+=`\n \n 壁纸\n `}),$(".joe_wallpaper__list").html(e),i=t.total,a()}})}function a(){let t="";e.start/e.count!=0&&(t+=`\n
  • 首页
    • \n
  • \n \n
    • \n
  • ${Math.ceil(e.start/e.count)}
    • \n `),t+=`
  • ${Math.ceil(e.start/e.count)+1}
    • `,e.start!=i-e.count&&(t+=`\n
  • ${Math.ceil(e.start/e.count)+2}
    • \n
  • \n \n
    • \n `),e.start末页`),$(".joe_wallpaper__pagination").html(t)}let l=!1,e={cid:-999,start:-999,count:48},i=-999;$.ajax({url:Joe.BASE_API,type:"POST",dataType:"json",data:{routeType:"wallpaper_type"},success(t){if(1!==t.code)return $(".joe_wallpaper__type-list").html('
  • 壁纸抓取失败！请联系作者！
    • ');if(!t.data.length)return $(".joe_wallpaper__type-list").html('
  • 暂无数据！
    • ');let a="";t.data.forEach(t=>a+=`
  • ${t.name}
    • `),$(".joe_wallpaper__type-list").html(a),$(".joe_wallpaper__type-list .item").first().click()}}),$(".joe_wallpaper__type-list").on("click",".item",function(){const a=$(this).attr("data-cid");l||($(this).addClass("active").siblings().removeClass("active"),e.cid=a,e.start=0,t())}),$(".joe_wallpaper__pagination").on("click",".joe_wallpaper__pagination-item",function(){const a=$(this).attr("data-start");a&&!l&&(e.start=Number(a),t())})}); \ No newline at end of file diff --git a/core/function.php b/core/function.php index cd3288f..238c3ae 100644 --- a/core/function.php +++ b/core/function.php @@ -2,7 +2,7 @@ /* 获取主题当前版本号 */ function _getVersion() { - return "6.3.0"; + return "6.3.1"; }; /* 判断是否是手机 */ diff --git a/core/parse.php b/core/parse.php index 5427cc3..bc783fc 100644 --- a/core/parse.php +++ b/core/parse.php @@ -57,7 +57,7 @@ function _parseCommentReply($text) echo "该回复疑似异常，已被系统拦截！"; } else { $text = _parseReply($text); - echo preg_replace('/\{!\{([^\"]*)\}!\}/', '画图', $text); + echo preg_replace('/\{!\{([^\"]*)\}!\}/', '画图', $text); } } @@ -67,14 +67,14 @@ function _parseReply($text) $text = preg_replace_callback( '/\:\:\(\s*(呵呵|哈哈|吐舌|太开心|笑眼|花心|小乖|乖|捂嘴笑|滑稽|你懂的|不高兴|怒|汗|黑线|泪|真棒|喷|惊哭|阴险|鄙视|酷|啊|狂汗|what|疑问|酸爽|呀咩爹|委屈|惊讶|睡觉|笑尿|挖鼻|吐|犀利|小红脸|懒得理|勉强|爱心|心碎|玫瑰|礼物|彩虹|太阳|星星月亮|钱币|茶杯|蛋糕|大拇指|胜利|haha|OK|沙发|手纸|香蕉|便便|药丸|红领巾|蜡烛|音乐|灯泡|开心|钱|咦|呼|冷|生气|弱|吐血|狗头)\s*\)/is', function ($match) { - return '表情'; + return '表情'; }, $text ); $text = preg_replace_callback( '/\:\@\(\s*(高兴|小怒|脸红|内伤|装大款|赞一个|害羞|汗|吐血倒地|深思|不高兴|无语|亲亲|口水|尴尬|中指|想一想|哭泣|便便|献花|皱眉|傻笑|狂汗|吐|喷水|看不见|鼓掌|阴暗|长草|献黄瓜|邪恶|期待|得意|吐舌|喷血|无所谓|观察|暗地观察|肿包|中枪|大囧|呲牙|抠鼻|不说话|咽气|欢呼|锁眉|蜡烛|坐等|击掌|惊喜|喜极而泣|抽烟|不出所料|愤怒|无奈|黑线|投降|看热闹|扇耳光|小眼睛|中刀)\s*\)/is', function ($match) { - return '表情'; + return '表情'; }, $text ); diff --git a/core/route.php b/core/route.php index dec00fb..305f72e 100644 --- a/core/route.php +++ b/core/route.php @@ -84,9 +84,9 @@ function _getPost($self) "title" => $item->title, "abstract" => _getAbstract($item, false), "category" => $item->categories, - "views" => $item->views, + "views" => number_format($item->views), "commentsNum" => number_format($item->commentsNum), - "agree" => $item->agree, + "agree" => number_format($item->agree), "permalink" => $item->permalink, "lazyload" => _getLazyload(false), "type" => "normal" @@ -112,7 +112,7 @@ function _handleViews($self) $db->query($db->update('table.contents')->rows(array('views' => (int)$row['views'] + 1))->where('cid = ?', $cid)); $self->response->throwJson(array( "code" => 1, - "data" => $db->fetchRow($db->select('views')->from('table.contents')->where('cid = ?', $cid)) + "data" => array('views' => number_format($db->fetchRow($db->select('views')->from('table.contents')->where('cid = ?', $cid))['views'])) )); } else { $self->response->throwJson(array("code" => 0, "data" => null)); @@ -145,7 +145,7 @@ function _handleAgree($self) } $self->response->throwJson(array( "code" => 1, - "data" => $db->fetchRow($db->select('agree')->from('table.contents')->where('cid = ?', $cid)) + "data" => array('agree' => number_format($db->fetchRow($db->select('agree')->from('table.contents')->where('cid = ?', $cid))['agree'])) )); } else { $self->response->throwJson(array("code" => 0, "data" => null)); diff --git a/friends.php b/friends.php index 8d23ad8..7d0184e 100644 --- a/friends.php +++ b/friends.php @@ -94,7 +94,7 @@
    - <?php echo $item['name']; ?> + <?php echo $item['name']; ?>
    diff --git a/index.php b/index.php index fb3ab5e..513814d 100644 --- a/index.php +++ b/index.php @@ -55,7 +55,7 @@
    - <?php echo $item['title'] ?> + <?php echo $item['title'] ?>
    @@ -75,7 +75,7 @@ widget('Widget_Archive@' . $cid, 'pageSize=1&type=post', 'cid=' . $cid)->to($item); ?>
    -
    <?php $item->title() ?> + <?php $item->title() ?>
    推荐 @@ -95,8 +95,8 @@
  • - views(); ?> ℃ - <?php $item->title(); ?> + views); ?> ℃ + <?php $item->title(); ?>
    title(); ?>
     @@ -116,7 +116,7 @@
    - <?php echo $index_ad['url'] ?> + <?php echo $index_ad['url'] ?> 广告
    diff --git a/leaving.php b/leaving.php index 1c51d4d..d02f175 100644 --- a/leaving.php +++ b/leaving.php @@ -32,7 +32,7 @@ next()) : ?>
  • - 用户头像 + 用户头像
    author(); ?>
    date('Y/m/d'); ?>
    diff --git a/package.json b/package.json index 2da3f34..d6a570b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "typecho-joe-next", - "version": "6.3.0", + "version": "6.3.1", "description": "A Theme Of Typecho", "main": "index.php", "keywords": [ diff --git a/public/aside.php b/public/aside.php index 79f6728..d06703b 100644 --- a/public/aside.php +++ b/public/aside.php @@ -1,8 +1,8 @@