From dc3d238d12cb3aed2c5ac552c16733767a1029b5 Mon Sep 17 00:00:00 2001
From: tianya <tianya@imcollege.cn>
Date: Fri, 25 Sep 2020 10:25:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=87=AA=E7=94=B1=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/dede/templets/stepselect_main.htm     |  4 +--
 src/dede/templets/stepselect_showajax.htm |  4 +--
 src/include/arc.freelist.class.php        | 40 +++++++++++------------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/dede/templets/stepselect_main.htm b/src/dede/templets/stepselect_main.htm
index 47279186..a6ce00c0 100755
--- a/src/dede/templets/stepselect_main.htm
+++ b/src/dede/templets/stepselect_main.htm
@@ -402,8 +402,8 @@ else
                     case 2:
                         echo "三级选择";
                         break;
-                }
-        ?>
+                        }
+                ?>
             </td>
             <td> {dede:field.issystem function="@me==1 ? '是' : '否'" /} </td>
             <td>{dede:field.egroup /}</td>
diff --git a/src/dede/templets/stepselect_showajax.htm b/src/dede/templets/stepselect_showajax.htm
index f1663835..320a05c4 100755
--- a/src/dede/templets/stepselect_showajax.htm
+++ b/src/dede/templets/stepselect_showajax.htm
@@ -14,7 +14,7 @@ if($arr['issystem']==0) $sbjs = '';
 <div>类 别 名：<INPUT TYPE="text" NAME="itemname" class="iptxt" style='width:180px' value="<?php echo $arr['itemname']; ?>" /></div>
 <div>缓存组名：<INPUT TYPE="text" NAME="egroup" class="iptxt" style='width:180px' value="<?php echo $arr['egroup']; ?>" /></div>
 <div>缓存组名必须为英文或数字组合!</div>
-<div><INPUT TYPE="submit" value="确定修改" class="np coolbg"/></div>
+<div><button TYPE="submit" class="btn btn-secondary btn-sm">确定增加</button></div>
 </form>
 <?php
 } else if($action=='addnew') {
@@ -28,7 +28,7 @@ if($arr['issystem']==0) $sbjs = '';
 <div>类 别 名：<INPUT TYPE="text" NAME="itemname" class="iptxt" style='width:180px' /></div>
 <div>缓存组名：<INPUT TYPE="text" NAME="egroup" class="iptxt" style='width:180px' /></div>
 <div>缓存组名必须为英文或数字组合!</div>
-<div><INPUT TYPE="submit" value="确定增加" class="np coolbg"/></div>
+<div><button TYPE="submit" class="btn btn-secondary btn-sm">确定增加</button></div>
 </form>
 <?php
 } else if($action=='addenum') {
diff --git a/src/include/arc.freelist.class.php b/src/include/arc.freelist.class.php
index 3055ef93..8c028c29 100755
--- a/src/include/arc.freelist.class.php
+++ b/src/include/arc.freelist.class.php
@@ -794,13 +794,13 @@ class FreeList
         $totalpage = ceil($this->TotalResult/$this->PageSize);
         if($totalpage <= 1 && $this->TotalResult > 0)
         {
-            return "共1页/".$this->TotalResult."条记录";
+            return "<li class='page-item d-none d-sm-block disabled'><span class=\"page-link\">共1页/".$this->TotalResult."条记录</span></li>";
         }
         if($this->TotalResult == 0)
         {
-            return "共0页/".$this->TotalResult."条记录";
+            return "<li class='page-item d-none d-sm-block disabled'><span class=\"page-link\">共0页/".$this->TotalResult."条记录</span></li>";
         }
-        $maininfo = " 共{$totalpage}页/".$this->TotalResult."条记录 ";
+        $maininfo = "<li class='page-item d-none d-sm-block disabled'><span class=\"page-link\">共{$totalpage}页/".$this->TotalResult."条记录</span></li>";
         $purl = $this->GetCurUrl();
         $tnamerule = $this->GetMakeFileRule();
         $tnamerule = preg_replace("#^(.*)\/#", '', $tnamerule);
@@ -809,12 +809,12 @@ class FreeList
         //获得上一页和主页的链接
         if($this->PageNo != 1)
         {
-            $prepage.="<a href='".str_replace("{page}", $prepagenum, $tnamerule)."'>上一页</a>\r\n";
-            $indexpage="<a href='".str_replace("{page}", 1, $tnamerule)."'>首页</a>\r\n";
+            $prepage.="<li class='page-item'><a class='page-link' href='".str_replace("{page}", $prepagenum, $tnamerule)."'>上一页</a></li>\r\n";
+            $indexpage="<li class='page-item'><a class='page-link' href='".str_replace("{page}", 1, $tnamerule)."'>首页</a></li>\r\n";
         }
         else
         {
-            $indexpage="<a href='#'>首页</a>\r\n";
+            $indexpage="<li class='page-item'><span class='page-link'>首页</span></li>\r\n";
         }
 
         //下一页,未页的链接
@@ -825,7 +825,7 @@ class FreeList
         }
         else
         {
-            $endpage="<a href='#'>末页</a>\r\n";
+            $endpage="<li class='page-item'><span class='page-link'>末页</span></li>\r\n";
         }
 
         //option链接
