From ad4eb04f49b75685baaaa0b22c9e2ff88e0c80d2 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 9 Sep 2023 22:19:12 +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=E5=A2=9E=E5=8A=A0=E7=BB=91=E5=AE=9A=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/public.js                        |  4 ++--
 api/trade/brokerage.js               |  7 +++++++
 components/shareRedPackets/index.vue |  4 ++--
 config/app.js                        |  4 ++--
 pages/goods_details/index.vue        | 26 +++++++++++++++++---------
 5 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/api/public.js b/api/public.js
index 91144d0e..be4d4843 100644
--- a/api/public.js
+++ b/api/public.js
@@ -27,7 +27,7 @@ export function wechatAuth(code, spread) {
 
 /**
  * 获取登录授权login
- * 
+ *
 */
 export function getLogo()
 {
@@ -113,4 +113,4 @@ export function appleLogin(data) {
  */
 export function iosBinding(data) {
 	return request.post("ios/binding/phone", data, { noAuth : true });
-}
\ No newline at end of file
+}
diff --git a/api/trade/brokerage.js b/api/trade/brokerage.js
index bd344a37..40114775 100644
--- a/api/trade/brokerage.js
+++ b/api/trade/brokerage.js
@@ -51,3 +51,10 @@ export function createBrokerageWithdraw(data) {
 export function getBrokerageRecordPage(data) {
   return request.get('app-api/trade/brokerage-record/page', data);
 }
+
+// 获得商品的分销金额
+export function getProductBrokeragePrice(spuId) {
+  return request.get('app-api/trade/brokerage-record/get-product-brokerage-price', {
+    spuId
+  });
+}
diff --git a/components/shareRedPackets/index.vue b/components/shareRedPackets/index.vue
index becb1ed8..5f7522ed 100644
--- a/components/shareRedPackets/index.vue
+++ b/components/shareRedPackets/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class='sharing-packets' :class='sharePacket.isState ? "on":""'>
+	<view class='sharing-packets' :class='!sharePacket.enabled ? "on":""'>
 	   <view class='iconfont icon-guanbi' @click="closeShare"></view>
 	   <view class='line'></view>
 	   <view class='sharing-con' @click='goShare'>
@@ -21,7 +21,7 @@
         type: Object,
         default: function() {
           return {
-            isState: true,
+            enabled: true,
             priceName:'' // 金额
           }
         }
diff --git a/config/app.js b/config/app.js
index 9258bde2..4f38a907 100644
--- a/config/app.js
+++ b/config/app.js
@@ -1,6 +1,6 @@
 
-// let domain = 'http://apif.java.crmeb.net'
-let domain = 'http://127.0.0.1:48080'
+let domain = 'http://apif.java.crmeb.net'
+// let domain = 'http://127.0.0.1:48080'
 
 module.exports = {
 	// 请求域名 格式： https://您的域名
diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue
index 9050fcea..a500e2bb 100644
--- a/pages/goods_details/index.vue
+++ b/pages/goods_details/index.vue
@@ -293,6 +293,7 @@
   import * as CouponApi from '@/api/promotion/coupon.js';
   import * as PromotionActivityApi from '@/api/promotion/activity.js';
   import * as TradeCartApi from '@/api/trade/cart.js';
+  import * as BrokerageAPI from '@/api/trade/brokerage.js'
   import * as Util from '@/utils/util.js';
   import * as ProductUtil from '@/utils/product.js';
   // #ifdef MP
@@ -372,7 +373,7 @@
         posterbackgd: '/static/images/posterbackgd.png',  // 海报的背景，用于海报的生成
         storeImage: '', // 下载商品图片后的文件地址
         sharePacket: { // 分销弹出信息
-          isState: true, // 默认不显示
+          enabled: true, // 默认不显示
         },
         actionSheetHidden: true, // 微信小程序的右上角分享的弹出
 
@@ -421,11 +422,11 @@
 
       // #ifdef MP || APP-PLUS
       // 小程序链接进入获取绑定关系id
-      // TODO 芋艿：分销？？？
+      // 绑定分销关系
       setTimeout(()=>{
         if(options.spread){
           app.globalData.spread = options.spread;
-          spread(options.spread).then(res => {})
+          BrokerageAPI.bindBrokerageUser(options.spread).then(res => {})
         }
       },2000)
       // #endif
@@ -448,9 +449,9 @@
 					let mapeMpQrCodeValue = this.$util.formatMpQrCodeData(qrCodeValue);
 					app.globalData.spread = mapeMpQrCodeValue.spread;
 					this.id = mapeMpQrCodeValue.id;
-					// TODO 芋艿：code 是啥
+					// 绑定分销用户
           setTimeout(()=>{
-						spread(mapeMpQrCodeValue.spread).then(res => {}).catch(res => {})
+            BrokerageAPI.bindBrokerageUser(mapeMpQrCodeValue.spread).then(res => {}).catch(res => {})
 					},2000)
 				} else {
 					this.id = options.id;
@@ -513,8 +514,8 @@
           this.$set(this, 'skuMap', ProductUtil.convertProductSkuMap(skus));
 
           // 设置分销相关变量 // TODO 芋艿：待接入
-          this.$set(this.sharePacket, 'priceName', res.data.priceName);
-          this.$set(this.sharePacket, 'isState', Math.floor(res.data.priceName) === 0);
+          // 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 => {
@@ -532,6 +533,7 @@
           if (this.isLogin) {
             this.getCartCount();
             this.isFavoriteExists();
+            this.getBrokeragePrice();
             // #ifdef H5
             this.make();
             this.ShareInfo();
@@ -566,6 +568,13 @@
           });
         })
       },
+      getBrokeragePrice: function() {
+        BrokerageAPI.getProductBrokeragePrice(this.id).then(res => {
+          // this.sharePacket = res.data
+          // console.log(this.sharePacket)
+          this.$set(this.sharePacket, 'isState', false);
+        });
+      },
       /**
        * 查找默认选中的 sku，设置到 attr.productSelect 中
        *
@@ -698,7 +707,6 @@
         TradeCartApi.addCart({
           count: sku.cart_num,
           skuId: sku.id,
-          addStatus: true // TODO 芋艿：去掉 addStatus 字段
         }).then(res => {
           // 关闭 attr 组件
           this.attr.cartAttr = false;
@@ -1191,7 +1199,7 @@
        * 关闭分销的弹窗
        */
       closeChange: function() {
-        this.$set(this.sharePacket, 'isState', true);
+        this.$set(this.sharePacket, 'enabled', false);
       },
 
       // ========== 顶部 nav 相关的方法 ==========