|
|
@@ -178,11 +178,12 @@ class User extends Api
|
|
|
->order('a.id DESC')
|
|
|
->paginate($this->pageSize);
|
|
|
foreach ($list['data'] as &$item) {
|
|
|
- if($item->province > 0) $item->address_id = $item->province.'-';
|
|
|
+ $item->address_id = '';
|
|
|
+ if($item->province > 0) $item->address_id .= $item->province.'-';
|
|
|
if($item->city > 0) $item->address_id .= $item->city.'-';
|
|
|
if($item->area > 0) $item->address_id .= $item->area.'-';
|
|
|
if($item->county > 0) $item->address_id .= $item->county.'-';
|
|
|
- $item->address_id = rtrim($item->address_id, '-')?? '';
|
|
|
+ $item->address_id = rtrim($item->address_id, '-');
|
|
|
}
|
|
|
$list['statusList'] = $productOrder::getStatusAll();
|
|
|
$this->success('', $list);
|