From bd1a7db910ec231672a10c33ce19cdcad5b9dd29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Thu, 9 Nov 2023 15:20:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesB/CommodityDetails/CommodityDetails.vue | 23 +++++++++++---------
 pagesB/ProductList/ProductList.vue           |  6 ++---
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/pagesB/CommodityDetails/CommodityDetails.vue b/pagesB/CommodityDetails/CommodityDetails.vue
index 44b7a48..7d9c8dc 100644
--- a/pagesB/CommodityDetails/CommodityDetails.vue
+++ b/pagesB/CommodityDetails/CommodityDetails.vue
@@ -731,10 +731,10 @@
 						if (list.length >= 1) {
 							this.updata.receiver = list[0].receiveName
 							var areaName
-							if(res.data[0].areaName){
-								areaName=res.data[0].areaName
-							}else{
-								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
@@ -743,14 +743,14 @@
 
 							this.updata.receiver = res.data[0].receiveName
 							var areaName
-							if(res.data[0].areaName){
-								areaName=res.data[0].areaName
+							if (res.data[0].areaName) {
+								areaName = res.data[0].areaName
 
-							}else{
-								areaName=""
+							} else {
+								areaName = ""
 
 							}
-							this.updata.receiveAddress =areaName + res.data[0].receiveAddress
+							this.updata.receiveAddress = areaName + res.data[0].receiveAddress
 							this.updata.phone = res.data[0].receivePhone
 							this.userid = res.data[0].id
 						}
@@ -777,6 +777,9 @@
 			this.baseurl = baseurl;
 			this.usershow = false;
 			this.loginFlag = false
+			this.couponId = null
+			this.Paidinprice = null
+			this.coupon = null
 			const value = uni.getStorageSync('patientId');
 			if (value) {
 				AppIdentification(value).then(res => {
@@ -853,4 +856,4 @@
 
 <style lang="scss">
 	@import "./CommodityDetailsstyle.scss";
-</style>
+</style>
\ No newline at end of file
diff --git a/pagesB/ProductList/ProductList.vue b/pagesB/ProductList/ProductList.vue
index 71b7f61..e3b313d 100644
--- a/pagesB/ProductList/ProductList.vue
+++ b/pagesB/ProductList/ProductList.vue
@@ -20,9 +20,7 @@
 					分类
 				</view>
 			</view>
-
 		</view>
-
 		<!-- <view class="inputs">
 			<i class="icon"></i>
 			<input v-model="goodsName" type="text" name="" id="" class="input" placeholder="请输入商品名称">
@@ -375,7 +373,7 @@
 		.productlist {
 			width: 100%;
 			margin: 0 auto;
-			padding: 20rpx 0 0 0;
+			padding: 100rpx 0 0 0;
 			display: flex;
 			flex-wrap: wrap;
 			justify-content: space-evenly;
@@ -426,4 +424,4 @@
 			}
 		}
 	}
-</style>
+</style>
\ No newline at end of file