diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue index f5a8ecc..aad800e 100644 --- a/pages/users/order_confirm/index.vue +++ b/pages/users/order_confirm/index.vue @@ -718,13 +718,6 @@ // this.getAgreement(); let _this = this this.textareaStatus = true; - if (this.isLogin && this.toPay == false && !this.orderPay) { - this.getaddressInfo(); - this.$nextTick(function() { - this.$refs.addressWindow.getAddressList(); - this.getUserInfo() - }) - } uni.setStorage({ key: 'invoice_Data', data: {}, @@ -744,6 +737,13 @@ uni.$off('handClick'); }) that.invoice.invoice = false + if (this.isLogin && this.toPay == false && !this.orderPay) { + this.getaddressInfo(); + this.$nextTick(function() { + this.$refs.addressWindow.getAddressList(); + this.getUserInfo() + }) + } }, /** * 生命周期函数--监听页面隐藏 @@ -1188,12 +1188,16 @@ if (that.addressInfo.real_name) { that.textareaStatus = false; that.address.address = true; - that.pagesUrl = '/pages/users/user_address/index?cartId=' + this.cartId + '&pinkId=' + this - .pinkId + '&couponId=' + this.couponId; + // that.pagesUrl = '/pages/users/user_address/index?cartId=' + this.cartId + '&pinkId=' + this + // .pinkId + '&couponId=' + this.couponId; + that.pagesUrl = '/pages/users/user_address_list/index' } else { - uni.navigateTo({ - url: `/pages/users/user_address/index?cartId=${this.cartId}`, - }); + // uni.navigateTo({ + // url: `/pages/users/user_address/index?cartId=${this.cartId}`, + // }); + uni.navigateTo({ + url: `pages/users/user_address_list/index`, + }); } }, /**