diff --git a/app/controller/api/user/UserAddress.php b/app/controller/api/user/UserAddress.php index ae057bbc..228903fd 100644 --- a/app/controller/api/user/UserAddress.php +++ b/app/controller/api/user/UserAddress.php @@ -57,10 +57,6 @@ class UserAddress extends BaseController return app('json')->fail('地址不存在'); } $addinfo = $this->repository->get($id, $uid); - /* - "brigade_id": 10, - "brigade": "10队" - */ $area = []; if (!empty($addinfo['province_id'])) { $province = GeoProvince::where('province_id', $addinfo['province_id'])->find(); @@ -210,9 +206,9 @@ class UserAddress extends BaseController */ public function checkParams(validate $validate) { - $data = $this->request->params(['address_id', 'real_name', 'phone', 'area', 'detail', 'post_code', 'is_default']); + $data = $this->request->params(['address_id', 'real_name', 'phone', 'area', 'detail', 'post_code', 'is_default', 'brigade']); $validate->check($data); - [$province, $city, $district, $street, $village, $brigade] = ((array)$data['area']) + [null, null, null, null, null, null]; + [$province, $city, $district, $street, $village] = ((array)$data['area']) + [null, null, null, null, null]; $last = $village ?? $street ?? $district ?? $city ?? $province; if (!$last) { throw new ValidateException('请选择正确的收货地址'); @@ -234,6 +230,7 @@ class UserAddress extends BaseController $data['village'] = $village['name'] ?? ''; $data['village_id'] = $village['id'] ?? 0; } + $brigade = $data['brigade']; if (isset($brigade)) { $data['brigade'] = $brigade['name'] ?? ''; $data['brigade_id'] = $brigade['id'] ?? 0;