From 5858fc3e25f68dd33abbfed0701e218695c3c555 Mon Sep 17 00:00:00 2001
From: Terry <2358269014@qq.com>
Date: Mon, 11 Nov 2019 14:38:17 +0800
Subject: [PATCH] apphtml5 pages

---
 .../theme/base/html5/widgets/page.php         | 16 ++++-----
 app/apphtml5/widgets/Page.php                 | 33 +++++++++++--------
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/app/apphtml5/theme/base/html5/widgets/page.php b/app/apphtml5/theme/base/html5/widgets/page.php
index 01145cf6..6ba78f8d 100644
--- a/app/apphtml5/theme/base/html5/widgets/page.php
+++ b/app/apphtml5/theme/base/html5/widgets/page.php
@@ -9,36 +9,36 @@
 ?>
 <div class="tb_rg">
 	<?php  if($prevPage):  ?>
-		<a external href="<?= $prevPage['url']['url'] ?>"><</a>
+		<a href="<?= $prevPage['url']['url'] ?>"><</a>
 	<?php else:  ?>
 		<span><</span>
 	<?php endif;  ?>	
 	<?php if($firstSpaceShow):  ?>
-		<a external href="<?= $firstSpaceShow['url']['url'] ?>"><?= $firstSpaceShow['p'] ?></a>
+		<a href="<?= $firstSpaceShow['url']['url'] ?>"><?= $firstSpaceShow[$pageParam] ?></a>
 	<?php endif;  ?>	
 	<?= $hiddenFrontStr ?>		
 	<?php  if(!empty($frontPage )): ?>
 		<?php foreach($frontPage as $page): ?>
-			<a external href="<?= $page['url']['url'] ?>"><?= $page['p'] ?></a>
+			<a href="<?= $page['url']['url'] ?>"><?= $page[$pageParam] ?></a>
 		<?php endforeach;  ?>	
 	<?php endif;  ?>	
 	
 	<?php if($currentPage): ?>
-		<span class="current" ><?= $currentPage['p'] ?></span>
+		<span class="current" ><?= $currentPage[$pageParam] ?></span>
 	<?php endif;  ?>	
 	
-	<?php  if(!empty($behindPage )): ?>
+	<?php if(!empty($behindPage )): ?>
 		<?php foreach($behindPage as $page): ?>
-			<a external href="<?= $page['url']['url'] ?>"><?= $page['p'] ?></a>
+			<a href="<?= $page['url']['url'] ?>"><?= $page[$pageParam] ?></a>
 		<?php endforeach;  ?>	
 	<?php endif;  ?>		
 		
 	<?= $hiddenBehindStr ?>			
 	<?php if($lastSpaceShow): ?>
-		<a external href="<?= $lastSpaceShow['url']['url'] ?>"><?= $lastSpaceShow['p'] ?></a>
+		<a href="<?= $lastSpaceShow['url']['url'] ?>"><?= $lastSpaceShow[$pageParam] ?></a>
 	<?php endif;  ?>	
 	<?php if($nextPage):  ?>
-		<a external href="<?= $nextPage['url']['url'] ?>">></a>
+		<a href="<?= $nextPage['url']['url'] ?>">></a>
 	<?php else:  ?>
 		<span>></span>
 	<?php endif;  ?>	
diff --git a/app/apphtml5/widgets/Page.php b/app/apphtml5/widgets/Page.php
index 8cc05725..791e45b2 100644
--- a/app/apphtml5/widgets/Page.php
+++ b/app/apphtml5/widgets/Page.php
@@ -21,9 +21,11 @@ class Page
     public $numPerPage;
     public $countTotal;
     public $page;
+    public $pageSection; // = 'p_comment';
 
     public function getLastData()
     {
+        $this->page = $this->page ? $this->page : 'p';
         $spaceShowNum = 4;
         $productNumPerPage = $this->numPerPage;
         $countTotal = $this->countTotal;
@@ -134,7 +136,7 @@ class Page
             $url = $this->getPageUrl($pageNum, 1);
             //Yii::$service->url->category->getFilterChooseAttrUrl($this->page,1);
             $firstSpaceShow = [
-                'p'   => 1,
+                $this->page   => 1,
                 'url' => $url,
             ];
         }
