From b90d9cecc41b74a5d72c2ee453213c6e1de7b928 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=99=E8=BF=B0=E3=80=81=E5=88=AB=E7=A6=BB?=
 <93301500+xushubieli@users.noreply.github.com>
Date: Thu, 24 Apr 2025 18:26:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=84=9F=E8=B0=A2=EF=BC=9A=E4=B9=96=E4=B9=96?=
 =?UTF-8?q?=E5=A5=B3=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81=E5=92=8C=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E9=A3=8E=E6=A0=BC=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/system/archive/archives.class.php   | 166 ++++++++++++++----------
 src/system/archive/freelist.class.php   |  92 +++++++------
 src/system/archive/listview.class.php   |  34 ++---
 src/system/archive/searchview.class.php |  30 ++---
 src/system/archive/sglistview.class.php |  30 ++---
 src/system/archive/specview.class.php   |  36 ++---
 src/system/archive/taglist.class.php    |  32 ++---
 7 files changed, 226 insertions(+), 194 deletions(-)

diff --git a/src/system/archive/archives.class.php b/src/system/archive/archives.class.php
index 7a92d4d1..9754679f 100755
--- a/src/system/archive/archives.class.php
+++ b/src/system/archive/archives.class.php
@@ -761,12 +761,12 @@ class Archives
             $revalue = '';
             foreach ($this->SplitTitles as $k => $v) {
                 if ($i == 1) {
-                    $revalue .= "<a href='".$this->NameFirst.".".$this->ShortName."'>$v</a>";
+                    $revalue .= "<a href='{$this->NameFirst}.{$this->ShortName}'>{$v}</a>";
                 } else {
                     if ($PageNo == $i) {
                         $revalue .= "$v";
                     } else {
-                        $revalue .= "<a href='".$this->NameFirst."-".$i.".".$this->ShortName."'>$v</a>";
+                        $revalue .= "<a href='{$this->NameFirst}-{$i}.{$this->ShortName}'>{$v}</a>";
                     }
                 }
                 $i++;
@@ -775,12 +775,12 @@ class Archives
             $revalue = "<select class='form-control w-25' onchange='location.href=this.options[this.selectedIndex].value;'>";
             foreach ($this->SplitTitles as $k => $v) {
                 if ($i == 1) {
-                    $revalue .= "<option value='".$this->NameFirst.".".$this->ShortName."'>{$i}、{$v}</option>";
+                    $revalue .= "<option value='{$this->NameFirst}.{$this->ShortName}'>{$i}、{$v}</option>";
                 } else {
                     if ($PageNo == $i) {
-                        $revalue .= "<option value='".$this->NameFirst."-".$i.".".$this->ShortName."' selected>{$i}、{$v}</option>";
+                        $revalue .= "<option value='{$this->NameFirst}-{$i}.{$this->ShortName}' selected>{$i}、{$v}</option>";
                     } else {
-                        $revalue .= "<option value='".$this->NameFirst."-".$i.".".$this->ShortName."'>{$i}、{$v}</option>";
+                        $revalue .= "<option value='{$this->NameFirst}-{$i}.{$this->ShortName}'>{$i}、{$v}</option>";
                     }
                 }
                 $i++;
@@ -790,7 +790,7 @@ class Archives
         return $revalue;
     }
     /**
-     *  获得静态文档分页列表
+     *  获得静态文档分页列表，感谢：乖乖女
      *
      * @access    public
      * @param     int   $totalPage  总页数
@@ -800,41 +800,55 @@ class Archives
      */
     function GetPagebreak($totalPage, $nowPage, $aid)
     {
-        if ($totalPage == 1) {
-            return "";
-        }
-        $PageList = "<li class='page-item disabled'><span class='page-link'>".$totalPage."页</span></li>";
+        if ($totalPage == 1) return "";
+        $PageList = "<li class='page-item disabled'><span class='page-link'>{$totalPage}页</span></li>";
         $nPage = $nowPage - 1;
         $lPage = $nowPage + 1;
+        //上一页
         if ($nowPage == 1) {
             $PageList .= "<li class='page-item disabled'><span class='page-link'>上页</span></li>";
         } else {
-            if ($nPage == 1) {
-                $PageList .= "<li class='page-item'><a class='page-link' href='".$this->NameFirst.".".$this->ShortName."'>上页</a></li>";
+            $prevHref = ($nPage == 1) ? "{$this->NameFirst}.{$this->ShortName}" : "{$this->NameFirst}-{$nPage}.{$this->ShortName}";
+            $PageList .= "<li class='page-item'><a class='page-link' href='{$prevHref}'>上页</a></li>";
+        }
+        //显示第一页
+        if ($nowPage == 1) {
+            $PageList .= "<li class='page-item active'><span class='page-link'>1</span></li>";
+        } else {
+            $PageList .= "<li class='page-item'><a class='page-link' href='{$this->NameFirst}.{$this->ShortName}'>1</a></li>";
+        }
+        //省略前部分
+        if ($nowPage > 4 && $totalPage > 7) {
+            $PageList .= "<li class='page-item disabled'><span class='page-link'>...</span></li>";
+        }
+        //中间页码
+        $start = max(2, $nowPage - 2);
+        $end = min($totalPage - 1, $nowPage + 2);
+        for ($i = $start; $i <= $end; $i++) {
+            if ($i == $nowPage) {
+                $PageList .= "<li class='page-item active'><span class='page-link'>{$i}</span></li>";
             } else {
-                $PageList .= "<li class='page-item'><a class='page-link' href='".$this->NameFirst."-".$nPage.".".$this->ShortName."'>上页</a></li>";
+                $PageList .= "<li class='page-item'><a class='page-link' href='{$this->NameFirst}-{$i}.{$this->ShortName}'>{$i}</a></li>";
             }
         }
-        for ($i = 1; $i <= $totalPage; $i++) {
-            if ($i == 1) {
-                if ($nowPage != 1) {
-                    $PageList .= "<li class='page-item'><a class='page-link' href='".$this->NameFirst.".".$this->ShortName."'>1</a></li>";
-                } else {
-                    $PageList .= "<li class='page-item active'><span class='page-link'>1</span></li>";
-                }
+        //省略后部分
+        if ($nowPage < $totalPage - 3 && $totalPage > 7) {
+            $PageList .= "<li class='page-item disabled'><span class='page-link'>...</span></li>";
+        }
+        //显示最后一页
+        if ($totalPage > 1) {
+            if ($nowPage == $totalPage) {
+                $PageList .= "<li class='page-item active'><span class='page-link'>{$totalPage}</span></li>";
             } else {
-                $n = $i;
-                if ($nowPage != $i) {
-                    $PageList .= "<li class='page-item'><a class='page-link' href='".$this->NameFirst."-".$i.".".$this->ShortName."'>{$n}</a></li>";
-                } else {
-                    $PageList .= "<li class='page-item active'><span class='page-link'>{$n}</span></li>";
-                }
+                $PageList .= "<li class='page-item'><a class='page-link' href='{$this->NameFirst}-{$totalPage}.{$this->ShortName}'>{$totalPage}</a></li>";
             }
         }
-        if ($lPage <= $totalPage) {
-            $PageList .= "<li class='page-item'><a class='page-link' href='".$this->NameFirst."-".$lPage.".".$this->ShortName."'>下页</a></li>";
-        } else {
+        //下一页
+        if ($nowPage >= $totalPage) {
             $PageList .= "<li class='page-item'><span class='page-link'>下页</span></li>";
+        } else {
+            $nextHref = "{$this->NameFirst}-{$lPage}.{$this->ShortName}";
+            $PageList .= "<li class='page-item'><a class='page-link' href='{$nextHref}'>下页</a></li>";
         }
         return $PageList;
     }
@@ -862,18 +876,18 @@ class Archives
             foreach ($this->SplitTitles as $k => $v) {
                 if ($i == 1) {
                     if ($cfg_rewrite == 'Y') {
-                        $revalue .= "<a href='/article/$aid-$i.html'>$v</a>";
+                        $revalue .= "<a href='/article/{$aid}-{$i}.html'>{$v}</a>";
                     } else {
-                        $revalue .= "<a href='".$this->Fields['phpurl']."/view.php?aid=$aid&PageNo=$i'>$v</a>";
+                        $revalue .= "<a href='".$this->Fields['phpurl']."/view.php?aid={$aid}&PageNo={$i}'>{$v}</a>";
                     }
                 } else {
                     if ($PageNo == $i) {
                         $revalue .= " $v ";
                     } else {
                         if ($cfg_rewrite == 'Y') {
-                            $revalue .= "<a href='/article/$aid-$i.html'>$v</a>";
+                            $revalue .= "<a href='/article/{$aid}-{$i}.html'>$v</a>";
                         } else {
-                            $revalue .= "<a href='".$this->Fields['phpurl']."/view.php?aid=$aid&PageNo=$i'>$v</a>";
+                            $revalue .= "<a href='".$this->Fields['phpurl']."/view.php?aid={$aid}&PageNo={$i}'>{$v}</a>";
                         }
                         
                     }
@@ -885,22 +899,22 @@ class Archives
             foreach ($this->SplitTitles as $k => $v) {
                 if ($i == 1) {
                     if ($cfg_rewrite == 'Y') {
-                        $revalue .= "<option value='/article/$aid-$i.html'>{$i}、{$v}</option>";
+                        $revalue .= "<option value='/article/{$aid}-{$i}.html'>{$i}、{$v}</option>";
                     } else {
-                        $revalue .= "<option value='".$this->Fields['phpurl']."/view.php?aid=$aid&PageNo=$i'>{$i}、{$v}</option>";
+                        $revalue .= "<option value='".$this->Fields['phpurl']."/view.php?aid={$aid}&PageNo={$i}'>{$i}、{$v}</option>";
                     }
                 } else {
                     if ($PageNo == $i) {
                         if ($cfg_rewrite == 'Y') {
-                            $revalue .= "<option value='/article/$aid-$i.html' selected>{$i}、{$v}</option>";
+                            $revalue .= "<option value='/article/{$aid}-{$i}.html' selected>{$i}、{$v}</option>";
                         } else {
-                            $revalue .= "<option value='".$this->Fields['phpurl']."/view.php?aid=$aid&PageNo=$i' selected>{$i}、{$v}</option>";
+                            $revalue .= "<option value='".$this->Fields['phpurl']."/view.php?aid={$aid}&PageNo={$i}' selected>{$i}、{$v}</option>";
                         }
                     } else {
                         if ($cfg_rewrite == 'Y') {
-                            $revalue .= "<option value='/article/$aid-$i.html'>{$i}、{$v}</option>";
+                            $revalue .= "<option value='/article/{$aid}-{$i}.html'>{$i}、{$v}</option>";
                         } else {
-                            $revalue .= "<option value='".$this->Fields['phpurl']."/view.php?aid=$aid&PageNo=$i'>{$i}、{$v}</option>";
+                            $revalue .= "<option value='".$this->Fields['phpurl']."/view.php?aid={$aid}&PageNo={$i}'>{$i}、{$v}</option>";
                         }
                     }
                 }
@@ -911,7 +925,7 @@ class Archives
         return $revalue;
     }
     /**
-     *  获得动态文档分页列表
+     *  获得动态文档分页列表，感谢：乖乖女
      *
      * @access    public
      * @param     int   $totalPage  总页数
@@ -925,55 +939,75 @@ class Archives
         if ($totalPage == 1) {
             return "";
         }
-        $PageList = "<li class='page-item disabled'><span class='page-link'>".$totalPage."页</span></li>";
+        $PageList = "<li class='page-item disabled'><span class='page-link'>{$totalPage}页</span></li>";
         $nPage = $nowPage - 1;
         $lPage = $nowPage + 1;
+        //上一页
         if ($nowPage == 1) {
             $PageList .= "<li class='page-item disabled'><span class='page-link'>上页</span></li>";
         } else {
             if ($nPage == 1) {
                 if ($cfg_rewrite == 'Y') {
-                    $PageList .= "<li class='page-item'><a class='page-link' href='".$cfg_cmsurl."/article/$aid.html'>上页</a></li>";
+                    $PageList .= "<li class='page-item'><a class='page-link' href='".$cfg_cmsurl."/article/{$aid}.html'>上页</a></li>";
                 } else {
-                    $PageList .= "<li class='page-item'><a class='page-link' href='".$this->Fields['phpurl']."/view.php?aid=$aid'>上页</a></li>";
+                    $PageList .= "<li class='page-item'><a class='page-link' href='".$this->Fields['phpurl']."/view.php?aid={$aid}'>上页</a></li>";
                 }
             } else {
                 if ($cfg_rewrite == 'Y') {
-                    $PageList .= "<li class='page-item'><a class='page-link' href='".$cfg_cmsurl."/article/$aid-$nPage.html'>上页</a></li>";
+                    $PageList .= "<li class='page-item'><a class='page-link' href='".$cfg_cmsurl."/article/{$aid}-{$nPage}.html'>上页</a></li>";
                 } else {
-                    $PageList .= "<li class='page-item'><a class='page-link' href='".$this->Fields['phpurl']."/view.php?aid=$aid&PageNo=$nPage'>上页</a></li>";
+                    $PageList .= "<li class='page-item'><a class='page-link' href='".$this->Fields['phpurl']."/view.php?aid={$aid}&PageNo={$nPage}'>上页</a></li>";
                 }
             }
         }
-        for ($i = 1; $i <= $totalPage; $i++) {
-            if ($i == 1) {
-                if ($nowPage != 1) {
-                    if ($cfg_rewrite == 'Y') {
-                        $PageList .= "<li class='page-item'><a class='page-link' href='".$cfg_cmsurl."/article/$aid.html'>1</a></li>";
-                    } else {
-                        $PageList .= "<li class='page-item'><a class='page-link' href='".$this->Fields['phpurl']."/view.php?aid=$aid'>1</a></li>";
-                    }
-                } else {
-                    $PageList .= "<li class='page-item active'><span class='page-link'>1</span></li>";
-                }
+        //第一页
+        if ($nowPage != 1) {
+            if ($cfg_rewrite == 'Y') {
+                $PageList .= "<li class='page-item'><a class='page-link' href='".$cfg_cmsurl."/article/{$aid}.html'>1</a></li>";
             } else {
-                $n = $i;
-                if ($nowPage != $i) {
-                    if ($cfg_rewrite == 'Y') {
-                        $PageList .= "<li class='page-item'><a class='page-link' href='".$cfg_cmsurl."/article/$aid-$i.html'>{$n}</a></li>";
-                    } else {
-                        $PageList .= "<li class='page-item'><a class='page-link' href='".$this->Fields['phpurl']."/view.php?aid=$aid&PageNo=$i'>{$n}</a></li>";
-                    }
+                $PageList .= "<li class='page-item'><a class='page-link' href='".$this->Fields['phpurl']."/view.php?aid={$aid}'>1</a></li>";
+            }
+        } else {
+            $PageList .= "<li class='page-item active'><span class='page-link'>1</span></li>";
+        }
+        //省略前部分
+        if ($nowPage > 4 && $totalPage > 7) {
+            $PageList .= "<li class='page-item disabled'><span class='page-link'>...</span></li>";
+        }
+        //中间页码（最多显示3个）
+        $start = max(2, $nowPage - 2);
+        $end = min($totalPage - 1, $nowPage + 2);
+        for ($i = $start; $i <= $end; $i++) {
+            if ($i == $nowPage) {
+                $PageList .= "<li class='page-item active'><span class='page-link'>{$i}</span></li>";
+            } else {
+                if ($cfg_rewrite == 'Y') {
+                    $PageList .= "<li class='page-item'><a class='page-link' href='".$cfg_cmsurl."/article/{$aid}-{$i}.html'>{$i}</a></li>";
                 } else {
-                    $PageList .= "<li class='page-item active'><span class='page-link'>{$n}</span></li>";
+                    $PageList .= "<li class='page-item'><a class='page-link' href='".$this->Fields['phpurl']."/view.php?aid={$aid}&PageNo={$i}'>{$i}</a></li>";
                 }
             }
         }
+        //省略后部分
+        if ($nowPage < $totalPage - 3 && $totalPage > 7) {
+            $PageList .= "<li class='page-item disabled'><span class='page-link'>...</span></li>";
+        }
+        //最后一页
+        if ($nowPage != $totalPage) {
+            if ($cfg_rewrite == 'Y') {
+                $PageList .= "<li class='page-item'><a class='page-link' href='".$cfg_cmsurl."/article/{$aid}-{$totalPage}.html'>{$totalPage}</a></li>";
+            } else {
+                $PageList .= "<li class='page-item'><a class='page-link' href='".$this->Fields['phpurl']."/view.php?aid={$aid}&PageNo={$totalPage}'>{$totalPage}</a></li>";
+            }
+        } else {
+            $PageList .= "<li class='page-item active'><span class='page-link'>{$totalPage}</span></li>";
+        }
+        //下一页
         if ($lPage <= $totalPage) {
             if ($cfg_rewrite == 'Y') {
-                $PageList .= "<li class='page-item'><a class='page-link' href='".$cfg_cmsurl."/article/$aid-$lPage.html'>下页</a></li>";
+                $PageList .= "<li class='page-item'><a class='page-link' href='".$cfg_cmsurl."/article/{$aid}-{$lPage}.html'>下页</a></li>";
             } else {
-                $PageList .= "<li class='page-item'><a class='page-link' href='".$this->Fields['phpurl']."/view.php?aid=$aid&PageNo=$lPage'>下页</a></li>";
+                $PageList .= "<li class='page-item'><a class='page-link' href='".$this->Fields['phpurl']."/view.php?aid={$aid}&PageNo={$lPage}'>下页</a></li>";
             }
         } else {
             $PageList .= "<li class='page-item'><span class='page-link'>下页</span></li>";
diff --git a/src/system/archive/freelist.class.php b/src/system/archive/freelist.class.php
index 83b2d38d..407b54c8 100755
--- a/src/system/archive/freelist.class.php
+++ b/src/system/archive/freelist.class.php
@@ -634,12 +634,12 @@ class FreeList
         }
         $totalpage = ceil($this->TotalResult / $this->pagesize);
         if ($totalpage <= 1 && $this->TotalResult > 0) {
-            return "<li class='page-item disabled'><span class='page-link'>1页".$this->TotalResult."条</span></li>";
+            return "<li class='page-item disabled'><span class='page-link'>1页{$this->TotalResult}条</span></li>";
         }
         if ($this->TotalResult == 0) {
-            return "<li class='page-item disabled'><span class='page-link'>0页".$this->TotalResult."条</span></li>";
+            return "<li class='page-item disabled'><span class='page-link'>0页{$this->TotalResult}条</span></li>";
         }
-        $maininfo = "<li class='page-item disabled'><span class='page-link'>{$totalpage}页".$this->TotalResult."条</span></li>";
+        $maininfo = "<li class='page-item disabled'><span class='page-link'>{$totalpage}页{$this->TotalResult}条</span></li>";
         $purl = $this->GetCurUrl();
         $tnamerule = $this->GetMakeFileRule();
         $tnamerule = preg_replace("#^(.*)\/#", '', $tnamerule);
@@ -665,9 +665,9 @@ class FreeList
         $optionlist = "<select name='sldd' style='width:$optionlen' onchange='location.href=this.options[this.selectedIndex].value;'>";
         for ($fl = 1; $fl <= $totalpage; $fl++) {
             if ($fl == $this->PageNo) {
-                $optionlist .= "<option value='".str_replace("{page}", $fl, $tnamerule)."' selected>$fl</option>";
+                $optionlist .= "<option value='".str_replace("{page}", $fl, $tnamerule)."' selected>{$fl}</option>";
             } else {
-                $optionlist .= "<option value='".str_replace("{page}", $fl, $tnamerule)."'>$fl</option>";
+                $optionlist .= "<option value='".str_replace("{page}", $fl, $tnamerule)."'>{$fl}</option>";
             }
         }
         $optionlist .= "</select>";
@@ -688,33 +688,19 @@ class FreeList
         }
         for ($j; $j <= $total_list; $j++) {
             if ($j == $this->PageNo) {
-                $listdd .= "<li class='page-item active'><span class='page-link'>$j</span></li>";
+                $listdd .= "<li class='page-item active'><span class='page-link'>{$j}</span></li>";
             } else {
-                $listdd .= "<li class='page-item'><a href='".str_replace("{page}", $j, $tnamerule)."' class='page-link'>$j</a></li>";
+                $listdd .= "<li class='page-item'><a href='".str_replace("{page}", $j, $tnamerule)."' class='page-link'>{$j}</a></li>";
             }
         }
         $plist = '';
-        if (preg_match('#info#i', $listitem)) {
-            $plist .= $maininfo.' ';
-        }
-        if (preg_match('#index#i', $listitem)) {
-            $plist .= $indexpage.' ';
-        }
-        if (preg_match('#pre#i', $listitem)) {
-            $plist .= $prepage.' ';
-        }
-        if (preg_match('#pageno#i', $listitem)) {
-            $plist .= $listdd.' ';
-        }
-        if (preg_match('#next#i', $listitem)) {
-            $plist .= $nextpage.' ';
-        }
-        if (preg_match('#end#i', $listitem)) {
-            $plist .= $endpage.' ';
-        }
-        if (preg_match('#option#i', $listitem)) {
-            $plist .= $optionlist;
-        }
+        if (preg_match('/index/i', $listitem)) $plist .= $indexpage;
+        if (preg_match('/pre/i', $listitem)) $plist .= $prepage;
+        if (preg_match('/pageno/i', $listitem)) $plist .= $listdd;
+        if (preg_match('/next/i', $listitem)) $plist .= $nextpage;
+        if (preg_match('/end/i', $listitem)) $plist .= $endpage;
+        if (preg_match('/option/i', $listitem)) $plist .= $optionlist;
+        if (preg_match('/info/i', $listitem)) $plist .= $maininfo;
         return $plist;
     }
     /**
@@ -736,27 +722,32 @@ class FreeList
         }
         $totalpage = ceil($this->TotalResult / $this->pagesize);
         if ($totalpage <= 1 && $this->TotalResult > 0) {
-            return "<li class='page-item disabled'><span class='page-link'>1页".$this->TotalResult."条</span></li>";
+            return "<li class='page-item disabled'><span class='page-link'>1页{$this->TotalResult}条</span></li>";
         }
         if ($this->TotalResult == 0) {
-            return "<li class='page-item disabled'><span class='page-link'>0页".$this->TotalResult."条</span></li>";
+            return "<li class='page-item disabled'><span class='page-link'>0页{$this->TotalResult}条</span></li>";
         }
-        $maininfo = "<li class='page-item disabled'><span class='page-link'>{$totalpage}页".$this->TotalResult."条</span></li>";
+        $maininfo = "<li class='page-item disabled'><span class='page-link'>{$totalpage}页{$this->TotalResult}条</span></li>";
         $purl = $this->GetCurUrl();
-        $geturl = "lid=".$this->FreeID."&TotalResult=".$this->TotalResult."&";
-        $hidenform = "<input type='hidden' name='lid' value='".$this->FreeID."'>";
-        $hidenform .= "<input type='hidden' name='TotalResult' value='".$this->TotalResult."'>";
-        $purl .= "?".$geturl;
+        //开启伪静态对规则替换
+        if ($cfg_rewrite == 'Y') {
+            $purl = str_replace("/apps", "", $purl);
+            $nowurls = preg_replace("/", ".php?", $purl);
+            $nowurls = explode("?", $nowurls);
+            $purl = $nowurls[0];
+        }
+        $geturl = "tid={$this->TypeID}&TotalResult={$this->TotalResult}&";
+        $purl .= '?'.$geturl;
         //获得上页和下页的链接
         if ($this->PageNo != 1) {
-            $prepage .= "<li class='page-item'><a href='".$purl."PageNo=$prepagenum' class='page-link'>上页</a></li>";
-            $indexpage = "<li class='page-item'><a href='".$purl."PageNo=1' class='page-link'>首页</a>";
+            $prepage .= "<li class='page-item'><a href='{$purl}PageNo={$prepagenum}' class='page-link'>上页</a></li>";
+            $indexpage = "<li class='page-item'><a href='{$purl}PageNo=1' class='page-link'>首页</a>";
         } else {
             $indexpage = "<li class='page-item'><span class='page-link'>首页</span></li>";
         }
         if ($this->PageNo != $totalpage && $totalpage > 1) {
-            $nextpage .= "<li class='page-item'><a href='".$purl."PageNo=$nextpagenum' class='page-link'>下页</a></li>";
-            $endpage = "<li class='page-item'><a href='".$purl."PageNo=$totalpage' class='page-link'>末页</a></li>";
+            $nextpage .= "<li class='page-item'><a href='{$purl}PageNo={$nextpagenum}' class='page-link'>下页</a></li>";
+            $endpage = "<li class='page-item'><a href='{$purl}PageNo={$totalpage}' class='page-link'>末页</a></li>";
         } else {
             $endpage = "<li class='page-item'><span class='page-link'>末页</span></li>";
         }
@@ -773,18 +764,25 @@ class FreeList
         }
         for ($j; $j <= $total_list; $j++) {
             if ($j == $this->PageNo) {
-                $listdd .= "<li class='page-item active'><span class='page-link'>$j</span></li>";
+                $listdd .= "<li class='page-item active'><span class='page-link'>{$j}</span></li>";
             } else {
-                $listdd .= "<li class='page-item'><a href='".$purl."PageNo=$j' class='page-link'>$j</a></li>";
+                $listdd .= "<li class='page-item'><a href='{$purl}PageNo={$j}' class='page-link'>{$j}</a></li>";
             }
         }
-        $plist  = "<form name='pagelist' action='".$this->GetCurUrl()."'>$hidenform";
-        $plist .= $maininfo.$indexpage.$prepage.$listdd.$nextpage.$endpage;
-        if ($totalpage > $total_list) {
-            $plist .= "<input type='text' name='PageNo' value='".$this->PageNo."'>";
-            $plist .= "<input type='submit' name='plistgo' value='GO'>";
+        $plist = '';
+        if (preg_match('/index/i', $listitem)) $plist .= $indexpage;
+        if (preg_match('/pre/i', $listitem)) $plist .= $prepage;
+        if (preg_match('/pageno/i', $listitem)) $plist .= $listdd;
+        if (preg_match('/next/i', $listitem)) $plist .= $nextpage;
+        if (preg_match('/end/i', $listitem)) $plist .= $endpage;
+        if (preg_match('/option/i', $listitem)) $plist .= $optionlist;
+        if (preg_match('/info/i', $listitem)) $plist .= $maininfo;
+        //伪静态栏目分页
+        if ($cfg_rewrite == 'Y') {
+            $plist = str_replace("?tid=", "", $plist);
+            $plist = preg_replace("/&pageno=(\d+)/i", "-\\1", $plist);
+            $plist = preg_replace("/&TotalResult=(\d+)/i", "", $plist);//去掉分页数值
         }
-        $plist .= "</form>";
         return $plist;
     }
     /**
diff --git a/src/system/archive/listview.class.php b/src/system/archive/listview.class.php
index 22f88137..2b1adf90 100755
--- a/src/system/archive/listview.class.php
+++ b/src/system/archive/listview.class.php
@@ -986,13 +986,13 @@ class ListView
         }
         $totalpage = ceil($this->TotalResult / $this->pagesize);
         if ($totalpage <= 1 && $this->TotalResult > 0) {
-            return "<li class='page-item disabled'><span class='page-link'>1页".$this->TotalResult."条</span></li>";
+            return "<li class='page-item disabled'><span class='page-link'>1页{$this->TotalResult}条</span></li>";
         }
         if ($this->TotalResult == 0) {
-            return "<li class='page-item disabled'><span class='page-link'>0页".$this->TotalResult."条</span></li>";
+            return "<li class='page-item disabled'><span class='page-link'>0页{$this->TotalResult}条</span></li>";
         }
         $purl = $this->GetCurUrl();
-        $maininfo = "<li class='page-item disabled'><span class='page-link'>{$totalpage}页".$this->TotalResult."条</span></li>";
+        $maininfo = "<li class='page-item disabled'><span class='page-link'>{$totalpage}页{$this->TotalResult}条</span></li>";
         $tnamerule = $this->GetMakeFileRule($this->Fields['id'], "list", $this->Fields['typedir'], $this->Fields['defaultname'], $this->Fields['namerule2']);
         $tnamerule = preg_replace("/^(.*)\//", '', $tnamerule);
         //获得上页和首页的链接
@@ -1018,9 +1018,9 @@ class ListView
         $optionlist = "<li><select name='sldd' style='width:{$optionlen}px' onchange='location.href=this.options[this.selectedIndex].value;'>";
         for ($mjj = 1; $mjj <= $totalpage; $mjj++) {
             if ($mjj == $this->PageNo) {
-                $optionlist .= "<option value='".str_replace("{page}", $mjj, $tnamerule)."' selected>$mjj</option>";
+                $optionlist .= "<option value='".str_replace("{page}", $mjj, $tnamerule)."' selected>{$mjj}</option>";
             } else {
-                $optionlist .= "<option value='".str_replace("{page}", $mjj, $tnamerule)."'>$mjj</option>";
+                $optionlist .= "<option value='".str_replace("{page}", $mjj, $tnamerule)."'>{$mjj}</option>";
             }
         }
         $optionlist .= "</select></li>";
@@ -1041,9 +1041,9 @@ class ListView
         }
         for ($j; $j <= $total_list; $j++) {
             if ($j == $this->PageNo) {
-                $listdd .= "<li class='page-item active'><span class='page-link'>$j</span></li>";
+                $listdd .= "<li class='page-item active'><span class='page-link'>{$j}</span></li>";
             } else {
-                $listdd .= "<li class='page-item'><a href='".str_replace("{page}", $j, $tnamerule)."' class='page-link'>$j</a></li>";
+                $listdd .= "<li class='page-item'><a href='".str_replace("{page}", $j, $tnamerule)."' class='page-link'>{$j}</a></li>";
             }
         }
         $plist = '';
@@ -1075,12 +1075,12 @@ class ListView
         }
         $totalpage = ceil($this->TotalResult / $this->pagesize);
         if ($totalpage <= 1 && $this->TotalResult > 0) {
-            return "<li class='page-item disabled'><span class='page-link'>1页".$this->TotalResult."条</span></li>";
+            return "<li class='page-item disabled'><span class='page-link'>1页{$this->TotalResult}条</span></li>";
         }
         if ($this->TotalResult == 0) {
-            return "<li class='page-item disabled'><span class='page-link'>0页".$this->TotalResult."条</span></li>";
+            return "<li class='page-item disabled'><span class='page-link'>0页{$this->TotalResult}条</span></li>";
         }
-        $maininfo = "<li class='page-item disabled'><span class='page-link'>{$totalpage}页".$this->TotalResult."条</span></li>";
+        $maininfo = "<li class='page-item disabled'><span class='page-link'>{$totalpage}页{$this->TotalResult}条</span></li>";
         $purl = $this->GetCurUrl();
         //开启伪静态对规则替换
         if ($cfg_rewrite == 'Y') {
@@ -1089,19 +1089,19 @@ class ListView
             $nowurls = explode("?", $nowurls);
             $purl = $nowurls[0];
         }
-        $geturl = "tid=".$this->TypeID."&TotalResult=".$this->TotalResult."&";
+        $geturl = "tid={$this->TypeID}&TotalResult={$this->TotalResult}&";
         $purl .= '?'.$geturl;
         $optionlist = '';
         //获得上页和下页的链接
         if ($this->PageNo != 1) {
-            $prepage .= "<li class='page-item'><a href='".$purl."PageNo=".$prepagenum."' class='page-link'>上页</a></li>";
-            $indexpage = "<li class='page-item'><a href='".$purl."PageNo=1' class='page-link'>首页</a></li>";
+            $prepage .= "<li class='page-item'><a href='{$purl}PageNo={$prepagenum}' class='page-link'>上页</a></li>";
+            $indexpage = "<li class='page-item'><a href='{$purl}PageNo=1' class='page-link'>首页</a></li>";
         } else {
             $indexpage = "<li class='page-item'><span class='page-link'>首页</span></li>";
         }
         if ($this->PageNo != $totalpage && $totalpage > 1) {
-            $nextpage .= "<li class='page-item'><a href='".$purl."PageNo=".$nextpagenum."' class='page-link'>下页</a></li>";
-            $endpage = "<li class='page-item'><a href='".$purl."PageNo=".$totalpage."' class='page-link'>末页</a></li>";
+            $nextpage .= "<li class='page-item'><a href='{$purl}PageNo={$nextpagenum}' class='page-link'>下页</a></li>";
+            $endpage = "<li class='page-item'><a href='{$purl}PageNo={$totalpage}' class='page-link'>末页</a></li>";
         } else {
             $endpage = "<li class='page-item'><span class='page-link'>末页</span></li>";
         }
@@ -1122,9 +1122,9 @@ class ListView
         }
         for ($j; $j <= $total_list; $j++) {
             if ($j == $this->PageNo) {
-                $listdd .= "<li class='page-item active'><span class='page-link'>$j</span></li>";
+                $listdd .= "<li class='page-item active'><span class='page-link'>{$j}</span></li>";
             } else {
-                $listdd .= "<li class='page-item'><a href='".$purl."PageNo=".$j."' class='page-link'>$j</a></li>";
+                $listdd .= "<li class='page-item'><a href='{$purl}PageNo={$j}' class='page-link'>{$j}</a></li>";
             }
         }
         $plist = '';
diff --git a/src/system/archive/searchview.class.php b/src/system/archive/searchview.class.php
index 51be3876..44c0c4e6 100755
--- a/src/system/archive/searchview.class.php
+++ b/src/system/archive/searchview.class.php
@@ -635,10 +635,10 @@ class SearchView
         }
         $totalpage = ceil($this->TotalResult / $this->pagesize);
         if ($totalpage <= 1 && $this->TotalResult > 0) {
-            return "<li class='page-item disabled'><span class='page-link'>1页".$this->TotalResult."条</span></li>";
+            return "<li class='page-item disabled'><span class='page-link'>1页{$this->TotalResult}条</span></li>";
         }
         if ($this->TotalResult == 0) {
-            return "<li class='page-item disabled'><span class='page-link'>0页".$this->TotalResult."条</span></li>";
+            return "<li class='page-item disabled'><span class='page-link'>0页{$this->TotalResult}条</span></li>";
         }
         $purl = $this->GetCurUrl();
         $oldkeyword = (empty($oldkeyword) ? $this->Keyword : $oldkeyword);
@@ -646,7 +646,7 @@ class SearchView
         if ($this->TotalResult > $this->SearchMaxRc) {
             $totalpage = ceil($this->SearchMaxRc / $this->pagesize);
         }
-        $infos = "<li class='page-item disabled'><span class='page-link'>{$totalpage}页".$this->TotalResult."条</span></li>";
+        $infos = "<li class='page-item disabled'><span class='page-link'>{$totalpage}页{$this->TotalResult}条</span></li>";
         $geturl = "";
         //$geturl = "keyword=".urlencode($oldkeyword)."&searchtype=".$this->SearchType;
         //$geturl .= "&channeltype=".$this->ChannelType."&orderby=".$this->OrderBy;
@@ -655,14 +655,14 @@ class SearchView
         $purl .= "?".$geturl;
         //获得上页和下页的链接
         if ($this->PageNo != 1) {
-            $prepage .= "<li class='page-item'><a href='".$purl."PageNo=$prepagenum' class='page-link'>上页</a></li>";
-            $indexpage = "<li class='page-item'><a href='".$purl."PageNo=1' class='page-link'>首页</a></li>";
+            $prepage .= "<li class='page-item'><a href='{$purl}PageNo={$prepagenum}' class='page-link'>上页</a></li>";
+            $indexpage = "<li class='page-item'><a href='{$purl}PageNo=1' class='page-link'>首页</a></li>";
         } else {
             $indexpage = "<li class='page-item'><a class='page-link'>首页</a></li>";
         }
         if ($this->PageNo != $totalpage && $totalpage > 1) {
-            $nextpage .= "<li class='page-item'><a href='".$purl."PageNo=$nextpagenum' class='page-link'>下页</a></li>";
-            $endpage = "<li class='page-item'><a href='".$purl."PageNo=$totalpage' class='page-link'>末页</a></li>";
+            $nextpage .= "<li class='page-item'><a href='{$purl}PageNo={$nextpagenum}' class='page-link'>下页</a></li>";
+            $endpage = "<li class='page-item'><a href='{$purl}PageNo={$totalpage}' class='page-link'>末页</a></li>";
         } else {
             $endpage = "<li class='page-item'><a class='page-link'>末页</a></li>";
         }
@@ -683,18 +683,18 @@ class SearchView
         }
         for ($j; $j <= $total_list; $j++) {
             if ($j == $this->PageNo) {
-                $listdd .= "<li class='page-item active'><span class='page-link'>$j</span></li>";
+                $listdd .= "<li class='page-item active'><span class='page-link'>{$j}</span></li>";
             } else {
-                $listdd .= "<li class='page-item'><a href='".$purl."PageNo=$j' class='page-link'>$j</a></li>";
+                $listdd .= "<li class='page-item'><a href='{$purl}PageNo={$j}' class='page-link'>{$j}</a></li>";
             }
         }
 		$plist = '';
-        $plist .= preg_match('/info/i', $listitem)? $infos : "";
-        $plist .= preg_match('/index/i', $listitem)? $indexpage : "";
-        $plist .= preg_match('/pre/i', $listitem)? $prepage : "";
-        $plist .= preg_match('/pageno/i', $listitem)? $listdd : "";
-        $plist .= preg_match('/next/i', $listitem)? $nextpage : "";
-        $plist .= preg_match('/end/i', $listitem)? $endpage : "";
+        $plist .= preg_match('/info/i', $listitem) ? $infos : "";
+        $plist .= preg_match('/index/i', $listitem) ? $indexpage : "";
+        $plist .= preg_match('/pre/i', $listitem) ? $prepage : "";
+        $plist .= preg_match('/pageno/i', $listitem) ? $listdd : "";
+        $plist .= preg_match('/next/i', $listitem) ? $nextpage : "";
+        $plist .= preg_match('/end/i', $listitem) ? $endpage : "";
         return $plist;
     }
     /**
diff --git a/src/system/archive/sglistview.class.php b/src/system/archive/sglistview.class.php
index bf4b1030..4376bb0e 100755
--- a/src/system/archive/sglistview.class.php
+++ b/src/system/archive/sglistview.class.php
@@ -880,13 +880,13 @@ class SgListView
         }
         $totalpage = ceil($this->TotalResult / $this->pagesize);
         if ($totalpage <= 1 && $this->TotalResult > 0) {
-            return "<li class='page-item disabled'><span class='page-link'>1页".$this->TotalResult."条</span></li>";
+            return "<li class='page-item disabled'><span class='page-link'>1页{$this->TotalResult}条</span></li>";
         }
         if ($this->TotalResult == 0) {
-            return "<li class='page-item disabled'><span class='page-link'>0页".$this->TotalResult."条</span></li>";
+            return "<li class='page-item disabled'><span class='page-link'>0页{$this->TotalResult}条</span></li>";
         }
         $purl = $this->GetCurUrl();
-        $maininfo = "<li class='page-item disabled'><span class='page-link'>{$totalpage}页".$this->TotalResult."条</span></li>";
+        $maininfo = "<li class='page-item disabled'><span class='page-link'>{$totalpage}页{$this->TotalResult}条</span></li>";
         $tnamerule = $this->GetMakeFileRule($this->Fields['id'], "list", $this->Fields['typedir'], $this->Fields['defaultname'], $this->Fields['namerule2']);
         $tnamerule = preg_replace("/^(.*)\//", '', $tnamerule);
         //获得上页和首页的链接
@@ -922,9 +922,9 @@ class SgListView
         }
         for ($j; $j <= $total_list; $j++) {
             if ($j == $this->PageNo) {
-                $listdd .= "<li class='page-item active'><span class='page-link'>$j</span></li>";
+                $listdd .= "<li class='page-item active'><span class='page-link'>{$j}</span></li>";
             } else {
-                $listdd .= "<li class='page-item'><a href='".str_replace("{page}", $j, $tnamerule)."' class='page-link'>$j</a></li>";
+                $listdd .= "<li class='page-item'><a href='".str_replace("{page}", $j, $tnamerule)."' class='page-link'>{$j}</a></li>";
             }
         }
         $plist = '';
@@ -958,12 +958,12 @@ class SgListView
             $list_len = 3;
         }
         $totalpage = ceil($this->TotalResult / $this->pagesize);
-        $maininfo = "<li class='page-item disabled'><span class='page-link'>{$totalpage}页".$this->TotalResult."条</span></li>";
+        $maininfo = "<li class='page-item disabled'><span class='page-link'>{$totalpage}页{$this->TotalResult}条</span></li>";
         if ($totalpage <= 1 && $this->TotalResult > 0) {
-            return "<li class='page-item disabled'><span class='page-link'>1页".$this->TotalResult."条</span></li>";
+            return "<li class='page-item disabled'><span class='page-link'>1页{$this->TotalResult}条</span></li>";
         }
         if ($this->TotalResult == 0) {
-            return "<li class='page-item disabled'><span class='page-link'>0页".$this->TotalResult."条</span></li>";
+            return "<li class='page-item disabled'><span class='page-link'>0页{$this->TotalResult}条</span></li>";
         }
         $purl = $this->GetCurUrl();
         //开启伪静态对规则替换
@@ -973,19 +973,19 @@ class SgListView
             $nowurls = explode("?", $nowurls);
             $purl = $nowurls[0];
         }
-        $geturl = "tid=".$this->TypeID."&TotalResult=".$this->TotalResult."&";
+        $geturl = "tid={$this->TypeID}&TotalResult={$this->TotalResult}&";
         $purl .= '?'.$geturl;
         $optionlist = '';
         //获得上页和下页的链接
         if ($this->PageNo != 1) {
-            $prepage .= "<li class='page-item'><a href='".$purl."PageNo=".$prepagenum."' class='page-link'>上页</a></li>";
-            $indexpage = "<li class='page-item'><a href='".$purl."PageNo=1' class='page-link'>首页</a></li>";
+            $prepage .= "<li class='page-item'><a href='{$purl}PageNo={$prepagenum}' class='page-link'>上页</a></li>";
+            $indexpage = "<li class='page-item'><a href='{$purl}PageNo=1' class='page-link'>首页</a></li>";
         } else {
             $indexpage = "<li class='page-item'><span class='page-link'>首页</span></li>";
         }
         if ($this->PageNo != $totalpage && $totalpage > 1) {
-            $nextpage .= "<li class='page-item'><a href='".$purl."PageNo=".$nextpagenum."' class='page-link'>下页</a></li>";
-            $endpage = "<li class='page-item'><a href='".$purl."PageNo=".$totalpage."' class='page-link'>末页</a></li>";
+            $nextpage .= "<li class='page-item'><a href='{$purl}PageNo={$nextpagenum}' class='page-link'>下页</a></li>";
+            $endpage = "<li class='page-item'><a href='{$purl}PageNo={$totalpage}' class='page-link'>末页</a></li>";
         } else {
             $endpage = "<li class='page-item'><span class='page-link'>末页</span></li>";
         }
@@ -1006,9 +1006,9 @@ class SgListView
         }
         for ($j; $j <= $total_list; $j++) {
             if ($j == $this->PageNo) {
-                $listdd .= "<li class='page-item active'><span class='page-link'>$j</span></li>";
+                $listdd .= "<li class='page-item active'><span class='page-link'>{$j}</span></li>";
             } else {
-                $listdd .= "<li class='page-item'><a href='".$purl."PageNo=".$j."' class='page-link'>$j</a></li>";
+                $listdd .= "<li class='page-item'><a href='{$purl}PageNo={$j}' class='page-link'>{$j}</a></li>";
             }
         }
         $plist = '';
diff --git a/src/system/archive/specview.class.php b/src/system/archive/specview.class.php
index 847f402e..9d2da810 100755
--- a/src/system/archive/specview.class.php
+++ b/src/system/archive/specview.class.php
@@ -437,23 +437,23 @@ class SpecView
         }
         $totalpage = ceil($this->TotalResult / $this->pagesize);
         if ($totalpage <= 1 && $this->TotalResult > 0) {
-            return "<li class='page-item disabled'><span class='page-link'>1页".$this->TotalResult."条</span></li>";
+            return "<li class='page-item disabled'><span class='page-link'>1页{$this->TotalResult}条</span></li>";
         }
         if ($this->TotalResult == 0) {
-            return "<li class='page-item disabled'><span class='page-link'>0页".$this->TotalResult."条</span></li>";
+            return "<li class='page-item disabled'><span class='page-link'>0页{$this->TotalResult}条</span></li>";
         }
         $purl = $this->GetCurUrl();
         $tnamerule = "spec_";
         //获得上页和下页的链接
         if ($this->PageNo != 1) {
-            $prepage .= "<li class='page-item'><a href='".$tnamerule."$prepagenum".$GLOBALS['art_shortname']."' class='page-link'>上页</a></li>";
-            $indexpage = "<li class='page-item'><a href='".$tnamerule."1".$GLOBALS['art_shortname']."' class='page-link'>首页</a></li>";
+            $prepage .= "<li class='page-item'><a href='{$tnamerule}{$prepagenum}".$GLOBALS['art_shortname']."' class='page-link'>上页</a></li>";
+            $indexpage = "<li class='page-item'><a href='{$tnamerule}1".$GLOBALS['art_shortname']."' class='page-link'>首页</a></li>";
         } else {
             $indexpage = "<li class='page-item'><span class='page-link'>首页</span></li>";
         }
         if ($this->PageNo != $totalpage && $totalpage > 1) {
-            $nextpage .= "<li class='page-item'><a href='".$tnamerule."$nextpagenum".$GLOBALS['art_shortname']."'>下页</a></li>";
-            $endpage = "<li class='page-item'><a href='".$tnamerule."$totalpage".$GLOBALS['art_shortname']."'>末页</a></li>";
+            $nextpage .= "<li class='page-item'><a href='{$tnamerule}{$nextpagenum}".$GLOBALS['art_shortname']."'>下页</a></li>";
+            $endpage = "<li class='page-item'><a href='{$tnamerule}{$totalpage}".$GLOBALS['art_shortname']."'>末页</a></li>";
         } else {
             $endpage = "<li class='page-item'><span class='page-link'>末页</span></li>";
         }
@@ -474,9 +474,9 @@ class SpecView
         }
         for ($j; $j <= $total_list; $j++) {
             if ($j == $this->PageNo) {
-                $listdd .= "<li class='page-item active'><span class='page-link'>$j</span></li>";
+                $listdd .= "<li class='page-item active'><span class='page-link'>{$j}</span></li>";
             } else {
-                $listdd .= "<li class='page-item'><a href='".$tnamerule."$j".$GLOBALS['art_shortname']."'class='page-link'>$j</a></li>";
+                $listdd .= "<li class='page-item'><a href='{$tnamerule}{$j}".$GLOBALS['art_shortname']."'class='page-link'>{$j}</a></li>";
             }
         }
         $plist = $indexpage.$prepage.$listdd.$nextpage.$endpage;
@@ -501,26 +501,26 @@ class SpecView
         }
         $totalpage = ceil($this->TotalResult / $this->pagesize);
         if ($totalpage <= 1 && $this->TotalResult > 0) {
-            return "<li class='page-item disabled'><span class='page-link'>1页".$this->TotalResult."条</span></li>";
+            return "<li class='page-item disabled'><span class='page-link'>1页{$this->TotalResult}条</span></li>";
         }
         if ($this->TotalResult == 0) {
-            return "<li class='page-item disabled'><span class='page-link'>0页".$this->TotalResult."条</span></li>";
+            return "<li class='page-item disabled'><span class='page-link'>0页{$this->TotalResult}条</span></li>";
         }
         $purl = $this->GetCurUrl();
         $geturl = "typeid=".$this->TypeID."&TotalResult=".$this->TotalResult."&";
-        $hidenform = "<input type='hidden' name='typeid' value='".$this->TypeID."'>";
-        $hidenform .= "<input type='hidden' name='TotalResult' value='".$this->TotalResult."'>";
+        //$hidenform = "<input type='hidden' name='typeid' value='".$this->TypeID."'>";
+        //$hidenform .= "<input type='hidden' name='TotalResult' value='".$this->TotalResult."'>";
         $purl .= "?".$geturl;
         //获得上页和下页的链接
         if ($this->PageNo != 1) {
-            $prepage .= "<li class='page-item'><a href='".$purl."PageNo=$prepagenum' class='page-link'>上页</a></li>";
-            $indexpage = "<li class='page-item'><a href='".$purl."PageNo=1' class='page-link'>首页</a></li>";
+            $prepage .= "<li class='page-item'><a href='{$purl}PageNo={$prepagenum}' class='page-link'>上页</a></li>";
+            $indexpage = "<li class='page-item'><a href='{$purl}PageNo=1' class='page-link'>首页</a></li>";
         } else {
             $indexpage = "<li class='page-item'><span class='page-link'>首页</span></li>";
         }
         if ($this->PageNo != $totalpage && $totalpage > 1) {
-            $nextpage .= "<li class='page-item'><a href='".$purl."PageNo=$nextpagenum' class='page-link'>下页</a></li>";
-            $endpage = "<li class='page-item'><a href='".$purl."PageNo=$totalpage' class='page-link'>末页</a></li>";
+            $nextpage .= "<li class='page-item'><a href='{$purl}PageNo={$nextpagenum}' class='page-link'>下页</a></li>";
+            $endpage = "<li class='page-item'><a href='{$purl}PageNo={$totalpage}' class='page-link'>末页</a></li>";
         } else {
             $endpage = "<li class='page-item'><span class='page-link'>末页</span></li>";
         }
@@ -541,9 +541,9 @@ class SpecView
         }
         for ($j; $j <= $total_list; $j++) {
             if ($j == $this->PageNo) {
-                $listdd .= "<li class='page-item active'><span class='page-link'>$j</span></li>";
+                $listdd .= "<li class='page-item active'><span class='page-link'>{$j}</span></li>";
             } else {
-                $listdd .= "<li class='page-item'><a href='".$purl."PageNo=$j'class='page-link'>$j</a></li>";
+                $listdd .= "<li class='page-item'><a href='{$purl}PageNo={$j}' class='page-link'>{$j}</a></li>";
             }
         }
         $plist = $indexpage.$prepage.$listdd.$nextpage.$endpage;
diff --git a/src/system/archive/taglist.class.php b/src/system/archive/taglist.class.php
index ff06cfc3..f3d4a248 100755
--- a/src/system/archive/taglist.class.php
+++ b/src/system/archive/taglist.class.php
@@ -411,23 +411,23 @@ class TagList
         }
         $totalpage = $this->TotalPage;
         if ($totalpage <= 1 && $this->TotalResult > 0) {
-            return "<li class='page-item disabled'><span class='page-link'>1页".$this->TotalResult."条</span></li>";
+            return "<li class='page-item disabled'><span class='page-link'>1页{$this->TotalResult}条</span></li>";
         }
         if ($this->TotalResult == 0) {
-            return "<li class='page-item disabled'><span class='page-link'>0页".$this->TotalResult."条</span></li>";
+            return "<li class='page-item disabled'><span class='page-link'>0页{$this->TotalResult}条</span></li>";
         }
-        $maininfo = "<li class='page-item disabled'><span class='page-link'>{$totalpage}页".$this->TotalResult."条</span></li>";
+        $maininfo = "<li class='page-item disabled'><span class='page-link'>{$totalpage}页{$this->TotalResult}条</span></li>";
         $purl = $this->tagsDir.'/'.$this->TagInfos['id'];
         //获得上页和下页的链接
         if ($this->PageNo != 1) {
-            $prepage .= "<li class='page-item'><a href='".$purl."/$prepagenum/' class='page-link'>上页</a></li>";
-            $indexpage = "<li class='page-item'><a href='".$purl."/1/' class='page-link'>首页</a></li>";
+            $prepage .= "<li class='page-item'><a href='{$purl}/{$prepagenum}/' class='page-link'>上页</a></li>";
+            $indexpage = "<li class='page-item'><a href='{$purl}/1/' class='page-link'>首页</a></li>";
         } else {
             $indexpage = "<li class='page-item'><span class='page-link'>首页</span></li>";
         }
         if ($this->PageNo != $totalpage && $totalpage > 1) {
-            $nextpage .= "<li class='page-item'><a href='".$purl."/$nextpagenum/' class='page-link'>下页</a></li>";
-            $endpage = "<li class='page-item'><a href='".$purl."/$totalpage/' class='page-link'>末页</a></li>";
+            $nextpage .= "<li class='page-item'><a href='{$purl}/{$nextpagenum}/' class='page-link'>下页</a></li>";
+            $endpage = "<li class='page-item'><a href='{$purl}/{$totalpage}/' class='page-link'>末页</a></li>";
         } else {
             $endpage = "<li class='page-item'><span class='page-link'>末页</span></li>";
         }
@@ -540,26 +540,26 @@ class TagList
         }
         $totalpage = $this->TotalPage;
         if ($totalpage <= 1 && $this->TotalResult > 0) {
-            return "<li class='page-item disabled'><span class='page-link'>1页".$this->TotalResult."条</span></li>";
+            return "<li class='page-item disabled'><span class='page-link'>1页{$this->TotalResult}条</span></li>";
         }
         if ($this->TotalResult == 0) {
-            return "<li class='page-item disabled'><span class='page-link'>0页".$this->TotalResult."条</span></li>";
+            return "<li class='page-item disabled'><span class='page-link'>0页{$this->TotalResult}条</span></li>";
         }
-        $maininfo = "<li class='page-item disabled'><span class='page-link'>{$totalpage}页".$this->TotalResult."条</span></li>";
+        $maininfo = "<li class='page-item disabled'><span class='page-link'>{$totalpage}页{$this->TotalResult}条</span></li>";
         $purl = $this->GetCurUrl();
         //开启伪静态对规则替换
         if ($cfg_rewrite == 'Y') $purl = "/tags/";
         $purl .= "?/".urlencode($this->Tag);
         //获得上页和下页的链接
         if ($this->PageNo != 1) {
-            $prepage .= "<li class='page-item'><a href='".$purl."/$prepagenum' class='page-link'>上页</a></li>";
-            $indexpage = "<li class='page-item'><a href='".$purl."/1' class='page-link'>首页</a></li>";
+            $prepage .= "<li class='page-item'><a href='{$purl}/{$prepagenum}' class='page-link'>上页</a></li>";
+            $indexpage = "<li class='page-item'><a href='{$purl}/1' class='page-link'>首页</a></li>";
         } else {
             $indexpage = "<li class='page-item'><span class='page-link'>首页</span></li>";
         }
         if ($this->PageNo != $totalpage && $totalpage > 1) {
-            $nextpage .= "<li class='page-item'><a href='".$purl."/$nextpagenum' class='page-link'>下页</a></li>";
-            $endpage = "<li class='page-item'><a href='".$purl."/$totalpage' class='page-link'>末页</a></li>";
+            $nextpage .= "<li class='page-item'><a href='{$purl}/{$nextpagenum}' class='page-link'>下页</a></li>";
+            $endpage = "<li class='page-item'><a href='{$purl}/{$totalpage}' class='page-link'>末页</a></li>";
         } else {
             $endpage = "<li class='page-item'><span class='page-link'>末页</span></li>";
         }
@@ -580,9 +580,9 @@ class TagList
         }
         for ($j; $j <= $total_list; $j++) {
             if ($j == $this->PageNo) {
-                $listdd .= "<li class='page-item active'><span class='page-link'>$j</span></li>";
+                $listdd .= "<li class='page-item active'><span class='page-link'>{$j}</span></li>";
             } else {
-                $listdd .= "<li class='page-item'><a href='".$purl."/$j' class='page-link'>$j</a></li>";
+                $listdd .= "<li class='page-item'><a href='{$purl}/{$j}' class='page-link'>{$j}</a></li>";
             }
         }
         $plist = '';