From f00a8052ea9ee9b5065b3ca1142ab9aba36c2ce8 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Mon, 27 May 2024 15:26:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=B7=E6=8A=A5=EF=BC=9A=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=B5=B7=E6=8A=A5=E4=BF=9D=E5=AD=98=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/s-share-modal/canvas-poster/index.vue  |  4 +++-
 .../s-share-modal/canvas-poster/poster/goods.js       | 11 +++++------
 .../s-share-modal/canvas-poster/poster/groupon.js     |  5 ++---
 .../s-share-modal/canvas-poster/poster/index.js       |  7 +++++++
 .../s-share-modal/canvas-poster/poster/user.js        |  5 ++---
 5 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/sheep/components/s-share-modal/canvas-poster/index.vue b/sheep/components/s-share-modal/canvas-poster/index.vue
index 5da08c00..0425b07e 100644
--- a/sheep/components/s-share-modal/canvas-poster/index.vue
+++ b/sheep/components/s-share-modal/canvas-poster/index.vue
@@ -29,6 +29,7 @@
     <!--  海报画板：默认隐藏只用来生成海报。生成方式为主动调用  -->
     <l-painter
       isCanvasToTempFilePath
+      pathType="url"
       @success="setPainterImageUrl"
       hidden
       ref="painterRef"
@@ -65,7 +66,7 @@
     css: {
       // 根节点若无尺寸，自动获取父级节点
       width: sheep.$platform.device.windowWidth * 0.9,
-      height: 600,
+      height: 550,
     },
     views: [],
   });
@@ -92,6 +93,7 @@
       sheep.$helper.toast('请长按图片保存');
       return;
     }
+
     // 非H5 保存到相册
     uni.saveImageToPhotosAlbum({
       filePath: painterImageUrl.value,
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 27e27470..883e4be7 100644
--- a/sheep/components/s-share-modal/canvas-poster/poster/goods.js
+++ b/sheep/components/s-share-modal/canvas-poster/poster/goods.js
@@ -1,11 +1,10 @@
 import sheep from '@/sheep';
-import third from '@/sheep/api/migration/third';
-import { formatImageUrlProtocol } from './index';
+import { formatImageUrlProtocol, getWxaQrcode } from './index';
 
 const goods = async (poster) => {
   const width = poster.width;
   const userInfo = sheep.$store('user').userInfo;
-  const wxa_qrcode = 'data:image/png;base64,' + (await third.wechat.getWxacode(poster.shareInfo.path, poster.shareInfo.query)).data;
+  const wxa_qrcode = await getWxaQrcode(poster.shareInfo.path, poster.shareInfo.query);
   return [
     {
       type: 'image',
@@ -62,7 +61,7 @@ const goods = async (poster) => {
         top: width * 1.18,
         color: '#333',
         fontSize: 14,
-        lineHeight: 5,
+        lineHeight: 15,
         maxWidth: width * 0.91,
       },
     },
@@ -72,7 +71,7 @@ const goods = async (poster) => {
       css: {
         position: 'fixed',
         left: width * 0.04,
-        top: width * 1.3,
+        top: width * 1.31,
         fontSize: 20,
         fontFamily: 'OPPOSANS',
         color: '#333',
@@ -87,7 +86,7 @@ const goods = async (poster) => {
       css: {
         position: 'fixed',
         left: width * 0.3,
-        top: width * 1.32,
+        top: width * 1.33,
         color: '#999',
         fontSize: 10,
         fontFamily: 'OPPOSANS',
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 bd0d12df..d1b6b78a 100644
--- a/sheep/components/s-share-modal/canvas-poster/poster/groupon.js
+++ b/sheep/components/s-share-modal/canvas-poster/poster/groupon.js
@@ -1,11 +1,10 @@
 import sheep from '@/sheep';
-import { formatImageUrlProtocol } from './index';
-import third from '@/sheep/api/migration/third';
+import { formatImageUrlProtocol, getWxaQrcode } from './index';
 
 const groupon = async (poster) => {
   const width = poster.width;
   const userInfo = sheep.$store('user').userInfo;
-  const wxa_qrcode = 'data:image/png;base64,' + (await third.wechat.getWxacode(poster.shareInfo.path, poster.shareInfo.query)).data;
+  const wxa_qrcode = await getWxaQrcode(poster.shareInfo.path, poster.shareInfo.query);
   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 a547b1e8..55d79c99 100644
--- a/sheep/components/s-share-modal/canvas-poster/poster/index.js
+++ b/sheep/components/s-share-modal/canvas-poster/poster/index.js
@@ -1,6 +1,7 @@
 import user from './user';
 import goods from './goods';
 import groupon from './groupon';
+import third from '@/sheep/api/migration/third';
 
 export function getPosterData(options) {
   switch (options.shareInfo.poster.type) {
@@ -30,3 +31,9 @@ export function formatImageUrlProtocol(url) {
 
   return url;
 }
+
+// 获得微信小程序码 （Base64 image）
+export async function getWxaQrcode(path, query) {
+  const res = await third.wechat.getWxacode(path, query);
+  return 'data:image/png;base64,' + res.data;
+}
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 00f41f05..5c4d3b96 100644
--- a/sheep/components/s-share-modal/canvas-poster/poster/user.js
+++ b/sheep/components/s-share-modal/canvas-poster/poster/user.js
@@ -1,11 +1,10 @@
 import sheep from '@/sheep';
-import { formatImageUrlProtocol } from './index';
-import third from '@/sheep/api/migration/third';
+import { formatImageUrlProtocol, getWxaQrcode } from './index';
 
 const user = async (poster) => {
   const width = poster.width;
   const userInfo = sheep.$store('user').userInfo;
-  const wxa_qrcode = 'data:image/png;base64,' + (await third.wechat.getWxacode(poster.shareInfo.path, poster.shareInfo.query)).data;
+  const wxa_qrcode = await getWxaQrcode(poster.shareInfo.path, poster.shareInfo.query);
   return [
     {
       type: 'image',