shish преди 6 години
родител
ревизия
91950ee65c
променени са 3 файла, в които са добавени 11 реда и са изтрити 11 реда
  1. 1 5
      app/admin/controllers/OrderController.php
  2. 8 5
      biz/base/services/BaseService.php
  3. 2 1
      biz/order/services/OrderService.php

+ 1 - 5
app/admin/controllers/OrderController.php

@@ -40,12 +40,8 @@ class OrderController extends BaseController
 			}
 		}
 
-		//传递page pageSize参数
-		$page = isset($get['page']) ? $get['page'] : 1;
-		Yii::$app->params['page'] = $page;
-
 		$list = OrderService::getOrderList($where);
 		util::success($list);
 	}
-
+	
 }

+ 8 - 5
biz/base/services/BaseService.php

@@ -9,7 +9,7 @@ class BaseService
 {
 	public static $baseFile;
 	public static $requireParams;
-
+	
 	//查询全部 shish 2019.11.27
 	public static function getAllList($select, $where, $order = '', $with = '')
 	{
@@ -17,16 +17,19 @@ class BaseService
 		$result = $class::getAllList($select, $where, $order, $with);
 		return $result;
 	}
-
+	
 	//分页查询 shish 2019.9.21
 	public static function getList($select, $where, $order = '', $with = '', $pageSize = 0)
 	{
 		$class = static::$baseFile;
-		$page = Yii::$app->params['page'];
-		$pageSize = empty($pageSize) ? Yii::$app->params['pageSize'] : $pageSize;
+		$get = Yii::$app->request->get();
+		$page = isset($get['page']) ? $get['page'] : 1;
+		Yii::$app->params['page'] = $page;
+		//pageSize 已经在common/params.php定义
+		$pageSize = isset($get['pageSize']) && !empty($get['pageSize']) ? $get['pageSize'] : Yii::$app->params['pageSize'];
 		return $class::getList($select, $where, $page, $pageSize, $order, $with);
 	}
-
+	
 	public static function add($data, $returnObject = false)
 	{
 		$class = static::$baseFile;

+ 2 - 1
biz/order/services/OrderService.php

@@ -17,7 +17,8 @@ class OrderService extends BaseService
 {
 	
 	public static $baseFile = '\biz\order\classes\OrderClass';
-	
+
+	//获取订单信息 shish 2019.11.28
 	public static function getOrderList($where)
 	{
 		$data = self::getList('*', $where, 'addTime DESC');