hant/allocatr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/xman' into develop

Browse Source
This commit is contained in:
xman 2025-03-05 20:56:39 +08:00
commit 204afd4005
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/admin/controller/Order.php
View File

@ -27,7 +27,7 @@ class Order extends Backend
$this->model = new \app\admin\model\Order; $this->model = new \app\admin\model\Order;
$this->view->assign("statusList", $this->model->getStatusList()); $this->view->assign("statusList", $this->model->getStatusList());
//$this->view->assign("collectList", $this->model->getCollectList()); //$this->view->assign("collectList", $this->model->getCollectList());
$this->view->assign("dispatchTypeList", $this->model->getDispatchTypeList()); //$this->view->assign("dispatchTypeList", $this->model->getDispatchTypeList());
} }

2
application/admin/model/Order.php
View File

@ -66,7 +66,7 @@ class Order extends Model
public function getCollectTextAttr($value, $data) public function getCollectTextAttr($value, $data)
{ {
$value = $value ?: ($data['collect'] ?? ''); $value = $value ?: ($data['collect'] ?? '');
$list = $this->getCollectList(); //$list = $this->getCollectList();
return $list[$value] ?? ''; return $list[$value] ?? '';
} }