mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store

Browse Source
This commit is contained in:
luofei 2024-06-05 14:28:02 +08:00
commit de3d6658d8
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/api/controller/order/OrderController.php
View File

@ -42,9 +42,13 @@ class OrderController extends BaseApiController
public function write_list() public function write_list()
{ {
$status = (int)$this->request->post('status',1); $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 = $this->request->post();
$params['page_no'] = isset($params['page_no'])?: 1; if(empty($page_no) || empty($page_size)){
$params['page_size'] = isset($params['page_size'])?: 15; $params['page_no'] = 1;
$params['page_size'] = 15;
}
$info = $this->userInfo; $info = $this->userInfo;
$res = OrderLogic::write_list($info,$status,$params); $res = OrderLogic::write_list($info,$status,$params);
$res['page_no'] =$params['page_no']; $res['page_no'] =$params['page_no'];

2
app/common/model/store_order/StoreOrder.php
View File

@ -25,7 +25,7 @@ class StoreOrder extends BaseModel
public function store() public function store()
{ {
return $this->hasOne(SystemStore::class, 'id','store_id') 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) public function getPayTypeAttr($value, $data)