diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue index 8c28a1e..a0c8fbe 100644 --- a/pages/order/OrderSubmission/index.vue +++ b/pages/order/OrderSubmission/index.vue @@ -413,33 +413,11 @@ export default { _this.getCartInfo() //获取用户信息 _this.$store.dispatch("getUser", true) - const chooseAddress = uni.getStorageSync('chooseAddress') || {} - // 监听到选择收货地址 - if (chooseAddress.id) { - uni.showModal({ - title:'确定修改地址吗?', - content: '', - showCancel: true, - cancelText: '取消', - confirmText: '确认', - success: (res) => { - if(res.confirm) { - _this.addressInfo = chooseAddress - // 地址切换也要重新计算一下 - _this.computedPrice('onLoad chooseAddress') - } - }, - complete: () => { - uni.hideLoading() - // uni.setStorageSync('chooseAddress', {}) - } - }) - } + }, methods: { isNullOrEmpty, couponMax(e) { - console.log(e, 'dxdhkasjhdajks'); this.couponTitle = e.couponTitle this.couponId = this.$yroute.query.couponId || uni.getStorageSync('couponId') || 0 }, @@ -528,8 +506,30 @@ export default { } 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.systemStore = data.systemStore || {} _this.storeSelfMention = data.storeSelfMention _this.computedPrice()