...
|
...
|
@@ -26,11 +26,12 @@ |
|
|
|
|
|
for (let i = 0; i < addressList.length; i++) {
|
|
|
let phone = _.get(addressList[i], 'phone') === 'null' ? '' : addressList[i].phone;
|
|
|
let zipCode = _.get(addressList[i], 'zip_code') === 'null' ? '' : addressList[i].zip_code;
|
|
|
|
|
|
result.push({
|
|
|
id: addressList[i].address_id || '',
|
|
|
addressee: addressList[i].consignee || '',
|
|
|
address: addressList[i].area + addressList[i].address + ' ' + (addressList[i].zip_code || ''),
|
|
|
address: addressList[i].area + addressList[i].address + ' ' + zipCode,
|
|
|
phone: (addressList[i].mobile || '') + ' ' + phone,
|
|
|
isPreferred: addressList[i].is_default === 'Y' ? 'true' : ''// 默认地址
|
|
|
});
|
...
|
...
|
@@ -93,11 +94,6 @@ |
|
|
labelText: '手机号码:',
|
|
|
value: '',
|
|
|
tips: '填写手机号便于接收发货和收货通知'
|
|
|
}, {
|
|
|
key: 'email',
|
|
|
labelText: '电子邮件:',
|
|
|
value: '',
|
|
|
tips: '用来接收订单提醒邮件,便于您及时了解订单状态'
|
|
|
}]
|
|
|
};
|
|
|
|
...
|
...
|
@@ -123,7 +119,10 @@ |
|
|
|
|
|
for (let i = 0; i < addressList.length; i++) {
|
|
|
if (addressList[i].address_id === id) {
|
|
|
addressList[i].phone = _.get(addressList[i], 'phone') === 'null' ? '' : addressList[i].phone;
|
|
|
addressList[i].phone = _.get(addressList[i], 'phone') === 'null' ?
|
|
|
'' : addressList[i].phone;
|
|
|
addressList[i].zip_code = _.get(addressList[i], 'zip_code') === 'null' ?
|
|
|
'' : addressList[i].zip_code;
|
|
|
respData.data = addressList[i];
|
|
|
break;
|
|
|
}
|
...
|
...
|
@@ -147,7 +146,6 @@ |
|
|
address: _.trim(params.address || ''),
|
|
|
area_code: _.trim(params.streets || ''),
|
|
|
consignee: _.trim(params.addressName || ''),
|
|
|
email: _.trim(params.email || ''),
|
|
|
id: params.addrId === '0' ? null : params.addrId,
|
|
|
mobile: _.trim(params.mobile || ''),
|
|
|
phone: _.trim(params.phone || ''),
|
...
|
...
|
@@ -156,7 +154,7 @@ |
|
|
|
|
|
if (query.uid === '' || query.address === '' ||
|
|
|
query.area_code.length < 6 || query.consignee === '' ||
|
|
|
query.email === '' || query.zip_code === '') {
|
|
|
query.zip_code === '') {
|
|
|
|
|
|
return {
|
|
|
code: 400,
|
...
|
...
|
|