From 8c1e552e832a7d19ff5aed47855ce8a3b38844d2 Mon Sep 17 00:00:00 2001
From: whyneedname <542399163@qq.com>
Date: Sat, 29 Oct 2022 16:17:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E3=80=81=E7=A0=8D=E4=BB=B7?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0=E4=B8=8B=E6=8B=89=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0;=E5=93=81=E7=89=8C=E8=AF=A6=E6=83=85=E5=93=81?=
 =?UTF-8?q?=E7=89=8C=E5=A4=B4=E5=83=8F=E5=9C=86=E8=A7=92=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=BE=B9=E5=AE=BD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                              | 6 ++++--
 pages/activity/DargainDetails/index.vue | 8 ++++++++
 pages/activity/GroupRule/index.vue      | 4 ++++
 pages/shop/GoodsCon/index.vue           | 2 +-
 pages/shop/IntegralGoodsCon/index.vue   | 2 +-
 pages/shop/brands/brandDetail/index.vue | 2 +-
 6 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/pages.json b/pages.json
index 3492b6f..52ce28d 100644
--- a/pages.json
+++ b/pages.json
@@ -414,7 +414,8 @@
       "path": "pages/activity/DargainDetails/index",
       "style": {
         "navigationBarTitleText": "砍价详情",
-        "navigationStyle": "custom"
+        "navigationStyle": "custom",
+				"enablePullDownRefresh": true
       }
     },
     {
@@ -446,7 +447,8 @@
       "path": "pages/activity/GroupRule/index",
       "style": {
         "navigationBarTitleText": "拼团详情",
-        "navigationStyle": "custom"
+        "navigationStyle": "custom",
+				"enablePullDownRefresh": true
       }
     },
     {
diff --git a/pages/activity/DargainDetails/index.vue b/pages/activity/DargainDetails/index.vue
index 4eb12aa..58f4efd 100644
--- a/pages/activity/DargainDetails/index.vue
+++ b/pages/activity/DargainDetails/index.vue
@@ -325,6 +325,14 @@ export default {
   mounted: function () {
     this.mountedStart()
   },
+	onPullDownRefresh() {
+		this.getBargainShare(0);
+		if (this.bargainUid !== this.userInfo.uid) {
+		  this.getBargainStartUser();
+		}
+		this.getBargainHelpList();
+		uni.stopPullDownRefresh();
+	},
   methods: {
     // 开始处理砍价逻辑
     mountedStart: function () {
diff --git a/pages/activity/GroupRule/index.vue b/pages/activity/GroupRule/index.vue
index 48d4ed2..e21a453 100644
--- a/pages/activity/GroupRule/index.vue
+++ b/pages/activity/GroupRule/index.vue
@@ -209,6 +209,10 @@ export default {
 			imageUrl: this.storeCombination.image
 		}
 	},
+	onPullDownRefresh() {
+		this.getCombinationPink();
+		uni.stopPullDownRefresh();
+	},
   methods: {
 		swiperChange(e) {
 			this.swiperCurrent = e.detail.current;
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index 5ca44b8..7958e3a 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -156,7 +156,7 @@
 				<user-evaluation :reply="reply"></user-evaluation>
 			</view>
 
-			<view class="product-parameter" v-if="storeInfo.parameter">
+			<view class="product-parameter" v-if="storeInfo.parameter.length > 0">
 				<view class="title">商品参数</view>
 				<view :class="'parameter-list ' + (isUnfold?'unfold':'')" :style="isUnfold?'height: auto;':'max-height: 184rpx;'">
 					<view class="parameter-item acea-row" v-for="(item,index) in storeInfo.parameter" :key="index">
diff --git a/pages/shop/IntegralGoodsCon/index.vue b/pages/shop/IntegralGoodsCon/index.vue
index 6515b0e..b8ca2ed 100644
--- a/pages/shop/IntegralGoodsCon/index.vue
+++ b/pages/shop/IntegralGoodsCon/index.vue
@@ -59,7 +59,7 @@
         <user-evaluation :reply="reply"></user-evaluation>
       </view>
 			
-			<view class="product-parameter" v-if="storeInfo.parameter">
+			<view class="product-parameter" v-if="storeInfo.parameter.length > 0">
 				<view class="title">商品参数</view>
 				<view :class="'parameter-list ' + (isUnfold?'unfold':'')" :style="isUnfold?'height: auto;':'max-height: 184rpx;'">
 					<view class="parameter-item acea-row" v-for="(item,index) in storeInfo.parameter" :key="index">
diff --git a/pages/shop/brands/brandDetail/index.vue b/pages/shop/brands/brandDetail/index.vue
index 25eb811..b356d8d 100644
--- a/pages/shop/brands/brandDetail/index.vue
+++ b/pages/shop/brands/brandDetail/index.vue
@@ -217,7 +217,7 @@
 				width: 100%;
 				height: 100%;
 				background: #F5F6F8;
-				border-radius: 16rpx;
+				border-radius: 14rpx;
 			}
 		}
 		.info-box {