From 2dfe61503fd03da5c347f11a8be82aa00eea97e9 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Sat, 25 May 2024 22:20:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=B7=E6=8A=A5=EF=BC=9A=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=A0=81=EF=BC=88=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=89=8D=E7=BC=80=20data:image/png;base64,=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/commission/index.vue                    | 17 +++++++++---
 sheep/api/trade/brokerage.js                  |  8 ++++++
 .../canvas-poster/poster/goods.js             |  2 +-
 .../canvas-poster/poster/groupon.js           |  2 +-
 .../canvas-poster/poster/index.js             | 27 -------------------
 .../canvas-poster/poster/user.js              |  2 +-
 .../s-share-modal/s-share-modal.vue           |  1 +
 .../platform/provider/wechat/openPlatform.js  |  2 +-
 sheep/platform/share.js                       |  4 ++-
 9 files changed, 29 insertions(+), 36 deletions(-)

diff --git a/pages/commission/index.vue b/pages/commission/index.vue
index 94b4121b..73c1eb7a 100644
--- a/pages/commission/index.vue
+++ b/pages/commission/index.vue
@@ -1,6 +1,6 @@
 <!-- 分销中心  -->
 <template>
-	<s-layout navbar="inner" class="index-wrap" title="分销中心" :bgStyle="bgStyle" onShareAppMessage>
+	<s-layout navbar="inner" class="index-wrap" title="分销中心" :bgStyle="bgStyle" :onShareAppMessage="shareInfo">
 		<!-- 分销商信息 -->
 		<commission-info />
 		<!-- 账户信息 -->
@@ -16,14 +16,23 @@
 </template>
 
 <script setup>
-	import { reactive } from 'vue';
+  import { computed } from 'vue';
 	import commissionInfo from './components/commission-info.vue';
 	import accountInfo from './components/account-info.vue';
 	import commissionLog from './components/commission-log.vue';
 	import commissionMenu from './components/commission-menu.vue';
 	import commissionAuth from './components/commission-auth.vue';
+  import sheep from '@/sheep';
 
