From b2ca9716b7879bac0bae0bf7eeacf271ba242449 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Fri, 3 Nov 2023 11:48:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=BE=E7=BD=AE=E6=94=B6?=
 =?UTF-8?q?=E8=B4=A7=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/users/order_confirm/index.vue | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

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`,
+          });
 				}
 			},
 			/**