From 38ac88505b736727f89220f566a6bd5b9c7651d9 Mon Sep 17 00:00:00 2001 From: taoser Date: Mon, 1 Apr 2024 10:20:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/view/user/user/index.html | 5 +- app/index/controller/Index.php | 2 +- app/install/data/taoler.sql | 34 +- public/static/res/css/global.css | 1 - public/static/res/mods/index.js | 6 +- view/taoler/index/article/add.html | 2 +- view/taoler/index/article/ask/cate.html | 131 ++- view/taoler/index/article/ask/detail.html | 706 ++++++------- view/taoler/index/article/blog/cate.html | 164 ++- view/taoler/index/article/blog/detail.html | 1014 +++++++++---------- view/taoler/index/article/edit.html | 2 +- view/taoler/index/article/news/cate.html | 115 +-- view/taoler/index/article/news/detail.html | 273 ++--- view/taoler/index/article/posts/cate.html | 156 +-- view/taoler/index/article/posts/detail.html | 789 +++++++-------- view/taoler/index/public/base.html | 35 +- view/taoler/index/public/footer.html | 65 +- 17 files changed, 1617 insertions(+), 1883 deletions(-) diff --git a/app/admin/view/user/user/index.html b/app/admin/view/user/user/index.html index eac5215..1eefd7a 100644 --- a/app/admin/view/user/user/index.html +++ b/app/admin/view/user/user/index.html @@ -81,11 +81,11 @@ - + + //首次不执行 + if(!first){ + var page = obj.curr; + location.href ="{$path}/"+page+'.html'; + } + } + }) + }); + {/block} \ No newline at end of file diff --git a/view/taoler/index/article/blog/detail.html b/view/taoler/index/article/blog/detail.html index c8fdab9..c0376a5 100644 --- a/view/taoler/index/article/blog/detail.html +++ b/view/taoler/index/article/blog/detail.html @@ -3,8 +3,8 @@ {block name="title"}{$article.title} - {$sysInfo.webname}{/block} {block name="keywords"}{$article.keywords ?: $article.title}{/block} {block name="description"}{$article.title},{$article.description}{/block} -{block name="ogtitle"}{/block} -{block name="ogdescription"}{/block} +{block name="ogtitle"}{/block} +{block name="ogdescription"}{/block} {block name="ogimage"}{/block} {block name="meta"} @@ -21,332 +21,346 @@ + {/block} {block name="column"}
{include file="/public/column" /}
{/block} + {block name="content"} -
-
-
+
+
+ +
-
-
-
-

{article:title /}

