fe / yohobuywap-node · Commits

Go to a project

Authored by 郭成尧
Commit bb597c52edfeabb2a017b1e5601777afbc5badfe 2 parents 2b3e9ac5 2456d9a4

Merge branch 'feature/orderAddress' into hotfix/dataverify

Inline Side-by-side
Showing 1 changed file with 2 additions and 3 deletions
@@ -145,8 +145,7 @@ const addressModify = (req, res, next) => { @@ -145,8 +145,7 @@ const addressModify = (req, res, next) => {
145 145
146 addressModel.getAddressData({uid: uid}).then(result => { 146 addressModel.getAddressData({uid: uid}).then(result => {
147 let userAddressList = result; 147 let userAddressList = result;
148 - let addressData = addressProcess.getAddressByAreaCode(areaCode,  
149 - _.get(userAddressList, 'data', [])) || {}; 148 + let addressData = addressProcess.getAddressByAreaCode(areaCode, _.get(userAddressList, 'data', [])) || {};
150 149
151 Object.assign(addressData, { 150 Object.assign(addressData, {
152 orderCode: orderCode, 151 orderCode: orderCode,
@@ -154,7 +153,7 @@ const addressModify = (req, res, next) => { @@ -154,7 +153,7 @@ const addressModify = (req, res, next) => {
154 153
155 if (provinceAreaCode) { 154 if (provinceAreaCode) {
156 // 不允许修改省份，字符串拆分 155 // 不允许修改省份，字符串拆分
157 - let areaArray = addressData.area.split(' '); 156 + let areaArray = addressData.area ? addressData.area.split(' ') : [];
158 let area = _.slice(areaArray, 1); 157 let area = _.slice(areaArray, 1);
159 158
160 Object.assign(addressData, { 159 Object.assign(addressData, {