diff --git a/app/api/controller/order/OrderController.php b/app/api/controller/order/OrderController.php index e0ed0421d..165278172 100644 --- a/app/api/controller/order/OrderController.php +++ b/app/api/controller/order/OrderController.php @@ -42,9 +42,13 @@ class OrderController extends BaseApiController public function write_list() { $status = (int)$this->request->post('status',1); + $page_no = (int)$this->request->post('page_no',1); + $page_size = (int)$this->request->post('page_size',15); $params = $this->request->post(); - $params['page_no'] = isset($params['page_no'])?: 1; - $params['page_size'] = isset($params['page_size'])?: 15; + if(empty($page_no) || empty($page_size)){ + $params['page_no'] = 1; + $params['page_size'] = 15; + } $info = $this->userInfo; $res = OrderLogic::write_list($info,$status,$params); $res['page_no'] =$params['page_no']; diff --git a/app/common/model/store_order/StoreOrder.php b/app/common/model/store_order/StoreOrder.php index 3f6b77783..f0af91c60 100644 --- a/app/common/model/store_order/StoreOrder.php +++ b/app/common/model/store_order/StoreOrder.php @@ -25,7 +25,7 @@ class StoreOrder extends BaseModel public function store() { return $this->hasOne(SystemStore::class, 'id','store_id') - ->bind(['store_name'=>'name', 'store_phone'=>'phone']); + ->bind(['store_name'=>'name', 'store_phone'=>'phone','store_detailed_address'=>'detailed_address','store_simple_address'=>'address']); } public function getPayTypeAttr($value, $data)