theluyuan/litemall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix[litemall-wx-api, litemall-wx]: 修复收货地址不能修改

Browse Source
This commit is contained in:
Junling Bu
2018-10-26 18:58:10 +08:00
parent cd27350a22
commit cdc1619a7b
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAddressController.java
View File

@@ -85,10 +85,11 @@ public class WxAddressController {
* name: xxx,
* provinceId: xxx,
* cityId: xxx,
* districtId: xxx,
* areaId: xxx,
* mobile: xxx,
* address: xxx,
* isDefault: xxx,
* version: xxx
* provinceName: xxx,
* cityName: xxx,
* areaName: xxx
@@ -112,10 +113,11 @@ public class WxAddressController {
data.put("name", address.getName());
data.put("provinceId", address.getProvinceId());
data.put("cityId", address.getCityId());
data.put("districtId", address.getAreaId());
data.put("areaId", address.getAreaId());
data.put("mobile", address.getMobile());
data.put("address", address.getAddress());
data.put("isDefault", address.getIsDefault());
data.put("version", address.getVersion());
String pname = regionService.findById(address.getProvinceId()).getName();
data.put("provinceName", pname);
String cname = regionService.findById(address.getCityId()).getName();
@@ -211,7 +213,7 @@ public class WxAddressController {
return ResponseUtil.updatedDateExpired();
}
}
return ResponseUtil.ok(address.getId());
return ResponseUtil.ok(address);
}
/**

9
litemall-wx/pages/ucenter/addressAdd/addressAdd.js
View File

@@ -14,6 +14,7 @@ Page({
name: '',
mobile: '',
isDefault: 0,
version: 0,
provinceName: '',
cityName: '',
areaName: ''
@@ -302,9 +303,7 @@ Page({
areaId: address.areaId,
address: address.address,
isDefault: address.isDefault,
provinceName: address.provinceName,
cityName: address.cityName,
countyName: address.areaName
version: address.version
}, 'POST').then(function (res) {
if (res.errno === 0) {
//返回之前，先取出上一页对象，并设置addressId
@@ -313,11 +312,11 @@ Page({
console.log(prevPage);
if (prevPage.route == "pages/checkout/checkout") {
prevPage.setData({
addressId: res.data
addressId: res.data.id
})
try {
wx.setStorageSync('addressId', res.data);
wx.setStorageSync('addressId', res.data.id);
} catch (e) {
}

9
renard-wx/pages/ucenter/addressAdd/addressAdd.js
View File

@@ -14,6 +14,7 @@ Page({
name: '',
mobile: '',
isDefault: 0,
version: 0,
provinceName: '',
cityName: '',
areaName: ''
@@ -302,9 +303,7 @@ Page({
areaId: address.areaId,
address: address.address,
isDefault: address.isDefault,
provinceName: address.provinceName,
cityName: address.cityName,
countyName: address.areaName
version: address.version
}, 'POST').then(function (res) {
if (res.errno === 0) {
//返回之前，先取出上一页对象，并设置addressId
@@ -313,11 +312,11 @@ Page({
console.log(prevPage);
if (prevPage.route == "pages/checkout/checkout") {
prevPage.setData({
addressId: res.data
addressId: res.data.id
})
try {
wx.setStorageSync('addressId', res.data);
wx.setStorageSync('addressId', res.data.id);
} catch (e) {
}