From ab709267be58bcd142a031e3882591d9053e071e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=97=B4=E8=B4=A7?= <252048765@qq.com>
Date: Wed, 18 Sep 2024 18:11:54 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E6=BB=A1=E5=87=8F=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/index.vue   | 5 +++++
 sheep/hooks/useGoods.js | 9 +--------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/pages/goods/index.vue b/pages/goods/index.vue
index c78ae242..c6031b1d 100644
--- a/pages/goods/index.vue
+++ b/pages/goods/index.vue
@@ -83,6 +83,11 @@
 										<text v-if="(state.rewardActivity.ruleDescriptions[0])[4]">券 </text>
 										{{(state.rewardActivity.ruleDescriptions[0])[1]}}
 									</view>
+									<view v-if="state.rewardActivity && state.rewardActivity.id > 0"
+										class="tag ss-m-r-10" @tap="onOpenActivity">
+										<text v-if="(state.rewardActivity.ruleDescriptions[0])[1]"></text>
+										{{(state.rewardActivity.ruleDescriptions[0])[1]}}
+									</view>
 								</view>
 							</div>
 							<!-- 领取优惠劵的按钮 -->
diff --git a/sheep/hooks/useGoods.js b/sheep/hooks/useGoods.js
index 5c12f26a..a8bf1b26 100644
--- a/sheep/hooks/useGoods.js
+++ b/sheep/hooks/useGoods.js
@@ -418,16 +418,12 @@ export function handeleData(array) {
 			value: []
 		},
 		{
-			name: '满送',
+			name: '赠品',
 			value: []
 		},
 		{
 			name: '包邮',
 			value: []
-		},
-		{
-			name: '赠品',
-			value: []
 		}
 	]);
 
@@ -444,9 +440,6 @@ export function handeleData(array) {
 				case 3:
 					array2.value[2].value.push(value); // 包邮
 					break;
-				case 4:
-					array2.value[3].value.push(value); // 赠品
-					break;
 				default:
 					break;
 			}