diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css
index f592a82d..6ab69f6f 100644
--- a/src/static/web/css/admin.css
+++ b/src/static/web/css/admin.css
@@ -739,6 +739,14 @@ input,select,textarea,.colordlg,.pubdlg,.quickselitem .topcat,.mysource,.mywrite
 	border-top-right-radius:0!important;
 	border-bottom-right-radius:0!important
 }
+.page-item:first-child .page-link {
+	border-top-left-radius:var(--b-radius);
+	border-bottom-left-radius:var(--b-radius)
+}
+.page-item:last-child .page-link {
+	border-top-right-radius:var(--b-radius);
+	border-bottom-right-radius:var(--b-radius)
+}
 .nav-pills .nav-link.active,.nav-pills .show>.nav-link {
 	background:var(--green)
 }
diff --git a/src/system/archive/archives.class.php b/src/system/archive/archives.class.php
index 2c113e4c..c0bcf0fd 100755
--- a/src/system/archive/archives.class.php
+++ b/src/system/archive/archives.class.php
@@ -859,7 +859,7 @@ 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>";
                     }
@@ -868,7 +868,7 @@ class Archives
                         $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>";
                         }
@@ -882,20 +882,20 @@ 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>";
                     }
                 } 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>";
                         }
                     } 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>";
                         }
@@ -930,13 +930,13 @@ class Archives
         } 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>";
                 }
             } 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>";
                 }
@@ -946,7 +946,7 @@ class Archives
             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>";
+                        $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>";
                     }
@@ -957,7 +957,7 @@ class Archives
                 $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>";
+                        $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>";
                     }
@@ -968,7 +968,7 @@ class Archives
         }
         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>";
             }
diff --git a/src/system/datalistcp.class.php b/src/system/datalistcp.class.php
index 91e74138..07564f32 100755
--- a/src/system/datalistcp.class.php
+++ b/src/system/datalistcp.class.php
@@ -105,6 +105,10 @@ class DataListCP
         }
         $this->pageNO = $pageno;
         $this->totalResult = $totalresult;
+        if (isset($GLOBALS['pagesize'])) {
+            $this->pagesize = $GLOBALS['pagesize'];
+            $this->SetParameter('pagesize', $this->pagesize);
+        }
         if (isset($this->tpl->tpCfgs['pagesize'])) {
             $this->pagesize = $this->tpl->tpCfgs['pagesize'];
         }
@@ -178,10 +182,10 @@ class DataListCP
         $prepagenum = $this->pageNO - 1;
         $nextpagenum = $this->pageNO + 1;
         if (!isset($atts['listsize']) || preg_match("#[^0-9]#", $atts['listsize'])) {
-            $atts['listsize'] = 5;
+            $atts['listsize'] = 6;
         }
         if (!isset($atts['listitem'])) {
-            $atts['listitem'] = "info,index,end,pre,next,pageno";
+            $atts['listitem'] = "pagesize,info,index,end,pre,next,pageno";
         }
         $totalpage = ceil($this->totalResult / $this->pagesize);
         //echo " {$totalpage}=={$this->totalResult}=={$this->pagesize}";
@@ -200,22 +204,22 @@ class DataListCP
             foreach ($this->getValues as $key => $value) {
                 $value = urlencode($value);
                 $geturl .= "$key=$value"."&";
-                $hidenform .= "<input type='hidden' name='$key' value='$value' />\n";
+                $hidenform .= "<input type='hidden' name='$key' value='$value'>\r\n";
             }
         }
         $purl .= "?".$geturl;
         //获得上页和下页的链接
         if ($this->pageNO != 1) {
-            $prepage .= "<li class='page-item'><a class='page-link' href='".$purl."pageno=$prepagenum'>$lang_pre_page</a></li> \n";
-            $indexpage = "<li class='page-item'><a class='page-link' href='".$purl."pageno=1'>$lang_index_page</a></li> \n";
+            $prepage .= "<li class='page-item'><a class='page-link' href='".$purl."pageno=$prepagenum'>$lang_pre_page</a></li>\r\n";
+            $indexpage = "<li class='page-item'><a class='page-link' href='".$purl."pageno=1'>$lang_index_page</a></li>\r\n";
         } else {
             $indexpage = "<li class='page-item disabled'><span class='page-link'>"."$lang_index_page \n"."</span></li>";
         }
         if ($this->pageNO != $totalpage && $totalpage > 1) {
-            $nextpage .= "<li class='page-item'><a class='page-link' href='".$purl."pageno=$nextpagenum'>$lang_next_page</a></li> \n";
-            $endpage = "<li class='page-item'><a class='page-link' href='".$purl."pageno=$totalpage'>$lang_end_page</a></li> \n";
+            $nextpage .= "<li class='page-item'><a class='page-link' href='".$purl."pageno=$nextpagenum'>$lang_next_page</a></li>\r\n";
+            $endpage = "<li class='page-item'><a class='page-link' href='".$purl."pageno=$totalpage'>$lang_end_page</a></li>\r\n";
         } else {
-            $endpage = " <li class='page-item disabled'><span class='page-link'>$lang_end_page</span></li> \n";
+            $endpage = " <li class='page-item disabled'><span class='page-link'>$lang_end_page</span></li>\r\n";
         }
         //获得数字链接
         $listdd = '';
