From cc8db8d2e0d18e8000185c317ef58f0c9f997349 Mon Sep 17 00:00:00 2001
From: tianya <yanghuxiao@vip.qq.com>
Date: Mon, 16 May 2022 22:23:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dtag=E7=9A=84=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/templets/tags_main.htm     | 2 +-
 src/system/archive/taglist.class.php | 9 +++++++--
 src/theme/templets/taglist.htm       | 4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/admin/templets/tags_main.htm b/src/admin/templets/tags_main.htm
index 2fdd9006..fb3043d0 100644
--- a/src/admin/templets/tags_main.htm
+++ b/src/admin/templets/tags_main.htm
@@ -135,7 +135,7 @@
 					<tr align="center" onmousemove="javascript:this.bgColor='#F8FCF1';" onmouseout="javascript:this.bgColor='#ffffff';">
 						<td><input type="checkbox" name="ids[]" value="<?php echo $fields['id']; ?>" class='np'></td>
 						<td>{dede:field.id/}</td>
-						<td><a href="../apps/tags.php?/<?php echo urlencode($fields['tag']); ?>/" target="_blank">{dede:field.tag/}</a></td>
+						<td><a href="../apps/tags.php?/<?php echo $fields['id']; ?>/" target="_blank">{dede:field.tag/}</a></td>
 						<td><input type="text" value="<?php echo $fields['count']; ?>" id="count<?php echo $fields['id']; ?>" size='5'></td>
 						<td><?php echo $fields['total']; ?></td>
 						<td><?php echo $fields['addtime']; ?></td>
diff --git a/src/system/archive/taglist.class.php b/src/system/archive/taglist.class.php
index 5ce78805..725bd426 100755
--- a/src/system/archive/taglist.class.php
+++ b/src/system/archive/taglist.class.php
@@ -46,7 +46,7 @@ class TagList
      */
     function __construct($keyword, $templet)
     {
-        global $dsql,$envs;
+        global $dsql,$envs,$cfg_cmsurl;
         $this->Templet = $templet;
         $this->Tag = (int)$keyword;
         $this->dsql = $dsql;
@@ -60,6 +60,7 @@ class TagList
         if (empty($keyword)) {
             $this->Fields['title'] = "TAGS列表";
         }
+        $this->Fields['position'] = $cfg_cmsurl."/apps/tags.php";
         $this->TempletsFile = '';
         //设置一些全局参数的值
         foreach ($GLOBALS['PubFields'] as $k => $v) $this->Fields[$k] = $v;
@@ -568,8 +569,12 @@ class TagList
     //生成静态Tag
     function MakeHtml($startpage = 1, $makepagesize = 0)
     {
-        global $cfg_dir_purview, $envs;
+        global $cfg_dir_purview,$envs,$cfg_cmspath,$cfg_tags_dir,$cfg_cmsurl;
         $envs['makeTag'] = 1;
+        $tagsdir = str_replace("{cmspath}", $cfg_cmspath, $cfg_tags_dir);
+        if (isset($envs['makeTag']) && $envs['makeTag'] == 1) {
+            $this->Fields['position'] = $cfg_cmsurl.$tagsdir."/";
+        }
         if (empty($this->TotalResult) && $this->Tag != "") $this->CountRecord();
         //初步给固定值的标记赋值
         $this->ParseTempletsFirst();
diff --git a/src/theme/templets/taglist.htm b/src/theme/templets/taglist.htm
index c3308584..6a4cdb76 100644
--- a/src/theme/templets/taglist.htm
+++ b/src/theme/templets/taglist.htm
@@ -22,7 +22,7 @@
 				<nav aria-label="breadcrumb">
 					<ol class="breadcrumb mt-3">
 						<li class="breadcrumb-item">当前位置</li>
-						<li class="breadcrumb-item"><a href='/apps/tags.php'>TAG标签</a></li>
+						<li class="breadcrumb-item"><a href='{dede:field.position/}'>TAG标签</a></li>
 						<li class="breadcrumb-item">{dede:field.title /}</li>
 					</ol>
 				</nav>
@@ -32,7 +32,7 @@
 			<div class="row">
 				<div class="col-md-8 list-main">
 					<ul class="list-unstyled items">
-						{dede:list pagesize='3'}
+						{dede:list pagesize='10'}
 						<li class="media border-bottom-dashed">
 							<div class="media-body row mt-2 py-2">
 								<div class="col-12 caption">