-
-
- -
-
- - 阅读 {article:pv /} 次 - -
-
-
-
- {:hook('taoplayerdiv')} -
- {article:content} -
- {//文章末尾} - {if (($article.upzip !== '') || session('?user_name'))} -
- {notempty name="$article.upzip"} - - {/notempty} -
- {/if} +
+
+
+

{article:title /}

+
+ +
+ 阅读 {article:pv /} 次 +
+
+
+
+ {:hook('taoplayerdiv')} +
+ {article:content} +
+ + {notempty name="$article.upzip"} + {if (session('?user_name'))} + + {/if} + {/notempty} + + {empty name="passJieMi"} + {if($article.read_type == 1)} +
+ +
+ {/if} + {/empty} + + {notempty name="tags"} +
标签 + {volist name="tags" id="vo" } + {$vo.name} + {/volist} +
+ {/notempty} +
+

{$sysInfo.state|raw}

+
+
+ 本文链接：{$Request.domain}{$Request.url} +
+
+ 点赞 {:count($userZanList)} + {volist name="userZanList" id="vo" } + + {/volist} +
+
+
+ 手机浏览 + 赞赏支持 +
+ "作者已被打赏 0 次" +
+
+
- {//解密文件} - {empty name="passJieMi"} - {if($article.read_type == 1)} -
- -
- {/if} - {/empty} +
+ # 上一篇： {$previous|raw} + # 下一篇： {$next|raw} +
+ + {notempty name="relationArticle"} +
+
+
+
相关文章
+
+ {volist name="relationArticle" id="vo"} +
+ + {$vo.title} + +
+ {/volist} +
+
+
+
+ {/notempty} - {notempty name="tags"} -
标签 - {volist name="tags" id="vo" } - {$vo.name} - {/volist} -
- {/notempty} -
-

{$sysInfo.state|raw}

-
- -
- - 点赞 {:count($userZanList)} - - {volist name="userZanList" id="vo" } - - {/volist} -
-
+ +
+
+
+ {//评论内容} +
+ 文章评论 ({article:comment_num}) +
    + {article:comment} +
  • +
    + {comment:uname} +
    + {comment:uname /} + {if condition="$article.user_id eq $comment.user_id"} + ({:lang('poster')}) + {/if} + {comment:usign /} +
    +
    + {:hook('ipShow',$comment.user.city)} +
    -
    - 手机浏览 - 赞赏支持 -
    - "作者已被打赏 0 次" -
    -
    -
    -
    - # 上一篇： {$previous|raw} - # 下一篇： {$next|raw} -
    - {notempty name="relationArticle"} -
    -
    -
    -
    相关文章
    -
    - {volist name="relationArticle" id="vo"} -
    - {$vo.title} -
    - {/volist} -
    -
    -
    -
    - {/notempty} + {//加密未解密评论不可查看} -
    -
    -
    - {//评论内容} -
    - 文章评论 ({article:comment_num}) -
      - {article:comment} -
    • -
      - - {comment:uname} - -
      - - {comment:uname /} - - {if condition="$article.user_id eq $comment.user_id"}({:lang('poster')}){/if} - {comment:usign /} -
      -
      - {:hook('ipShow',$comment.user.city)} -
      + {if ($article.read_type == 0 || (($article.read_type == 1) && $passJieMi))} +
      {comment:content /}
      +
      + {eq name="comment.delete_time" value="0"} + + {comment:zan /} + + {:lang('reply')} + {//评论编辑删除采纳权限} +
      + {if ((session('user_id') == $comment.user_id) && (getLimtTime($comment.create_time) < 2)) OR ($user.auth ?? '')} + {:lang('edit')} + {:lang('delete')} + {/if} +
      + {/eq} - {//加密未解密评论不可查看} - {if($article.read_type == 0 || (($article.read_type == 1) && $passJieMi))} + {// 第二层回复} + {notempty name="$comment.children"} + {volist name="$comment.children" id="vo"} +
      + + + +
      +
      {$vo.user.name} {$vo.create_time|date='Y-m-d H:i'}
      +
      {$vo.content|raw}
      +
      + {eq name="vo.delete_time" value="0"} + + {$vo.zan} + + {:lang('reply')} + {//评论编辑删除采纳权限} +
      + {if ((session('user_id') == $vo.user.id) && (getLimtTime($vo.create_time) < 2)) OR ($user.auth ?? '')} + {:lang('edit')} + {:lang('delete')} + {/if} +
      + {/eq} +
      +
      +
      -
      {comment:content /}
      -
      - {eq name="comment.delete_time" value="0"} - - {comment:zan /} - - {:lang('reply')} - {//评论编辑删除采纳权限} -
      - {if ((session('user_id') == $comment.user_id) && (getLimtTime($comment.create_time) < 2)) OR ($user.auth ?? '')} - {:lang('edit')} - {:lang('delete')} - {/if} -
      - {/eq} + {// 第三层回复} + {notempty name="$vo.children"} + {volist name="$vo.children" id="voo"} +
      + + + +
      +
      {$voo.user.name} 回复 {$voo.touser} {$voo.create_time|date='Y-m-d H:i'}
      +
      {$voo.content|raw}
      +
      + {eq name="voo.delete_time" value="0"} + + {$voo.zan} + + {:lang('reply')} + {//评论编辑删除采纳权限} +
      + {if ((session('user_id') == $voo.user.id) && (getLimtTime($voo.create_time) < 2)) OR ($user.auth ?? '')} + {:lang('edit')} + {:lang('delete')} + {/if} +
      + {/eq} +
      +
      +
      + {/volist} + {/notempty} - {// 第二层回复} - {notempty name="$comment.children"} - {volist name="$comment.children" id="vo"} -
      - -
      -
      {$vo.user.name} {$vo.create_time|date='Y-m-d H:i'}
      -
      {$vo.content|raw}
      -
      - {eq name="vo.delete_time" value="0"} - - {$vo.zan} - - {:lang('reply')} - {//评论编辑删除采纳权限} -
      - {if ((session('user_id') == $vo.user.id) && (getLimtTime($vo.create_time) < 2)) OR ($user.auth ?? '')} - {:lang('edit')} - {:lang('delete')} - {/if} -
      - {/eq} -
      -
      -
      + {/volist} + {/notempty} +
      + {else /} +
      + + 解密后查看内容 +
      + {/if} +
      +
      • + {/article:comment} +
    +
    +
    - {// 第三层回复} - {notempty name="$vo.children"} - {volist name="$vo.children" id="voo"} -
    - -
    -
    {$voo.user.name} 回复 {$voo.touser} {$voo.create_time|date='Y-m-d H:i'}
    -
    {$voo.content|raw}
    -
    - {eq name="voo.delete_time" value="0"} - - {$voo.zan} - - {:lang('reply')} - {//评论编辑删除采纳权限} -
    - {if ((session('user_id') == $voo.user.id) && (getLimtTime($voo.create_time) < 2)) OR ($user.auth ?? '')} - {:lang('edit')} - {:lang('delete')} - {/if} -
    - {/eq} -
    -
    -
    - {/volist} - {/notempty} + {//评论区} + {if (config('taoler.config.is_reply') == 1 ) AND ( $article.is_reply == 0 )} +
    +
    评论已关闭！
    +
    + {/if} - {/volist} - {/notempty} -
    - {else /} -
    - - 解密后查看内容 -
    - {/if} -
    -
    • - {/article:comment} -
-
-
+ {if session('?user_id') AND (config('taoler.config.is_reply') == 1 ) AND ( $article.is_reply == 1 )} +
+
+
+
+ +
+ +
+
+
+ + + +
+
+
+
+ {/if} - {//评论区} - {if (config('taoler.config.is_reply') == 1 ) AND ( $article.is_reply == 0 )} -
-
评论已关闭！
-
- {/if} +
+
+
- {if session('?user_id') AND (config('taoler.config.is_reply') == 1 ) AND ( $article.is_reply == 1 )} -
-
-
-
- -
- -
-
-
- - - -
-
-
-
- {/if} - -
-
-
-
- {//作者} -
-
-
-
-
-
-
-
-
-
-
{$article.user.name} -
-
-
-
-
-
{$article.user.name}
-
本站内容禁止任何人采集
-
-
{$article.user.article_count}
文章
-
{$article.user.comments_count}
评论
-
{$zanCount}
被赞
-
-
-
-
-
-
- {//广告} - - {:hook('ads_blog_detail_rimg')} +
+ {//作者} +
+
+
+
+
+
+
+
+
+
+ {$article.user.name} +
+
+
+
+
+
{$article.user.name}
+
本站内容禁止任何人采集
+
+
+
{$article.user.article_count}
+
文章
+
+
+
{$article.user.comments_count}
+
评论
+
+
+
{$zanCount}
+
被赞
+
+
+
+
+
+
+
- - {:hook('callme_show', ['id' => $article.id, 'uid' => $article.user.id])} + {//广告} + + {:hook('ads_blog_detail_rimg')} - {//热门文章} -
-
热门文章
-
-
    - {volist name="artHot" id="vo"} -
  • -
    - {$vo.title} -
    -
    -
    -
    -
    -
    • - {/volist} -
-
-
- {//标签} - {if count($hotTag) > 0} -
-
热门标签
-
-
    - {volist name="hotTag" id="vo"} -
    • - {/volist} -
-
-
- {/if} - {//友情链接} - - {:hook('ads_blog_detail_flink')} + + {:hook('callme_show', ['id' => $article.id, 'uid' => $article.user.id])} -
-
+ {//热门文章} +
+
热门文章
+
+
    + {volist name="artHot" id="vo"} +
  • +
    + {$vo.title} +
    +
    +
    +
    +
    • + {/volist} +
+
+
+ + {//标签} + {if count($hotTag) > 0} +
+
热门标签
+
+
    + {volist name="hotTag" id="vo"} +
    • + {/volist} +
+
+
+ {/if} + {//友情链接} + + {:hook('ads_blog_detail_flink')} + +
+
{//crud管理模块} {include file="/public/crud" /} +
{include file="public/menu" /} @@ -356,233 +370,189 @@ {block name="script"} + diff --git a/view/taoler/index/article/edit.html b/view/taoler/index/article/edit.html index c65c402..411476a 100644 --- a/view/taoler/index/article/edit.html +++ b/view/taoler/index/article/edit.html @@ -65,7 +65,7 @@
- +
diff --git a/view/taoler/index/article/news/cate.html b/view/taoler/index/article/news/cate.html index 05f843a..e16d039 100644 --- a/view/taoler/index/article/news/cate.html +++ b/view/taoler/index/article/news/cate.html @@ -14,64 +14,62 @@ {block name="content"}
-
-
-
- - -
- {article:list} -
- {if getOnepic($article.content)} -
- - {article:title /} - -
- {/if} -
-
-

- {article:title /} -

-
-

{:getArtContent($article.content)}

-
-
-
-
- -
- · -
-
- {article:auther /} - {$article.has_img ?= ''} - {$article.has_video ?= ''} - {$article.has_audio ?= ''} - {$article.read_type ?= ''} - {$article.upzip ?= ''} - {article:pv} - {article:comment_num} -
-
-
- 阅读全文 -
-
-
-
-
- {/article:list} -
-
-
-
-
- - {:hook('addonhook_list')} -
-
+
+
+
+
+ {article:list} +
+ {if getOnepic($article.content)} +
+ + {article:title /} + +
+ {/if} +
+
+

+ {article:title /} +

+
+

{:getArtContent($article.content)}

+
+
+
+
+ +
+ · +
+
+ {article:auther /} + {$article.has_img ?= ''} + {$article.has_video ?= ''} + {$article.has_audio ?= ''} + {$article.read_type ?= ''} + {$article.upzip ?= ''} + {article:pv} + {article:comment_num} +
+
+
+ 阅读全文 +
+
+
+
+
+ {/article:list} +
+
+
+
+
+ + {:hook('addonhook_list')} +
+
{include file="public/menu" /} {/block} @@ -79,7 +77,6 @@ diff --git a/view/taoler/index/article/posts/cate.html b/view/taoler/index/article/posts/cate.html index 16dff76..4aaed07 100644 --- a/view/taoler/index/article/posts/cate.html +++ b/view/taoler/index/article/posts/cate.html @@ -14,91 +14,91 @@ {block name="content"}
-
-
-
- -
-
-
-
- - {:hook('addonhook_list')} +
+
+
+ +
+
+
+
+ + {:hook('addonhook_list')} - {//热门标签} -
-
热门标签
-
-
    - {volist name="hotTag" id="vo"} -
  • {$vo.name}
    • - {/volist} -
-
-
- -
-
+ {//热门标签} +
+
热门标签
+
+
    + {volist name="hotTag" id="vo"} +
  • {$vo.name}
    • + {/volist} +
+
+
+
+
{include file="public/menu" /} + {/block} + {block name="script"} + {/block} \ No newline at end of file diff --git a/view/taoler/index/article/posts/detail.html b/view/taoler/index/article/posts/detail.html index ff39d9a..b695926 100644 --- a/view/taoler/index/article/posts/detail.html +++ b/view/taoler/index/article/posts/detail.html @@ -20,247 +20,249 @@
+ {//标题} -

{article:title /}

+

{article:title /}

+ {//图标}
- + {if (cookie('think_lang') == 'en-us')} {article:cate name="ename" /} {else /} {article:cate name="name" /} {/if} - - {if ($article.is_top == 1)}{:lang('top')}{/if} - {if ($article.is_hot == 1)}{:lang('hot')}{/if} - - - - {article:comment_num /} - - {article:pv /} - + + {if ($article.is_top == 1)} + {:lang('top')} + {/if} + {if ($article.is_hot == 1)} + {:lang('hot')} + {/if} + + + + {article:comment_num /} + + {article:pv /} +
+ {//作者}
{article:user name='name' /} - {if($article.user.vip > 0)}{/if} + {if($article.user.vip > 0)} + + {/if}
- - {article:auther} - - 关注 + {article:auther}
- + {$article.create_time} {:hook('ipShow',$article.user.city)}
+ {//内容} {:hook('taoplayerdiv')}
{article:content}
- {//下载} - {if (($article.upzip !== '') || session('?user_name'))} -
- {notempty name="$article.upzip"} - - {/notempty} -
- {/if} + {//下载} + {notempty name="$article.upzip"} + {if(session('?user_name'))} + + {/if} + {/notempty} - {//解密文件} - {empty name="passJieMi"} - {if($article.read_type == 1)} -
- -
- {/if} - {/empty} + {//解密文件} + {empty name="passJieMi"} + {if($article.read_type == 1)} +
+ +
+ {/if} + {/empty} - {notempty name="tags"} -
标签 - {volist name="tags" id="vo" } - {$vo.name} - {/volist} -
- {/notempty} -
-

{$sysInfo.state|raw}

-
- -
- - 点赞 {:count($userZanList)} - - {volist name="userZanList" id="vo" } - - {/volist} -
-
+ {notempty name="tags"} +
标签 + {volist name="tags" id="vo" } + {$vo.name} + {/volist} +
+ {/notempty} + {//网站声明} +
+

{$sysInfo.state|raw}

+
+ {//本文链接} +
本文链接：{$Request.domain}{$Request.url}
+
+ + 点赞 {:count($userZanList)} + + + {volist name="userZanList" id="vo" } + + {/volist} +
+
- {//评论} -
- {if session('?user_id') AND ( config('taoler.config.is_reply') == 1 ) AND ( $article.is_reply == 1 )} -
-
- -
- -
-
-
- - -
-
- {/if} -
+ {//评论} +
+ {if session('?user_id') AND ( config('taoler.config.is_reply') == 1 ) AND ( $article.is_reply == 1 )} +
+
+ +
+ +
+
+
+ + +
+
+ {/if} +
{//评论内容}
评论 {$article.comments_count} -
    - {article:comment} -
  • -
    - - {comment:uname} - -
    - - {comment:uname /} - - {if condition="$article.user_id eq $comment.user_id"}({:lang('poster')}){/if} - {comment:usign /} -
    -
    - {:hook('ipShow',$comment.user.city)} -
    + {article:comment} +
  • +
    + {comment:uname} +
    + {comment:uname /} + {if condition="$article.user_id eq $comment.user_id"} + ({:lang('poster')}) + {/if} + {comment:usign /} +
    +
    + {comment:time}{:hook('ipShow',$comment.user.city)} +
    - {//加密未解密评论不可查看} - {if($article.read_type == 0 || (($article.read_type == 1) && $passJieMi))} + {//加密未解密评论不可查看} + {if($article.read_type == 0 || (($article.read_type == 1) && $passJieMi))} +
    {comment:content /}
    +
    + {eq name="comment.delete_time" value="0"} + + {comment:zan /} + + {:lang('reply')} + {//评论编辑删除采纳权限} +
    + {if ((session('user_id') == $comment.user_id) && (getLimtTime($comment.create_time) < 2)) OR ($user.auth ?? '')} + {:lang('edit')} + {:lang('delete')} + {/if} +
    + {/eq} -
    {comment:content /}
    -
    - {eq name="comment.delete_time" value="0"} - - {comment:zan /} - - {:lang('reply')} - {//评论编辑删除采纳权限} -
    - {if ((session('user_id') == $comment.user_id) && (getLimtTime($comment.create_time) < 2)) OR ($user.auth ?? '')} - {:lang('edit')} - {:lang('delete')} - {/if} -
    - {/eq} + {// 第二层回复} + {notempty name="$comment.children"} + {volist name="$comment.children" id="vo"} +
    + + + +
    +
    {$vo.user.name} {$vo.create_time|date='Y-m-d H:i'}
    +
    {$vo.content|raw}
    +
    + {eq name="vo.delete_time" value="0"} + + {$vo.zan} + + {:lang('reply')} + {//评论编辑删除采纳权限} +
    + {if ((session('user_id') == $vo.user.id) && (getLimtTime($vo.create_time) < 2)) OR ($user.auth ?? '')} + {:lang('edit')} + {:lang('delete')} + {/if} +
    + {/eq} +
    +
    +
    - {// 第二层回复} - {notempty name="$comment.children"} - {volist name="$comment.children" id="vo"} - -
    - -
    -
    {$vo.user.name} {$vo.create_time|date='Y-m-d H:i'}
    -
    {$vo.content|raw}
    -
    - {eq name="vo.delete_time" value="0"} - - {$vo.zan} - - {:lang('reply')} - {//评论编辑删除采纳权限} -
    - {if ((session('user_id') == $vo.user.id) && (getLimtTime($vo.create_time) < 2)) OR ($user.auth ?? '')} - {:lang('edit')} - {:lang('delete')} - {/if} -
    - {/eq} - -
    -
    -
    - - {// 第三层回复} - {notempty name="$vo.children"} - {volist name="$vo.children" id="voo"} -
    - -
    -
    {$voo.user.name} 回复 {$voo.touser} {$voo.create_time|date='Y-m-d H:i'}
    -
    {$voo.content|raw}
    -
    - {eq name="voo.delete_time" value="0"} - - {$voo.zan} - - {:lang('reply')} - {//评论编辑删除采纳权限} -
    - {if ((session('user_id') == $voo.user.id) && (getLimtTime($voo.create_time) < 2)) OR ($user.auth ?? '')} - {:lang('edit')} - {:lang('delete')} - {/if} -
    - {/eq} -
    -
    -
    - {/volist} - {/notempty} - - {/volist} - {/notempty} -
    - {else /} -
    - - 评论解密后查看 -
    - {/if} -
    -
    • - {/article:comment} + {// 第三层回复} + {notempty name="$vo.children"} + {volist name="$vo.children" id="voo"} +
    + + + +
    +
    {$voo.user.name} 回复 {$voo.touser} {$voo.create_time|date='Y-m-d H:i'}
    +
    {$voo.content|raw}
    +
    + {eq name="voo.delete_time" value="0"} + + {$voo.zan} + + {:lang('reply')} + {//评论编辑删除采纳权限} +
    + {if ((session('user_id') == $voo.user.id) && (getLimtTime($voo.create_time) < 2)) OR ($user.auth ?? '')} + {:lang('edit')} + {:lang('delete')} + {/if} +
    + {/eq} +
    +
    +
    + {/volist} + {/notempty} + {/volist} + {/notempty} +
+ {else /} +
+ + 评论解密后查看 +
+ {/if} +
+ + {/article:comment} -
- {//右栏}
-
-
-
- - {$article.user.name} - {if($article.user.vip > 0)}{/if} - -
-
- 回答 {$article.user.comments_count} 发表 {$article.user.article_count} - + 关注 -
-
-
+
+
+
+ + {$article.user.name} + {if($article.user.vip > 0)}{/if} + +
+
+ 回答 {$article.user.comments_count} + 发表 {$article.user.article_count} +
+
+
- - {:hook('callme_show', ['id' => $article.id, 'uid' => $article.user.id])} - - - {:hook('addonhook_detail')} + + {:hook('callme_show', ['id' => $article.id, 'uid' => $article.user.id])} + + {:hook('addonhook_detail')}
- {//crud管理模块} + {include file="/public/crud" /} @@ -270,232 +272,183 @@ {block name="script"} @@ -504,6 +457,4 @@ layui.use(['fly', 'face','colorpicker', 'laypage'], function(){ {//图片点击放大} {include file="/public/images-click" /} -{include file="/public/qr-read" /} - {/block} \ No newline at end of file diff --git a/view/taoler/index/public/base.html b/view/taoler/index/public/base.html index ec66e18..7a820fe 100644 --- a/view/taoler/index/public/base.html +++ b/view/taoler/index/public/base.html @@ -49,23 +49,24 @@ {include file="public/footer" /} {include file="public/js" /} {block name="script"}{/block} diff --git a/view/taoler/index/public/footer.html b/view/taoler/index/public/footer.html index 49a4d27..b0b6ae2 100644 --- a/view/taoler/index/public/footer.html +++ b/view/taoler/index/public/footer.html @@ -1,44 +1,45 @@ + {:hook('callme_foot', ['id' => $article.id ?? '', 'uid' => $article.user.id ?? ''])} {:hook('showLeftLayer')} +