|
|
@@ -908,10 +908,7 @@ class OrderClass extends BaseClass
|
|
|
foreach ($list as $key => $val) {
|
|
|
$adminId = $val['adminId'] ?? 0;
|
|
|
$list[$key]['adminName'] = $adminInfo[$adminId]['name'] ?? '';
|
|
|
- $floor = $val['floor'] ?? '';
|
|
|
- $address = $val['address'] ?? '';
|
|
|
- $list[$key]['customAddress'] = $address . $floor;
|
|
|
- $list[$key]['showAddress'] = $val['showAddress'] ?? '';
|
|
|
+ $list[$key]['customAddress'] = $val['fullAddress'] ?? '';
|
|
|
|
|
|
//显示列表页的操作按钮
|
|
|
$list[$key]['buttonList'] = self::getShowButton($showButton, $isList, $val);
|
