From 375b5b1978dabac75d6f6f6ddf5636c26dd92c8a Mon Sep 17 00:00:00 2001 From: LinCyJang Date: Mon, 2 Jun 2025 12:21:23 +0800 Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A3815=20=E3=80=90=E5=95=86=E5=9F=8E?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E8=B4=AD=E4=B9=B0=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=87=BA=E7=8E=B0=E5=BC=82=E5=B8=B8=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/MyOrder/index.vue | 1 + pages/order/OrderDetails/index.vue | 12 ++-- pages/order/OrderSubmission/index.vue | 56 ++++++++++--------- .../user/address/AddressManagement/index.vue | 2 +- 4 files changed, 39 insertions(+), 32 deletions(-) diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue index e895d0d..ffdf697 100644 --- a/pages/order/MyOrder/index.vue +++ b/pages/order/MyOrder/index.vue @@ -280,6 +280,7 @@ export default { icon: 'success', title: '修改成功！' }) + uni.setStorageSync('sourceAddress', chooseAddress) _this.changeType() }).finally(() => { uni.hideLoading() diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue index 4731c77..85fb753 100644 --- a/pages/order/OrderDetails/index.vue +++ b/pages/order/OrderDetails/index.vue @@ -502,9 +502,10 @@ export default { ...mapGetters(["userInfo"]) }, onShow() { - const _this = this const chooseAddress = uni.getStorageSync('chooseAddress') || {} const addressId = chooseAddress.id || '' + console.log(addressId, 'addressId'); + // 监听到选择收货地址 if (addressId) { uni.setStorageSync('chooseAddress', {}) @@ -519,13 +520,14 @@ export default { uni.showLoading() editAddress({ addressId, - orderId: _this.orderInfo.orderId + orderId: this.orderInfo.orderId }).then(res => { uni.showToast({ icon: 'success', title: '修改成功！' }) - _this.getDetail() + uni.setStorageSync('sourceAddress', chooseAddress) + this.getDetail() }).finally(() => { uni.hideLoading() }) @@ -536,8 +538,8 @@ export default { } }) } else { - _this.id = _this.$yroute.query.id; - _this.getDetail(); + this.id = this.$yroute.query.id; + this.getDetail(); } }, // inject: ["app"], diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue index b42961c..c7bb6e2 100644 --- a/pages/order/OrderSubmission/index.vue +++ b/pages/order/OrderSubmission/index.vue @@ -414,6 +414,31 @@ export default { _this.getCartInfo() //获取用户信息 _this.$store.dispatch("getUser", true) + // 监听到选择收货地址 + const chooseAddress = uni.getStorageSync('chooseAddress') || {} + const sourceAddress = uni.getStorageSync('sourceAddress') || uni.getStorageSync('chooseAddress') + // 监听到选择收货地址 + if (chooseAddress.id && (chooseAddress.id !== sourceAddress.id)) { + uni.showModal({ + title:'确定修改地址吗?', + content: '', + showCancel: true, + cancelText: '取消', + confirmText: '确认', + success: (res) => { + if(res.confirm) { + _this.addressInfo = chooseAddress + // 地址切换也要重新计算一下 + uni.setStorageSync('sourceAddress', _this.addressInfo || '') + _this.computedPrice('onLoad chooseAddress') + } + }, + complete: () => { + uni.hideLoading() + uni.setStorageSync('chooseAddress', {}) + } + }) + } }, methods: { @@ -505,32 +530,11 @@ export default { if(_this.$yroute.query.address !== undefined ) { _this.addressInfo = JSON.parse(_this.$yroute.query.address) || {} } else { - _this.addressInfo = uni.getStorageSync('chooseAddress') ? uni.getStorageSync('chooseAddress') : data.addressInfo || {} - } - const chooseAddress = uni.getStorageSync('chooseAddress') || {} - const sourceAddress = uni.getStorageSync('sourceAddress') || data.addressInfo || uni.getStorageSync('chooseAddress') - // 监听到选择收货地址 - if (chooseAddress.id && (chooseAddress.id !== sourceAddress.id)) { - uni.showModal({ - title:'确定修改地址吗?', - content: '', - showCancel: true, - cancelText: '取消', - confirmText: '确认', - success: (res) => { - if(res.confirm) { - _this.addressInfo = chooseAddress - // 地址切换也要重新计算一下 - uni.setStorageSync('sourceAddress', _this.addressInfo || '') - _this.computedPrice('onLoad chooseAddress') - } - }, - complete: () => { - uni.hideLoading() - // uni.setStorageSync('chooseAddress', {}) - } - }) + _this.addressInfo = uni.getStorageSync('sourceAddress') || data.addressInfo || {} + console.log(data.addressInfo); + } + _this.systemStore = data.systemStore || {} _this.storeSelfMention = data.storeSelfMention _this.computedPrice() @@ -684,7 +688,7 @@ export default { storeId: this.storeItems ? this.storeItems.id : this.systemStore.id, ...from } - + uni.setStorageSync('chooseAddress', {}) //余额支付的支付密码 if (this.active == 'yue') { params.passwordPay = this.payPassword; diff --git a/pages/user/address/AddressManagement/index.vue b/pages/user/address/AddressManagement/index.vue index c782490..e954dc9 100644 --- a/pages/user/address/AddressManagement/index.vue +++ b/pages/user/address/AddressManagement/index.vue @@ -172,7 +172,7 @@ export default { this.loadend = res.data.length < this.limit this.page = this.page + 1 if (this.choosMode === 1) { - this.currentId = uni.getStorageSync('chooseAddress') ? uni.getStorageSync('chooseAddress').id : this.addressList.find(e => e.isDefault === 1) ? this.addressList.find(e => e.isDefault === 1).id : null + this.currentId = uni.getStorageSync('sourceAddress') ? uni.getStorageSync('sourceAddress').id : this.addressList.find(e => e.isDefault === 1) ? this.addressList.find(e => e.isDefault === 1).id : null } // 来源购物车 if (this.choosMode === 2) {