diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue index 4dd9aee..17a6ceb 100644 --- a/pages/order/OrderDetails/index.vue +++ b/pages/order/OrderDetails/index.vue @@ -590,7 +590,7 @@ export default { const ids = res.data.cartInfo.map(e => e.id) const addressInfo = res.data.addressInfo if (ids.length === 0) return - uni.navigateTo({ + uni.redirectTo({ url: '/pages/order/OrderSubmission/index?id=' + ids.join(',') + '&address=' + JSON.stringify(addressInfo) }) }) diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue index 3ed599e..d98f44c 100644 --- a/pages/order/OrderSubmission/index.vue +++ b/pages/order/OrderSubmission/index.vue @@ -392,10 +392,26 @@ export default { let that = this; uni.$on('chooseAddress', (res) => { console.log('监听到选择收货地址:' + JSON.stringify(res)); - that.addressInfo = res; - //地址切换也要重新计算一下 - that.computedPrice('onLoad chooseAddress'); - }) + setTimeout(() => { + uni.showModal({ + title:'确定修改地址吗?', + content: '', + showCancel: true, + cancelText: '取消', + confirmText: '确认', + success:(success)=>{ + if(success.confirm) { + that.addressInfo = res; + //地址切换也要重新计算一下 + that.computedPrice('onLoad chooseAddress'); + } + }, + complete:(complete)=>{ + uni.hideLoading() + }, + }) + }) + },1000) if (that.$yroute.query.pinkid !== undefined) { that.pinkId = that.$yroute.query.pinkid; }