diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue index 3b1e025..584f208 100644 --- a/pages/order/MyOrder/index.vue +++ b/pages/order/MyOrder/index.vue @@ -633,11 +633,11 @@ export default { computed: mapGetters(["userInfo"]), onShow() { const _this = this - const chooseAddress = uni.getStorageSync('chooseAddress') || {} + const chooseAddress = uni.getStorageSync('updateOrderAddress') || {} const addressId = chooseAddress.id || '' // 监听到选择收货地址 if (addressId && this._orderId) { - uni.setStorageSync('chooseAddress', {}) + uni.setStorageSync('updateOrderAddress', {}) uni.showModal({ title:'确定修改地址吗?', content: '提交后将进入审核流程,请确认是否继续', @@ -655,7 +655,6 @@ export default { icon: 'success', title: '已提交审核' }) - uni.setStorageSync('sourceAddress', chooseAddress) _this.changeType() }).finally(() => { uni.hideLoading() @@ -923,7 +922,7 @@ export default { this.$yrouter.push({ path: "/pages/user/address/AddressManagement/index", query: { - choosMode: 1 + choosMode: 4 } }) }, diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue index e29ef79..6f19e95 100644 --- a/pages/order/OrderDetails/index.vue +++ b/pages/order/OrderDetails/index.vue @@ -646,11 +646,11 @@ export default { this.key = opts.key || '' }, onShow() { - const chooseAddress = uni.getStorageSync('chooseAddress') || {} + const chooseAddress = uni.getStorageSync('updateOrderAddress') || {} const addressId = chooseAddress.id || '' // 监听到选择收货地址 if (addressId && this.addressEditOrderId) { - uni.setStorageSync('chooseAddress', {}) + uni.setStorageSync('updateOrderAddress', {}) uni.showModal({ title:'确定修改地址吗?', content: '提交后将进入审核流程,请确认是否继续', @@ -668,7 +668,6 @@ export default { icon: 'success', title: '已提交审核' }) - uni.setStorageSync('sourceAddress', chooseAddress) this.getDetail() }).finally(() => { uni.hideLoading() @@ -798,7 +797,7 @@ export default { this.$yrouter.push({ path:'/pages/user/address/AddressManagement/index', query: { - choosMode: 1 + choosMode: 4 } }) }, diff --git a/pages/user/address/AddressManagement/index.vue b/pages/user/address/AddressManagement/index.vue index b925130..22eddaa 100644 --- a/pages/user/address/AddressManagement/index.vue +++ b/pages/user/address/AddressManagement/index.vue @@ -150,6 +150,11 @@ export default { uni.setStorageSync('giftChooseAddress', item) this.$yrouter.back() } + // 来源修改订单地址(复用订单创建页的choosMode但避免污染chooseAddress) + if (this.choosMode === 4) { + uni.setStorageSync('updateOrderAddress', item) + this.$yrouter.back() + } }, refresh() { this.addressList = []