fe / YOHOBUYPC · Commits

Go to a project

Authored by 周少峰
Commit 8adadcb483b09be749ce88a49243e903a540bd02 2 parents 2046483f b0616adf

Merge branch 'feature/returns' into release/5.3

Inline Side-by-side
Showing 1 changed file with 1 additions and 0 deletions
... ... @@ -103,6 +103,7 @@ class ReturnsModel
$detail['express']['company'] = isset($res['notice']['express_company']) ? $res['notice']['express_company'] : '';
$detail['express']['number'] = isset($res['notice']['express_number']) ? $res['notice']['express_number'] : '';
$detail['express']['id'] = isset($res['notice']['express_id']) ? $res['notice']['express_id'] : '';
$detail['express']['expressDeadLine'] = isset($res['notice']['date']) ? $res['notice']['date'] : '';
}
foreach ($res['statusList'] as $key => $value) {
$detail['statusList'][$key]['act'] = ($value['act'] == 'Y') ? true : false;
... ...