-	const state = reactive({});
+  const shareInfo = computed(() => {
+    return sheep.$platform.share.getShareInfo({
+      params: {
+        page: '6',
+      },
+    }, {
+      type: 'user',
+    });
+  });
 
 	const bgStyle = {
 		color: '#F7D598',
@@ -34,4 +43,4 @@
 	:deep(.page-main) {
 		background-size: 100% 100% !important;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/sheep/api/trade/brokerage.js b/sheep/api/trade/brokerage.js
index f7ac9866..bc948cf6 100644
--- a/sheep/api/trade/brokerage.js
+++ b/sheep/api/trade/brokerage.js
@@ -1,6 +1,14 @@
 import request from '@/sheep/request';
 
 const BrokerageApi = {
+  // 绑定推广员
+  bindBrokerageUser: (data)=>{
+    return request({
+      url: '/trade/brokerage-user/bind',
+      method: 'PUT',
+      data
+    });
+  },
   // 获得个人分销信息
   getBrokerageUser: () => {
     return request({
diff --git a/sheep/components/s-share-modal/canvas-poster/poster/goods.js b/sheep/components/s-share-modal/canvas-poster/poster/goods.js
index adca6f79..27e27470 100644
--- a/sheep/components/s-share-modal/canvas-poster/poster/goods.js
+++ b/sheep/components/s-share-modal/canvas-poster/poster/goods.js
@@ -5,7 +5,7 @@ import { formatImageUrlProtocol } from './index';
 const goods = async (poster) => {
   const width = poster.width;
   const userInfo = sheep.$store('user').userInfo;
-  const wxa_qrcode = (await third.wechat.getWxacode(poster.shareInfo.path, poster.shareInfo.query)).data;
+  const wxa_qrcode = 'data:image/png;base64,' + (await third.wechat.getWxacode(poster.shareInfo.path, poster.shareInfo.query)).data;
   return [
     {
       type: 'image',
diff --git a/sheep/components/s-share-modal/canvas-poster/poster/groupon.js b/sheep/components/s-share-modal/canvas-poster/poster/groupon.js
index 30313a4b..bd0d12df 100644
--- a/sheep/components/s-share-modal/canvas-poster/poster/groupon.js
+++ b/sheep/components/s-share-modal/canvas-poster/poster/groupon.js
@@ -5,7 +5,7 @@ import third from '@/sheep/api/migration/third';
 const groupon = async (poster) => {
   const width = poster.width;
   const userInfo = sheep.$store('user').userInfo;
-  const wxa_qrcode = (await third.wechat.getWxacode(poster.shareInfo.path, poster.shareInfo.query)).data;
+  const wxa_qrcode = 'data:image/png;base64,' + (await third.wechat.getWxacode(poster.shareInfo.path, poster.shareInfo.query)).data;
   return [
     {
       type: 'image',
diff --git a/sheep/components/s-share-modal/canvas-poster/poster/index.js b/sheep/components/s-share-modal/canvas-poster/poster/index.js
index f6eab726..a547b1e8 100644
--- a/sheep/components/s-share-modal/canvas-poster/poster/index.js
+++ b/sheep/components/s-share-modal/canvas-poster/poster/index.js
@@ -30,30 +30,3 @@ export function formatImageUrlProtocol(url) {
 
   return url;
 }
-
-
-export function getBase64Src(base64data, appType) {
-  const [, format, bodyData] = /data:image\/(\w+);base64,(.*)/.exec(base64data) || [];
-  switch (appType) {
-    case 'wechat':
-      const filePath = `${wx.env.USER_DATA_PATH}/tmp_base64src.${format}`;
-      return new Promise((resolve, reject) => {
-        const fileManager = uni.getFileSystemManager();
-        fileManager.writeFile({
-          filePath: filePath,
-          data: bodyData, // base64 数据
-          encoding: 'base64', // 字符编码
-          success: () => {
-            resolve(filePath);
-          },
-          file: (err) => {
-            console.log('base64 保存失败', err);
-          },
-        });
-      });
-    default:
-      console.warn('获得 base64 图片地址只做了微信小程序端的转换，其它端请自行实现！！！');
-      break;
-  }
-}
-
diff --git a/sheep/components/s-share-modal/canvas-poster/poster/user.js b/sheep/components/s-share-modal/canvas-poster/poster/user.js
index 5e83520a..00f41f05 100644
--- a/sheep/components/s-share-modal/canvas-poster/poster/user.js
+++ b/sheep/components/s-share-modal/canvas-poster/poster/user.js
@@ -5,7 +5,7 @@ import third from '@/sheep/api/migration/third';
 const user = async (poster) => {
   const width = poster.width;
   const userInfo = sheep.$store('user').userInfo;
-  const wxa_qrcode = (await third.wechat.getWxacode(poster.shareInfo.path, poster.shareInfo.query)).data;
+  const wxa_qrcode = 'data:image/png;base64,' + (await third.wechat.getWxacode(poster.shareInfo.path, poster.shareInfo.query)).data;
   return [
     {
       type: 'image',
diff --git a/sheep/components/s-share-modal/s-share-modal.vue b/sheep/components/s-share-modal/s-share-modal.vue
index 0f0b92db..717940e6 100644
--- a/sheep/components/s-share-modal/s-share-modal.vue
+++ b/sheep/components/s-share-modal/s-share-modal.vue
@@ -92,6 +92,7 @@
       showAuthModal();
       return;
     }
+    console.log(props.shareInfo);
     unref(SharePosterRef).getPoster();
     state.showPosterModal = true;
   };
diff --git a/sheep/platform/provider/wechat/openPlatform.js b/sheep/platform/provider/wechat/openPlatform.js
index bab8c736..6a170740 100644
--- a/sheep/platform/provider/wechat/openPlatform.js
+++ b/sheep/platform/provider/wechat/openPlatform.js
@@ -1,5 +1,5 @@
 // 登录
-// import third from '@/sheep/api/third';
+import third from '@/sheep/api/migration/third';
 import SocialApi from '@/sheep/api/member/social';
 
 // TODO 芋艿：等后面搞 App 再弄
diff --git a/sheep/platform/share.js b/sheep/platform/share.js
index 471c587a..a135eacc 100644
--- a/sheep/platform/share.js
+++ b/sheep/platform/share.js
@@ -73,7 +73,7 @@ const buildSpmQuery = (params) => {
       shareId = user.userInfo.id;
     }
   }
-  let page = '1'; // 页面类型: 1=首页(默认),2=商品,3=拼团商品,4=秒杀商品,5=邀请参团...按需扩展
+  let page = '1'; // 页面类型: 1=首页(默认),2=商品,3=拼团商品,4=秒杀商品,5=邀请参团,6=分销邀请...按需扩展
   if (typeof params.page !== 'undefined') {
     page = params.page;
   }
@@ -152,6 +152,8 @@ const decryptSpm = (spm) => {
         id: shareParamsArray[2],
       };
       break;
+    case '6': // 分销
+      // TODO puhui999: 如果用户未登录想想怎么搞
   }
   shareParams.platform = platformMap[shareParamsArray[3] - 1];
   shareParams.from = fromMap[shareParamsArray[4] - 1];