|
@@ -55,16 +55,12 @@ class Address extends Base
|
|
|
if ($info) {
|
|
|
$data['county_name'] = $info['name'];
|
|
|
|
|
|
- if (!$data['city']) {
|
|
|
- $data['city'] = $info['city_id'];
|
|
|
- }
|
|
|
+ $data['city'] = $info['city_id'];
|
|
|
|
|
|
$info = Dever::db('area/city')->find($data['city']);
|
|
|
$data['city_name'] = $info['name'];
|
|
|
|
|
|
- if (!$data['province']) {
|
|
|
- $data['province'] = $info['province_id'];
|
|
|
- }
|
|
|
+ $data['province'] = $info['province_id'];
|
|
|
|
|
|
$info = Dever::db('area/province')->find($data['province']);
|
|
|
$data['province_name'] = $info['name'];
|
|
@@ -78,16 +74,12 @@ class Address extends Base
|
|
|
if ($info) {
|
|
|
$data['county_name'] = $info['name'];
|
|
|
|
|
|
- if (!$data['city']) {
|
|
|
- $data['city'] = $info['city_id'];
|
|
|
- }
|
|
|
+ $data['city'] = $info['city_id'];
|
|
|
|
|
|
$info = Dever::db('area/city')->find($data['city']);
|
|
|
$data['city_name'] = $info['name'];
|
|
|
|
|
|
- if (!$data['province']) {
|
|
|
- $data['province'] = $info['province_id'];
|
|
|
- }
|
|
|
+ $data['province'] = $info['province_id'];
|
|
|
|
|
|
$info = Dever::db('area/province')->find($data['province']);
|
|
|
$data['province_name'] = $info['name'];
|