From 1887182b95e03740042bf4070a36012189c5feba Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Wed, 8 Nov 2023 13:55:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=20=E9=80=80=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesB/CommodityDetails/CommodityDetails.vue | 22 ++++++++++++++++++--
 pagesB/ProductList/ProductList.vue           | 10 +++++----
 pagesB/modifyAddress/modifyAddress.vue       |  3 ++-
 pagesB/refundType/refundType.vue             | 12 ++++++++---
 4 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/pagesB/CommodityDetails/CommodityDetails.vue b/pagesB/CommodityDetails/CommodityDetails.vue
index 070f7b5..44b7a48 100644
--- a/pagesB/CommodityDetails/CommodityDetails.vue
+++ b/pagesB/CommodityDetails/CommodityDetails.vue
@@ -86,6 +86,7 @@
 									</view>
 									<view class="address" v-if='userid'>
 										{{updata.receiveAddress}}
+										<!-- {{updata.receiveAddress}} -->
 									</view>
 								</span>
 								<view class="namephone" v-else>
@@ -719,20 +720,37 @@
 			// 收件人
 			goodsList() {
 				goodPatientInfo(this.updata.patientId).then(res => {
+					console.log(res)
 					// res.data.forEach(e => {
 					// 	e.address = e.provinceName + e.cityName + e.regionName + e.streetName + e
 					// 		.receiveAddress
 					// })
 					if (res.data.length > 0) {
 						var list = res.data.filter(e => e.defaultAddressFlag == 1)
+						console.log(list)
 						if (list.length >= 1) {
 							this.updata.receiver = list[0].receiveName
+							var areaName
+							if(res.data[0].areaName){
+								areaName=res.data[0].areaName
+							}else{
+								areaName=""
+							}
 							this.updata.receiveAddress = list[0].areaName + list[0].receiveAddress
 							this.updata.phone = list[0].receivePhone
 							this.userid = list[0].id
 						} else {
+
 							this.updata.receiver = res.data[0].receiveName
-							this.updata.receiveAddress = res.data[0].areaName + res.data[0].receiveAddress
+							var areaName
+							if(res.data[0].areaName){
+								areaName=res.data[0].areaName
+
+							}else{
+								areaName=""
+
+							}
+							this.updata.receiveAddress =areaName + res.data[0].receiveAddress
 							this.updata.phone = res.data[0].receivePhone
 							this.userid = res.data[0].id
 						}
@@ -835,4 +853,4 @@
 
 <style lang="scss">
 	@import "./CommodityDetailsstyle.scss";
-</style>
\ No newline at end of file
+</style>
diff --git a/pagesB/ProductList/ProductList.vue b/pagesB/ProductList/ProductList.vue
index e934f8b..71b7f61 100644
--- a/pagesB/ProductList/ProductList.vue
+++ b/pagesB/ProductList/ProductList.vue
@@ -240,7 +240,8 @@
 
 	.app {
 		padding: 0;
-::v-deep .u-navbar-placeholder {
+
+		::v-deep .u-navbar-placeholder {
 			background-color: #F7F5F5;
 			z-index: 999;
 		}
@@ -301,9 +302,10 @@
 		}
 
 
-		.top{
+		.top {
 			position: relative;
 			width: 100%;
+
 			.fenlei {
 				width: 20%;
 				display: inline-block;
@@ -315,8 +317,8 @@
 				color: #000000;
 				position: absolute;
 				right: 0;
-				    // top: 67px;
-				    z-index: 11111;
+				// top: 67px;
+				z-index: 11111;
 				font-size: 32rpx;
 
 				view {
diff --git a/pagesB/modifyAddress/modifyAddress.vue b/pagesB/modifyAddress/modifyAddress.vue
index 4744555..6c85d7b 100644
--- a/pagesB/modifyAddress/modifyAddress.vue
+++ b/pagesB/modifyAddress/modifyAddress.vue
@@ -7,7 +7,8 @@
 					{{item.receivePhone}}
 				</view>
 				<view class="item detail" @tap='goorder(item)'>
-					{{item.areaName}}{{item.receiveAddress}}
+					<span v-if="item.areaName">{{item.areaName}}</span>
+					<span v-if="item.receiveAddress">{{item.receiveAddress}}</span>
 				</view>
 				<view class="item detail" style="border: none;font-size: 32rpx;margin-top: 40rpx;">
 					<view class="" style='width: 50%;display: inline-block;'>
diff --git a/pagesB/refundType/refundType.vue b/pagesB/refundType/refundType.vue
index 6bc5845..c1c5f29 100644
--- a/pagesB/refundType/refundType.vue
+++ b/pagesB/refundType/refundType.vue
@@ -121,10 +121,16 @@
 			},
 		},
 		onLoad(options) {
-			// console.log(options,'777')
+			if(options.order){
+				this.order = JSON.parse(options.order)
+				this.order.id = this.order.goodsOrderId
+			}else if(options.list){
+				this.order = JSON.parse(options.list)
+				this.order.id = this.order.goodsOrderId
+
+			}
+			// console.log(this.order,'777')
 			this.baseurl = baseurl
-			this.order = JSON.parse(options.list)
-			this.order.id = this.order.goodsOrderId
 		}
 	}
 </script>