Authored by hongweigao

处理phone为null的情况

@@ -25,11 +25,13 @@ @@ -25,11 +25,13 @@
25 let addressList = addressData.data; 25 let addressList = addressData.data;
26 26
27 for (let i = 0; i < addressList.length; i++) { 27 for (let i = 0; i < addressList.length; i++) {
  28 + let phone = _.get(addressList[i], 'phone') === 'null' ? '' : addressList[i].phone;
  29 +
28 result.push({ 30 result.push({
29 id: addressList[i].address_id || '', 31 id: addressList[i].address_id || '',
30 addressee: addressList[i].consignee || '', 32 addressee: addressList[i].consignee || '',
31 - address: addressList[i].area + addressList[i].address + (addressList[i].zip_code || ''),  
32 - phone: (addressList[i].mobile || '') + (addressList[i].phone || ''), 33 + address: addressList[i].area + addressList[i].address + ' ' + (addressList[i].zip_code || ''),
  34 + phone: (addressList[i].mobile || '') + ' ' + phone,
33 isPreferred: addressList[i].is_default === 'Y' ? 'true' : ''// 默认地址 35 isPreferred: addressList[i].is_default === 'Y' ? 'true' : ''// 默认地址
34 }); 36 });
35 } 37 }
@@ -122,6 +124,7 @@ @@ -122,6 +124,7 @@
122 124
123 for (let i = 0; i < addressList.length; i++) { 125 for (let i = 0; i < addressList.length; i++) {
124 if (addressList[i].address_id === id) { 126 if (addressList[i].address_id === id) {
  127 + addressList[i].phone = _.get(addressList[i], 'phone') === 'null' ? '' : addressList[i].phone;
125 respData.data = addressList[i]; 128 respData.data = addressList[i];
126 break; 129 break;
127 } 130 }