From 8201ca85bdb1b8e190be8ad8ecba530a7e3ac631 Mon Sep 17 00:00:00 2001
From: Terry <2358269014@qq.com>
Date: Tue, 12 Dec 2017 23:42:41 +0800
Subject: [PATCH] =?UTF-8?q?apphtml5=E8=AF=84=E8=AE=BA=E7=9A=84toolbar?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Catalog/controllers/CategoryController.php       |  1 +
 .../modules/Catalog/block/reviewproduct/Lists.php    |  3 ++-
 app/apphtml5/theme/base/html5/assets/css/fec.css     |  5 ++++-
 .../theme/base/html5/catalog/reviewproduct/lists.php |  6 ++++--
 .../theme/base/html5/customer/order/index.php        |  6 ++++--
 .../base/html5/customer/productreview/index.php      |  4 +++-
 app/apphtml5/theme/base/html5/widgets/page.php       | 12 ++++++------
 7 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/app/appfront/modules/Catalog/controllers/CategoryController.php b/app/appfront/modules/Catalog/controllers/CategoryController.php
index 30186b8d..3d2c833d 100644
--- a/app/appfront/modules/Catalog/controllers/CategoryController.php
+++ b/app/appfront/modules/Catalog/controllers/CategoryController.php
@@ -27,6 +27,7 @@ class CategoryController extends AppfrontController
     // 分类页面。
     public function actionIndex()
     {
+        echo date('Y-m-d H:i:s');
         $data = $this->getBlock()->getLastData();
         if(is_array($data)){
             return $this->render($this->action->id, $data);
diff --git a/app/apphtml5/modules/Catalog/block/reviewproduct/Lists.php b/app/apphtml5/modules/Catalog/block/reviewproduct/Lists.php
index ed8d7ff2..7a549d5d 100644
--- a/app/apphtml5/modules/Catalog/block/reviewproduct/Lists.php
+++ b/app/apphtml5/modules/Catalog/block/reviewproduct/Lists.php
@@ -23,7 +23,7 @@ class Lists
     public $filterBySpu = true;
     public $filterOrderBy = 'review_date';
     public $_page = 'p';
-    public $numPerPage = 20;
+    public $numPerPage = 10;
     public $pageNum;
     /**
      * 为了可以使用rewriteMap，use 引入的文件统一采用下面的方式，通过Yii::mapGet()得到className和Object
@@ -48,6 +48,7 @@ class Lists
     protected function getProductPage($countTotal)
     {
         if ($countTotal <= $this->numPerPage) {
+            echo "$countTotal <= $this->numPerPage";
             return '';
         }
         $config = [
diff --git a/app/apphtml5/theme/base/html5/assets/css/fec.css b/app/apphtml5/theme/base/html5/assets/css/fec.css
index 2a614db8..8a41a045 100644
--- a/app/apphtml5/theme/base/html5/assets/css/fec.css
+++ b/app/apphtml5/theme/base/html5/assets/css/fec.css
@@ -1042,8 +1042,11 @@ ul#billing_address_list  li input , ul#billing_address_list  li select{
     text-decoration: line-through; 
 }
 
+.pageToolbar {margin: 10px auto;
+width: 80%;}
+.pageToolbar label{font-size:0.6rem;float:left;}
 
-
+.pageToolbar .tb_rg{float:left;}
 
 
 
diff --git a/app/apphtml5/theme/base/html5/catalog/reviewproduct/lists.php b/app/apphtml5/theme/base/html5/catalog/reviewproduct/lists.php
index 1bfe8268..31968808 100644
--- a/app/apphtml5/theme/base/html5/catalog/reviewproduct/lists.php
+++ b/app/apphtml5/theme/base/html5/catalog/reviewproduct/lists.php
@@ -117,8 +117,10 @@
 					
 					<?php if($pageToolBar): ?>
 					<div class="pageToolbar">
-						<label class="title"><?= Yii::$service->page->translate->__('Page:');?></label><?= $pageToolBar ?>
-					</div>
+						<label class=""><?= Yii::$service->page->translate->__('Page:');?></label>
+                        <?= $pageToolBar ?>
+                         <div class="clear"></div>
+                    </div>
 					<?php endif; ?>
 				</div>
 			</div>
diff --git a/app/apphtml5/theme/base/html5/customer/order/index.php b/app/apphtml5/theme/base/html5/customer/order/index.php
index 1df3a2f5..168c83f4 100644
--- a/app/apphtml5/theme/base/html5/customer/order/index.php
+++ b/app/apphtml5/theme/base/html5/customer/order/index.php
@@ -58,8 +58,10 @@
 					</tbody>
 				</table>
 				<?php if($pageToolBar): ?>
-					<div class="pageToolbar">
-						<label class="title"><?= Yii::$service->page->translate->__('Page:');?></label><?= $pageToolBar ?>
+					<div class="pageToolbar customer_order">
+						<label class=""><?= Yii::$service->page->translate->__('Page:');?></label>
+                        <?= $pageToolBar ?>
+                        <div class="clear"></div>
 					</div>
 				<?php endif; ?>
 			</div>
diff --git a/app/apphtml5/theme/base/html5/customer/productreview/index.php b/app/apphtml5/theme/base/html5/customer/productreview/index.php
index 46412e2b..90c5f555 100644
--- a/app/apphtml5/theme/base/html5/customer/productreview/index.php
+++ b/app/apphtml5/theme/base/html5/customer/productreview/index.php
@@ -70,7 +70,9 @@ use fecshop\app\apphtml5\helper\Format;
 							</table>	
 							<?php if($pageToolBar): ?>
 							<div class="pageToolbar">
-								<label class="title"><?= Yii::$service->page->translate->__('Page:');?></label><?= $pageToolBar ?>
+								<label class=""><?= Yii::$service->page->translate->__('Page:');?></label>
+                                <?= $pageToolBar ?>
+                                <div class="clear"></div>
 							</div>
 							<?php endif; ?>
 						</div>
diff --git a/app/apphtml5/theme/base/html5/widgets/page.php b/app/apphtml5/theme/base/html5/widgets/page.php
index 46dc1ce3..01145cf6 100644
--- a/app/apphtml5/theme/base/html5/widgets/page.php
+++ b/app/apphtml5/theme/base/html5/widgets/page.php
@@ -9,17 +9,17 @@
 ?>
 <div class="tb_rg">
 	<?php  if($prevPage):  ?>
-		<a href="<?= $prevPage['url']['url'] ?>"><</a>
+		<a external href="<?= $prevPage['url']['url'] ?>"><</a>
 	<?php else:  ?>
 		<span><</span>
 	<?php endif;  ?>	
 	<?php if($firstSpaceShow):  ?>
-		<a href="<?= $firstSpaceShow['url']['url'] ?>"><?= $firstSpaceShow['p'] ?></a>
+		<a external href="<?= $firstSpaceShow['url']['url'] ?>"><?= $firstSpaceShow['p'] ?></a>
 	<?php endif;  ?>	
 	<?= $hiddenFrontStr ?>		
 	<?php  if(!empty($frontPage )): ?>
 		<?php foreach($frontPage as $page): ?>
-			<a href="<?= $page['url']['url'] ?>"><?= $page['p'] ?></a>
+			<a external href="<?= $page['url']['url'] ?>"><?= $page['p'] ?></a>
 		<?php endforeach;  ?>	
 	<?php endif;  ?>	
 	
@@ -29,16 +29,16 @@
 	
 	<?php  if(!empty($behindPage )): ?>
 		<?php foreach($behindPage as $page): ?>
-			<a href="<?= $page['url']['url'] ?>"><?= $page['p'] ?></a>
+			<a external href="<?= $page['url']['url'] ?>"><?= $page['p'] ?></a>
 		<?php endforeach;  ?>	
 	<?php endif;  ?>		
 		
 	<?= $hiddenBehindStr ?>			
 	<?php if($lastSpaceShow): ?>
-		<a href="<?= $lastSpaceShow['url']['url'] ?>"><?= $lastSpaceShow['p'] ?></a>
+		<a external href="<?= $lastSpaceShow['url']['url'] ?>"><?= $lastSpaceShow['p'] ?></a>
 	<?php endif;  ?>	
 	<?php if($nextPage):  ?>
-		<a href="<?= $nextPage['url']['url'] ?>">></a>
+		<a external href="<?= $nextPage['url']['url'] ?>">></a>
 	<?php else:  ?>
 		<span>></span>
 	<?php endif;  ?>	
-- 
GitLab