Authored by 郭成尧

aip-change

... ... @@ -142,7 +142,7 @@ const addressModify = (req, res, next) => {
let uid = req.user.uid;
let orderCode = req.query.orderCode;
let areaCode = req.query.areaCode;
let changeProvince = req.query.changeProvince;
let provinceAreaCode = req.query.provinceAreaCode || false;
addressModel.getAddressData({uid: uid}).then(result => {
let userAddressList = result;
... ... @@ -153,14 +153,14 @@ const addressModify = (req, res, next) => {
orderCode: orderCode,
});
if (changeProvince !== 'Y') {
if (provinceAreaCode) {
// 不允许修改省份,字符串拆分
let areaArray = addressData.area.split(' ');
let area = _.slice(areaArray, 1);
Object.assign(addressData, {
changeProvince: false,
provinceCode: areaCode.substring(0, 2),
provinceCode: provinceAreaCode,
province: areaArray[0],
area: area
});
... ...
... ... @@ -291,8 +291,8 @@ const orderDetailData = (uid, orderCode) => {
});
// 如果允许修改省
if (orderDetail.isSupportChangeProvince === 'Y') {
orderDetail.url = orderDetail.url + '&changeProvince=Y';
if (orderDetail.isSupportChangeProvince === 'Y' && orderDetail.provinceAreaCode) {
orderDetail.url = orderDetail.url + '&provinceAreaCode=' + orderDetail.provinceAreaCode;
}
// 为支付的拆单配送信息
... ...