From c4afe65700378c6a8085a51dfb487289dd748a51 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Tue, 16 Apr 2024 10:49:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A0=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/sureOrder/index.vue | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pages/sureOrder/index.vue b/pages/sureOrder/index.vue
index 78d7685..68dd74d 100644
--- a/pages/sureOrder/index.vue
+++ b/pages/sureOrder/index.vue
@@ -441,7 +441,7 @@
 				setting: {},
 				timer: "",
 				distance_unit: "",
-				stockValue: '无货',
+				stockValue: '有货',
 				addressResult: {
 					province: '江苏省',
 					city: '南京市',
@@ -494,16 +494,21 @@
 						num: item.total_num
 					})
 				});
-				that.addressResult.province = order.address ? order.address.region.province : '江苏省'
-				that.addressResult.city = order.address ? order.address.region.city : '南京市'
-				that.addressResult.district = order.address ? order.address.region.region : '玄武区'
+				if(that.curDelivery == DeliveryTypeEnum.EXTRACT.value){
+					that.addressResult.province = order.extractShop ? order.extractShop.region.province : '江苏省'
+					that.addressResult.city = order.extractShop ? order.extractShop.region.city : '南京市'
+					that.addressResult.district = order.extractShop ? order.extractShop.region.region : '玄武区'
+				}else{
+					that.addressResult.province = order.address ? order.address.region.province : '江苏省'
+					that.addressResult.city = order.address ? order.address.region.city : '南京市'
+					that.addressResult.district = order.address ? order.address.region.region : '玄武区'
+				}
 				let params = {
 					list: list,
 					province: this.addressResult.province,
 					city: this.addressResult.city,
 					district: this.addressResult.district
 				}
-				console.log(params)
 				let {
 					status,
 					message,