diff --git a/litemall-wx/pages/ucenter/address/address.js b/litemall-wx/pages/ucenter/address/address.js index 7f2f3778..7c1c195c 100644 --- a/litemall-wx/pages/ucenter/address/address.js +++ b/litemall-wx/pages/ucenter/address/address.js @@ -40,7 +40,15 @@ Page({ } - wx.navigateBack(); + let addressId = event.currentTarget.dataset.addressId; + if (addressId && addressId != 0) { + wx.navigateBack(); + } else { + wx.navigateTo({ + url: '/pages/ucenter/addressAdd/addressAdd?id=' + addressId + }) + } + } else { wx.navigateTo({ url: '/pages/ucenter/addressAdd/addressAdd?id=' + event.currentTarget.dataset.addressId diff --git a/renard-wx/pages/ucenter/address/address.js b/renard-wx/pages/ucenter/address/address.js index b1cab6c5..3899672b 100644 --- a/renard-wx/pages/ucenter/address/address.js +++ b/renard-wx/pages/ucenter/address/address.js @@ -36,18 +36,11 @@ Page({ }, addressAddOrUpdate(event) { - console.log(event); - //返回之前,先取出上一页对象,并设置addressId var pages = getCurrentPages(); var prevPage = pages[pages.length - 2]; if (prevPage.route == "pages/shopping/checkout/checkout") { - console.log(event.currentTarget.dataset.addressId); - // prevPage.setData({ - // addressId: event.currentTarget.dataset.addressId - // }); - try { wx.setStorageSync('addressId', event.currentTarget.dataset.addressId); } catch (e) { @@ -55,7 +48,6 @@ Page({ } let addressId = event.currentTarget.dataset.addressId; - console.log(addressId); if (addressId && addressId != 0) { wx.navigateBack(); } else {