From 1ab359a25a2d7ff05411c81e7254159c2077507c Mon Sep 17 00:00:00 2001
From: Devil <fuxiang.gong@qq.com>
Date: Sun, 29 Nov 2020 17:40:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E7=BB=84=E4=BB=B6=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=87=AA=E5=AE=9A=E4=B9=89=E9=A1=B5=E7=A0=81=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 changelog.txt                       |  1 +
 extend/base/Page.php                | 22 +++++++++++++---------
 public/static/common/css/common.css |  8 ++++++++
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index e93bfc1e4..12c4b8b02 100755
--- a/changelog.txt
+++ b/changelog.txt
@@ -12,6 +12,7 @@ web端
 	2. 分类管理组件优化、支持异步无刷新操作
 	3. 顶部小导航/logo位置新增钩
 	4. 新增商品参数模板管理、配置商品直接选择模板载入
+	5. 分页组件新增自定义页码跳转
 
 小程序
 	1. 支付订单0金额错误修复
diff --git a/extend/base/Page.php b/extend/base/Page.php
index c7b3b2590..72ff501bd 100755
--- a/extend/base/Page.php
+++ b/extend/base/Page.php
@@ -27,7 +27,7 @@ class Page
 	private $page_total;
 	private $url;
 	private $html;
-	private $page_start_tag;
+	private $page_join;
 
 	/**
 	 * [__construct description]
@@ -84,9 +84,9 @@ class Page
 					}
 				}
 			}
-			$this->page_start_tag = ($tmp == false) ? '&' : (($state === false) ? '?' : '&');
+			$this->page_join = ($tmp == false) ? '&' : (($state === false) ? '?' : '&');
 		} else {
-			$this->page_start_tag = ($state === false) ? '?' : '&';
+			$this->page_join = ($state === false) ? '?' : '&';
 		}
 	}
 
@@ -100,23 +100,27 @@ class Page
 
 		$this->html .= '<ul class="am-pagination am-pagination-centered">';
 		$this->html .= '<li '.$before_disabled.'>';
-		$this->html .= '<a href="'.$this->url.$this->page_start_tag.'page=1" class="am-radius am-icon-angle-double-left"></a>';
+		$this->html .= '<a href="'.$this->url.$this->page_join.'page=1" class="am-radius am-icon-angle-double-left"></a>';
 		$this->html .= '</li>';
 
 		$this->html .= '<li '.$before_disabled.'>';
-		$this->html .= '<a href="'.$this->url.$this->page_start_tag.'page='.($this->page-1).'" class="am-radius am-icon-angle-left"></a>';
+		$this->html .= '<a href="'.$this->url.$this->page_join.'page='.($this->page-1).'" class="am-radius am-icon-angle-left"></a>';
 		$this->html .= '</li>';
 
 		$this->html .= $this->GetButtonNumberHtml();
 
 		$this->html .= '<li '.$after_disabled.'>';
-		$this->html .= '<a href="'.$this->url.$this->page_start_tag.'page='.($this->page+1).'" class="am-radius am-icon-angle-right"></a>';
+		$this->html .= '<a href="'.$this->url.$this->page_join.'page='.($this->page+1).'" class="am-radius am-icon-angle-right"></a>';
 		$this->html .= '</li>';
 
 		$this->html .= '<li '.$after_disabled.'>';
-		$this->html .= '<a href="'.$this->url.$this->page_start_tag.'page='.$this->page_total.'" class="am-radius am-icon-angle-double-right"></a>';
+		$this->html .= '<a href="'.$this->url.$this->page_join.'page='.$this->page_total.'" class="am-radius am-icon-angle-double-right"></a>';
 		$this->html .= '</li>';
 
+		$this->html .= '&nbsp;&nbsp;&nbsp;<span>跳转到</span>';
+		$this->html .= '<input type="text" min="1" class="am-form-field am-inline-block am-text-center am-margin-horizontal-xs pagination-input" value="'.$this->page.'" onchange="window.location.href=\''.$this->url.$this->page_join.'page=\'+(isNaN(parseInt(this.value)) ? 1 : parseInt(this.value) || 1);" onclick="this.select()" />';
+		$this->html .= '<span>页</span>';
+
 		$this->html .= '<div>';
 		$this->html .= '<span>共 '.$this->total.' 条数据</span>';
 		$this->html .= '&nbsp;&nbsp;&nbsp;<span>共 '.$this->page_total.' 页</span>';
@@ -143,7 +147,7 @@ class Page
 				$total = ($this->page-$this->bt_number < 1) ? 1 : $this->page-$this->bt_number;
 				for($i=$this->page-1; $i>=$total; $i--)
 				{
-					$html_before = '<li><a href="'.$this->url.$this->page_start_tag.'page='.$i.'" class="am-radius">'.$i.'</a></li>'.$html_before;
+					$html_before = '<li><a href="'.$this->url.$this->page_join.'page='.$i.'" class="am-radius">'.$i.'</a></li>'.$html_before;
 				}
 			}
 
@@ -153,7 +157,7 @@ class Page
 				$total = ($this->page+$this->bt_number > $this->page_total) ? $this->page_total : $this->page+$this->bt_number;
 				for($i=$this->page+1; $i<=$total; $i++)
 				{
-					$html_after .= '<li><a href="'.$this->url.$this->page_start_tag.'page='.$i.'" class="am-radius">'.$i.'</a></li>';
+					$html_after .= '<li><a href="'.$this->url.$this->page_join.'page='.$i.'" class="am-radius">'.$i.'</a></li>';
 				}
 			}
 		}
diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css
index ad7cead17..d5ae015e1 100755
--- a/public/static/common/css/common.css
+++ b/public/static/common/css/common.css
@@ -749,4 +749,12 @@ button.colorpicker-submit img {
     border: 1px solid #dd514c;
     background: transparent;
     color: #dd514c;
+}
+
+/**
+ * 分页
+ */
+.pagination-input {
+    width: 50px;
+    vertical-align: inherit !important;
 }
\ No newline at end of file
-- 
GitLab