Authored by 郭成尧

aip-change

@@ -142,7 +142,7 @@ const addressModify = (req, res, next) => { @@ -142,7 +142,7 @@ const addressModify = (req, res, next) => {
142 let uid = req.user.uid; 142 let uid = req.user.uid;
143 let orderCode = req.query.orderCode; 143 let orderCode = req.query.orderCode;
144 let areaCode = req.query.areaCode; 144 let areaCode = req.query.areaCode;
145 - let changeProvince = req.query.changeProvince; 145 + let provinceAreaCode = req.query.provinceAreaCode || false;
146 146
147 addressModel.getAddressData({uid: uid}).then(result => { 147 addressModel.getAddressData({uid: uid}).then(result => {
148 let userAddressList = result; 148 let userAddressList = result;
@@ -153,14 +153,14 @@ const addressModify = (req, res, next) => { @@ -153,14 +153,14 @@ const addressModify = (req, res, next) => {
153 orderCode: orderCode, 153 orderCode: orderCode,
154 }); 154 });
155 155
156 - if (changeProvince !== 'Y') { 156 + if (provinceAreaCode) {
157 // 不允许修改省份,字符串拆分 157 // 不允许修改省份,字符串拆分
158 let areaArray = addressData.area.split(' '); 158 let areaArray = addressData.area.split(' ');
159 let area = _.slice(areaArray, 1); 159 let area = _.slice(areaArray, 1);
160 160
161 Object.assign(addressData, { 161 Object.assign(addressData, {
162 changeProvince: false, 162 changeProvince: false,
163 - provinceCode: areaCode.substring(0, 2), 163 + provinceCode: provinceAreaCode,
164 province: areaArray[0], 164 province: areaArray[0],
165 area: area 165 area: area
166 }); 166 });
@@ -291,8 +291,8 @@ const orderDetailData = (uid, orderCode) => { @@ -291,8 +291,8 @@ const orderDetailData = (uid, orderCode) => {
291 }); 291 });
292 292
293 // 如果允许修改省 293 // 如果允许修改省
294 - if (orderDetail.isSupportChangeProvince === 'Y') {  
295 - orderDetail.url = orderDetail.url + '&changeProvince=Y'; 294 + if (orderDetail.isSupportChangeProvince === 'Y' && orderDetail.provinceAreaCode) {
  295 + orderDetail.url = orderDetail.url + '&provinceAreaCode=' + orderDetail.provinceAreaCode;
296 } 296 }
297 297
298 // 为支付的拆单配送信息 298 // 为支付的拆单配送信息