@@ -870,11 +870,11 @@ class FreeList
         {
             if($j==$this->PageNo)
             {
-                $listdd.= "<strong>{$j}</strong>\r\n";
+                $listdd.= "<li class=\"page-item active\"><span class='page-link'>{$j}</span></li>\r\n";
             }
             else
             {
-                $listdd.="<a href='".str_replace("{page}", $j, $tnamerule)."'>".$j."</a>\r\n";
+                $listdd.="<li class='page-item'><a class='page-link' href='".str_replace("{page}", $j, $tnamerule)."'>".$j."</a></li>\r\n";
             }
         }
         $plist = "";
@@ -930,13 +930,13 @@ class FreeList
         $totalpage = ceil($this->TotalResult/$this->PageSize);
         if($totalpage<=1 && $this->TotalResult>0)
         {
-            return "共1页/".$this->TotalResult."条记录";
+            return "<li class='page-item d-none d-sm-block disabled'><span class=\"page-link\">共1页/".$this->TotalResult."条记录</span></li>";
         }
         if($this->TotalResult == 0)
         {
-            return "共0页/".$this->TotalResult."条记录";
+            return "<li class='page-item d-none d-sm-block disabled'><span class=\"page-link\">共0页/".$this->TotalResult."条记录</span></li>";
         }
-        $maininfo = "共{$totalpage}页/".$this->TotalResult."条记录";
+        $maininfo = "<li class='page-item d-none d-sm-block 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."' />\r\n";
@@ -946,21 +946,21 @@ class FreeList
         //获得上一页和下一页的链接
         if($this->PageNo != 1)
         {
-            $prepage.="<a href='".$purl."PageNo=$prepagenum'>上一页</a>\r\n";
-            $indexpage="<a href='".$purl."PageNo=1'>首页</a>\r\n";
+            $prepage.="<li class='page-item'><a class='page-link' href='".$purl."PageNo=$prepagenum'>上一页</a>\r\n";
+            $indexpage="<li class='page-item'><a class='page-link' href='".$purl."PageNo=1'>首页</a>\r\n";
         }
         else
         {
-            $indexpage="<a href='#'>首页</a>\r\n";
+            $indexpage="<li class='page-item'><span class='page-link'>首页</span></li>\r\n";
         }
         if($this->PageNo!=$totalpage && $totalpage>1)
         {
-            $nextpage.="<a href='".$purl."PageNo=$nextpagenum'>下一页</a>\r\n";
-            $endpage="<a href='".$purl."PageNo=$totalpage'>末页</a>\r\n";
+            $nextpage.="<li class='page-item'><a class='page-link' href='".$purl."PageNo=$nextpagenum'>下一页</a>\r\n";
+            $endpage="<li class='page-item'><a class='page-link' href='".$purl."PageNo=$totalpage'>末页</a>\r\n";
         }
         else
         {
-            $endpage="<a href='#'>末页</a>\r\n";
+            $endpage="<li class='page-item'><span class='page-link'>末页</span></li>\r\n";
         }
 
         //获得数字链接
@@ -981,11 +981,11 @@ class FreeList
         {
             if($j==$this->PageNo)
             {
-                $listdd.= "<a href='#'>.$j.</a>\r\n";
+                $listdd.= "<li class=\"page-item active\"><span class='page-link'>$j</span></li>\r\n";
             }
             else
             {
-                $listdd.="<a href='".$purl."PageNo=$j'>".$j."</a>\r\n";
+                $listdd.="<li class='page-item'><a class='page-link' href='".$purl."PageNo=$j'>".$j."</a></li>\r\n";
             }
         }
         $plist  = "<form name='pagelist' action='".$this->GetCurUrl()."'>$hidenform";