From e33af0b8e10704a7c49313b893f97d09469d2fe2 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Wed, 5 Jun 2024 14:19:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/order/OrderController.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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']; From a0ad4a077c18ccacd87904fb3a9c84f02e1b61a3 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Wed, 5 Jun 2024 14:26:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BA=97=E9=93=BA=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/model/store_order/StoreOrder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/common/model/store_order/StoreOrder.php b/app/common/model/store_order/StoreOrder.php index 8319620b8..ee532ed94 100644 --- a/app/common/model/store_order/StoreOrder.php +++ b/app/common/model/store_order/StoreOrder.php @@ -24,7 +24,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)