详情 修改地址 退款

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>
+</style>

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 {

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;'>

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>