From b076f61c5880607b9e697d0737f42266b49c34fd Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Sun, 24 Sep 2023 22:27:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=94=80=EF=BC=9A=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E5=95=86=E5=93=81=EF=BC=8C=E8=AE=A1=E7=AE=97=E6=8E=A8=E5=B9=BF?=
 =?UTF-8?q?=E5=91=98=E5=8F=AF=E4=BB=A5=E5=BE=97=E5=88=B0=E7=9A=84=E4=BD=A3?=
 =?UTF-8?q?=E9=87=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/shareRedPackets/index.vue               | 12 ++++++++----
 pages/activity/goods_combination_details/index.vue |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/components/shareRedPackets/index.vue b/components/shareRedPackets/index.vue
index 57b76c6f..d3298b93 100644
--- a/components/shareRedPackets/index.vue
+++ b/components/shareRedPackets/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class='sharing-packets' :class='!sharePacket.enabled ? "on":""'>
+	<view class='sharing-packets' :class='!enabled ? "on":""'>
 	   <view class='iconfont icon-guanbi' @click="closeShare"></view>
 	   <view class='line'></view>
 	   <view class='sharing-con' @click='goShare'>
@@ -7,7 +7,7 @@
 	      <view class='text font-color'>
 	        <view>会员分享返</view>
 	        <view class='money' v-if="sharePacket.brokerageMinPrice && sharePacket.brokerageMaxPrice">
-            <text class='label'>￥</text>{{ fen2yuan(sharePacket.brokerageMinPrice) }} ~ {{ fen2yuan(sharePacket.brokerageMaxPrice) }}
+            <text class='label'>￥</text>{{ fen2yuan(sharePacket.brokerageMinPrice) }}~{{ fen2yuan(sharePacket.brokerageMaxPrice) }}
           </view>
           <view class='money' v-else-if="sharePacket.brokerageMinPrice">
             <text class='label'>￥</text>{{ fen2yuan(sharePacket.brokerageMinPrice) }}
@@ -41,7 +41,11 @@
 			return {
 			};
 		},
-
+    computed: {
+      enabled() {
+        return this.sharePacket.enabled && (this.sharePacket.brokerageMinPrice || this.sharePacket.brokerageMaxPrice)
+      }
+    },
 		methods: {
 			closeShare:function(){
         this.$emit('closeChange');
@@ -64,7 +68,7 @@
 	.sharing-packets .sharing-con{width:187rpx;height:210rpx;position:relative;}
 	.sharing-packets .sharing-con image{width:100%;height:100%;}
 	.sharing-packets .sharing-con .text{position:absolute;top:30rpx;font-size:20rpx;width:100%;text-align:center;}
-	.sharing-packets .sharing-con .text .money{font-size:32rpx;font-weight:bold;margin-top:5rpx;}
+	.sharing-packets .sharing-con .text .money{font-size:32rpx;font-weight:bold;margin-top:5rpx;white-space: nowrap}
 	.sharing-packets .sharing-con .text .money .label{font-size:20rpx;}
 	.sharing-packets .sharing-con .text .tip{font-size:18rpx;color:#999;margin-top:5rpx;}
 	.sharing-packets .sharing-con .text .shareBut{font-size:22rpx;color:#fff;margin-top:18rpx;height:50rpx;line-height:50rpx;}
diff --git a/pages/activity/goods_combination_details/index.vue b/pages/activity/goods_combination_details/index.vue
index ad7dde14..664b7f71 100644
--- a/pages/activity/goods_combination_details/index.vue
+++ b/pages/activity/goods_combination_details/index.vue
@@ -572,7 +572,7 @@
         })
       },
       getBrokeragePrice: function() {
-        BrokerageAPI.getProductBrokeragePrice(this.id).then(res => {
+        BrokerageAPI.getProductBrokeragePrice(this.activity.spuId).then(res => {
           this.sharePacket = res.data
         });
       },