添加无货

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,