@@ -233,10 +237,25 @@ class DataListCP
             }
         }
         for ($j; $j <= $total_list; $j++) {
-            $listdd .= $j == $this->pageNO ? "<li class='page-item'><span class='page-link'>$j</span></li>\r\n" : "<li class='page-item'><a class='page-link' href='".$purl."pageno=$j'>".$j."</a></li>\n";
+            $listdd .= $j == $this->pageNO ? "<li class='page-item'><span class='page-link'>$j</span></li>\r\n" : "<li class='page-item'><a class='page-link' href='".$purl."pageno=$j'>".$j."</a></li>\r\n";
         }
-        $plist = "<ul class='pagination justify-content-center'>\n";
+        $plist = "<div class='d-flex justify-content-center'>\r\n";
+        $sizesel = "<select name='pagesize' id='dedepagesize' class='form-control admin-input-sm mr-2'>\r\n";
+        $sizesel .= "<option value='30' ".($this->pagesize == 30 ? "selected='selected'" : "").">30条/页</option>\r\n";
+        $sizesel .= "<option value='50' ".($this->pagesize == 50 ? "selected='selected'" : "").">50条/页</option>\r\n";
+        $sizesel .= "<option value='100' ".($this->pagesize == 100 ? "selected='selected'" : "").">100条/页</option>\r\n";
+        $sizesel .= "<option value='500' ".($this->pagesize == 500 ? "selected='selected'" : "").">500条/页</option>\r\n";
+        $sizesel .= "<option value='1000' ".($this->pagesize == 1000 ? "selected='selected'" : "").">1000条/页</option>\r\n";
+        $sizesel .= "</select><script>document.addEventListener('DOMContentLoaded', function() {var selectElement = document.getElementById('dedepagesize');
+        selectElement.addEventListener('change', function() {var selectedSize = this.value; //获取选中的分页大小
+        var url = new URL(window.location.href); //获取当前链接
+        url.searchParams.set('pagesize', selectedSize); //更新分页参数
+        window.location.href = url.toString(); //重新加载页面
+        });});</script><ul class='pagination'>\r\n";
         //info,index,end,pre,next,pageno,form
+        if (preg_match("#pagesize#i", $atts['listitem'])) {
+            $plist .= $sizesel;
+        }
         if (preg_match("#info#i", $atts['listitem'])) {
             $plist .= $infos;
         }
@@ -256,14 +275,14 @@ class DataListCP
             $plist .= $endpage;
         }
         if (preg_match("#form#i", $atts['listitem'])) {
-            $plist .= " <form name='pagelist' action='".$this->GetCurUrl()."'>$hidenform";
+            $plist .= "<li class='page-item'><form name='pagelist' action='".$this->GetCurUrl()."'>$hidenform";
             if ($totalpage > $total_list) {
-                $plist .= "<input type='text' name='pageno'>\r\n";
-                $plist .= "<input type='submit' name='plistgo' value='GO'>\r\n";
+                $plist .= "<input style='width:80px' class='admin-input-lg' type='text' name='pageno'>\r\n";
+                $plist .= "<input class='btn btn-success' type='submit' name='plistgo' value='跳转'>\r\n";
             }
-            $plist .= "</form>\n";
+            $plist .= "</form></li>\r\n";
         }
-        $plist .= "</ul>\n";
+        $plist .= "</ul></div>\r\n";
         return $plist;
     }
     //获得当前网址