@@ -142,7 +144,7 @@ class Page
             $url = $this->getPageUrl($pageNum, $maxPageNum);
             //Yii::$service->url->category->getFilterChooseAttrUrl($this->page,$maxPageNum);
             $lastSpaceShow = [
-                'p'   => $maxPageNum,
+                $this->page   => $maxPageNum,
                 'url' => $url,
             ];
         }
@@ -151,7 +153,7 @@ class Page
         if (is_array($frontPage) && !empty($frontPage)) {
             foreach ($frontPage as $p) {
                 $frontPageU[] = [
-                    'p'   => $p,
+                    $this->page   => $p,
                     'url' => $this->getPageUrl($pageNum, $p),
                     //Yii::$service->url->category->getFilterChooseAttrUrl($this->page,$p),
                 ];
@@ -162,7 +164,7 @@ class Page
         if (is_array($behindPage) && !empty($behindPage)) {
             foreach ($behindPage as $p) {
                 $behindPageU[] = [
-                    'p'   => $p,
+                    $this->page   => $p,
                     'url' => $this->getPageUrl($pageNum, $p),
                     //Yii::$service->url->category->getFilterChooseAttrUrl($this->page,$p),
                 ];
@@ -173,7 +175,7 @@ class Page
         if ($pageNum > 1) {
             $prevPage = $pageNum - 1;
             $prevPage = [
-                'p'        => $prevPage,
+                $this->page        => $prevPage,
                 'url'    => $this->getPageUrl($pageNum, $prevPage),
                 //Yii::$service->url->category->getFilterChooseAttrUrl($this->page,$prevPage),
             ];
@@ -181,15 +183,15 @@ class Page
         if ($pageNum != $maxPageNum) {
             $nextPage = $pageNum + 1;
             $nextPage = [
-                'p'        => $nextPage,
+                $this->page        => $nextPage,
                 'url'    => $this->getPageUrl($pageNum, $nextPage),
                 //Yii::$service->url->category->getFilterChooseAttrUrl($this->page,$nextPage),
             ];
         }
         $currentPage = [
-            'p'        => $pageNum,
+            $this->page        => $pageNum,
         ];
-        //var_dump($frontPageU);
+        //var_dump($currentPage);exit;
         return [
             'firstSpaceShow'=> $firstSpaceShow,
             'lastSpaceShow' => $lastSpaceShow,
@@ -201,25 +203,28 @@ class Page
             'nextPage'        => $nextPage,
             'hiddenFrontStr'=> $hiddenFrontStr,
             'hiddenBehindStr'=>$hiddenBehindStr,
+            'pageParam' => $this->page,
         ];
     }
 
     public function getPageUrl($currentPage, $showPage)
     {
         $currentUrl = Yii::$service->url->getCurrentUrl();
-        $pVal = Yii::$app->request->get('p');
+        $pVal = Yii::$app->request->get($this->page);
         if ($pVal) {
-            $currentPageStr = 'p='.$pVal;
-            $showPageStr = 'p='.$showPage;
+            $currentPageStr = $this->page.'='.$pVal;
+            $showPageStr = $this->page.'='.$showPage;
             $url = str_replace($currentPageStr, $showPageStr, $currentUrl);
         } else {
             if (strstr($currentUrl, '?')) {
-                $url = $currentUrl.'&p='.$showPage;
+                $url = $currentUrl.'&'.$this->page.'='.$showPage;
             } else {
-                $url = $currentUrl.'?p='.$showPage;
+                $url = $currentUrl.'?'.$this->page.'='.$showPage;
             }
         }
-
+        if ($this->pageSection) {
+            $url = $url . '#' . $this->pageSection;
+        }
         return [
             'url' => $url,
         ];
-- 
GitLab