|
|
@@ -72,8 +72,8 @@ class AddressService extends BaseService
|
|
|
|
|
|
})
|
|
|
->select(['a.id', 'a.user_id', 'c1.name as province_name','c2.name as city_name','c3.name as district_name', 'a.realname', 'a.mobile', 'a.is_default', 'a.status', 'a.create_time', 'a.update_time', 'a.address'])
|
|
|
- ->orderBy('a.is_default', 'asc')
|
|
|
->orderBy('a.create_time', 'desc')
|
|
|
+ ->orderBy('a.is_default', 'asc')
|
|
|
->paginate($pageSize);
|
|
|
|
|
|
$dataList = $dataList ? $dataList->toArray() : [];
|
|
|
@@ -160,7 +160,7 @@ class AddressService extends BaseService
|
|
|
'city_id' => isset($cityCodes[1])? $cityCodes[1] : '',
|
|
|
'district_id' => isset($cityCodes[2])? $cityCodes[2] : '',
|
|
|
'address' => isset($params['address'])? trim($params['address']) : '',
|
|
|
- 'is_default'=>isset($params['is_default'])? intval($params['is_default']) : 2,
|
|
|
+ 'is_default'=>isset($params['is_default']) && $params['is_default']? intval($params['is_default']) : 2,
|
|
|
'create_time'=> time()
|
|
|
];
|
|
|
if($data['id']<=0){
|
