From 31970ceda925e2d7b55f8ba04b4c9877913a39e8 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 9 Sep 2023 22:27:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E4=BD=A3=EF=BC=9A=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=EF=BC=8C=E5=B1=95=E7=A4=BA=E5=88=86=E4=BD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/shareRedPackets/index.vue | 17 +++++++++++++++--
 pages/goods_details/index.vue        | 12 ++----------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/components/shareRedPackets/index.vue b/components/shareRedPackets/index.vue
index 5f7522ed..57b76c6f 100644
--- a/components/shareRedPackets/index.vue
+++ b/components/shareRedPackets/index.vue
@@ -6,7 +6,15 @@
 	      <image src='../../static/images/red-packets.png'></image>
 	      <view class='text font-color'>
 	        <view>会员分享返</view>
-	        <view class='money'><text class='label'>￥</text>{{sharePacket.priceName}}</view>
+	        <view class='money' v-if="sharePacket.brokerageMinPrice && 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) }}
+          </view>
+          <view class='money' v-else-if="sharePacket.brokerageMaxPrice">
+            <text class='label'>￥</text>{{ fen2yuan(sharePacket.brokerageMaxPrice) }}
+          </view>
 	        <view class='tip'>下单即返佣金</view>
 	        <view class='shareBut'>立即分享</view>
 	      </view>
@@ -15,6 +23,7 @@
 </template>
 
 <script>
+  import * as Util from '@/utils/util.js';
 	export default {
 		props: {
       sharePacket: {
@@ -22,7 +31,8 @@
         default: function() {
           return {
             enabled: true,
-            priceName:'' // 金额
+            brokerageMinPrice: undefined,
+            brokerageMaxPrice: undefined,
           }
         }
       }
@@ -38,6 +48,9 @@
       },
       goShare:function(){
         this.$emit('listenerActionSheet');
+      },
+      fen2yuan(price) {
+        return Util.fen2yuan(price)
       }
 		}
 	}
diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue
index a500e2bb..57d20851 100644
--- a/pages/goods_details/index.vue
+++ b/pages/goods_details/index.vue
@@ -299,8 +299,6 @@
   // #ifdef MP
 	import { base64src } from '@/utils/base64src.js'
 	import { getQrcode } from '@/api/api.js';
-  import {getActivityListBySpuIds} from "../../api/promotion/activity";
-  import {setActivityList} from "../../utils/product";
 	// #endif
 	const app = getApp();
 	export default {
@@ -373,7 +371,7 @@
         posterbackgd: '/static/images/posterbackgd.png',  // 海报的背景，用于海报的生成
         storeImage: '', // 下载商品图片后的文件地址
         sharePacket: { // 分销弹出信息
-          enabled: true, // 默认不显示
+          enabled: false, // 默认不显示
         },
         actionSheetHidden: true, // 微信小程序的右上角分享的弹出
 
@@ -513,10 +511,6 @@
           this.$set(this.attr, 'properties', ProductUtil.convertProductPropertyList(skus));
           this.$set(this, 'skuMap', ProductUtil.convertProductSkuMap(skus));
 
-          // 设置分销相关变量 // TODO 芋艿：待接入
-          // this.$set(this.sharePacket, 'priceName', res.data.priceName);
-          // this.$set(this.sharePacket, 'enabled', Math.floor(res.data.priceName) === 0);
-
           // 设置营销活动
           PromotionActivityApi.getActivityListBySpuId(this.id).then(res => {
             let activityList = res.data;
@@ -570,9 +564,7 @@
       },
       getBrokeragePrice: function() {
         BrokerageAPI.getProductBrokeragePrice(this.id).then(res => {
-          // this.sharePacket = res.data
-          // console.log(this.sharePacket)
-          this.$set(this.sharePacket, 'isState', false);
+          this.sharePacket = res.data
         });
       },
       /**