From ccd033b15a8c82f4d57fbbef5bc38bfca647a616 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Thu, 16 May 2024 16:15:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=B7=E6=8A=A5=EF=BC=9A=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E6=B5=B7=E6=8A=A5=E7=94=9F=E6=88=90=E5=B1=95=E7=A4=BA=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                          |  2 +-
 sheep/api/migration/third.js                  |  5 +-
 .../s-share-modal/canvas-poster/index.vue     | 83 +++++++++++--------
 3 files changed, 49 insertions(+), 41 deletions(-)

diff --git a/.env b/.env
index cb750ca4..b4ae1fd2 100644
--- a/.env
+++ b/.env
@@ -5,7 +5,7 @@ SHOPRO_VERSION = v1.8.3
 SHOPRO_BASE_URL = http://api-dashboard.yudao.iocoder.cn
 
 # 后端接口 - 测试环境（通过 process.env.NODE_ENV = development）
-SHOPRO_DEV_BASE_URL = http://192.168.2.21:48080
+SHOPRO_DEV_BASE_URL = http://127.0.0.1:48080
 ### SHOPRO_DEV_BASE_URL = http://yunai.natapp1.cc
 
 # 后端接口前缀（一般不建议调整）
diff --git a/sheep/api/migration/third.js b/sheep/api/migration/third.js
index b6e57401..85db8cc3 100644
--- a/sheep/api/migration/third.js
+++ b/sheep/api/migration/third.js
@@ -1,7 +1,5 @@
 import request from '@/sheep/request';
 
-const socialType = 34; // 社交类型 - 微信小程序
-
 export default {
   // 微信相关
   wechat: {
@@ -25,10 +23,9 @@ export default {
         url: '/member/social-user/wxa-qrcode',
         method: 'POST',
         data: {
-          type: socialType,
           scene: query,
-          isCheckPath: false, // TODO 开发环境暂不检查 path 是否存在
           path,
+          checkPath: false, // TODO 开发环境暂不检查 path 是否存在
         },
       });
     },
diff --git a/sheep/components/s-share-modal/canvas-poster/index.vue b/sheep/components/s-share-modal/canvas-poster/index.vue
index c7627238..5da08c00 100644
--- a/sheep/components/s-share-modal/canvas-poster/index.vue
+++ b/sheep/components/s-share-modal/canvas-poster/index.vue
@@ -2,24 +2,20 @@
 <template>
   <su-popup :show="show" round="10" @close="onClosePoster" type="center" class="popup-box">
     <view class="ss-flex-col ss-col-center ss-row-center">
-      <view
-        v-if="poster.views.length === 0"
-        class="poster-title ss-flex ss-row-center"
+      <image
+        v-if="!!painterImageUrl"
+        class="poster-img"
+        :src="painterImageUrl"
         :style="{
-          height: poster.height + 'px',
-          width: poster.width + 'px',
+          height: poster.css.height+ 'px',
+          width: poster.css.width + 'px',
         }"
-      >
-        海报加载中...
-      </view>
-      <!-- v-if 保障等待所有的海报信息都加载完后才开始渲染 -->
-          <template v-if="poster.views.length > 0">
-            <l-painter :board="poster" ref="painterRef"/>
-          </template>
+        :show-menu-by-longpress="true"
+      />
     </view>
     <view
       class="poster-btn-box ss-m-t-20 ss-flex ss-row-between ss-col-center"
-      v-if="poster.views.length > 0"
+      v-if="!!painterImageUrl"
     >
       <button class="cancel-btn ss-reset-button" @tap="onClosePoster">取消</button>
       <button class="save-btn ss-reset-button ui-BG-Main" @tap="onSavePoster">
@@ -30,11 +26,26 @@
         }}
       </button>
     </view>
+    <!--  海报画板：默认隐藏只用来生成海报。生成方式为主动调用  -->
+    <l-painter
+      isCanvasToTempFilePath
+      @success="setPainterImageUrl"
+      hidden
+      ref="painterRef"
+    />
   </su-popup>
 </template>
 
 <script setup>
-  import { reactive, ref } from 'vue';
+  /**
+   * 海报生成和展示
+   * 提示：小程序码默认跳转首页，由首页进行 spm 参数解析后跳转到对应的分享页面
+   * @description 用于生成分享海报，如：分享商品海报。
+   * @tutorial https://ext.dcloud.net.cn/plugin?id=2389
+   * @property {Boolean} show   弹出层控制
+   * @property {Object}  shareInfo 分享信息
+   */
+  import { reactive, ref, unref } from 'vue';
   import sheep from '@/sheep';
   import { getPosterData } from '@/sheep/components/s-share-modal/canvas-poster/poster';
 
@@ -45,7 +56,7 @@
     },
     shareInfo: {
       type: Object,
-      default() {
+      default: () => {
       },
     },
   });
@@ -54,7 +65,7 @@
     css: {
       // 根节点若无尺寸，自动获取父级节点
       width: sheep.$platform.device.windowWidth * 0.9,
-      height: 600
+      height: 600,
     },
     views: [],
   });
@@ -65,33 +76,32 @@
     emits('close');
   };
 
-  const painterRef = ref()
+  const painterRef = ref(); // 海报画板
+  const painterImageUrl = ref(); // 海报 url
+  // 渲染海报
+  const renderPoster = async () => {
+    await painterRef.value.render(unref(poster));
+  };
+  // 获得生成的图片
+  const setPainterImageUrl = (path) => {
+    painterImageUrl.value = path;
+  };
   // 保存海报图片
   const onSavePoster = () => {
     if (['WechatOfficialAccount', 'H5'].includes(sheep.$platform.name)) {
       sheep.$helper.toast('请长按图片保存');
       return;
     }
-
-    painterRef.value.canvasToTempFilePathSync({
-      fileType: "jpg",
-      // 如果返回的是base64是无法使用 saveImageToPhotosAlbum，需要设置 pathType为url
-      pathType: 'url',
-      quality: 1,
+    // 非H5 保存到相册
+    uni.saveImageToPhotosAlbum({
+      filePath: painterImageUrl.value,
       success: (res) => {
-        console.log(res.tempFilePath);
-        // 非H5 保存到相册
-        uni.saveImageToPhotosAlbum({
-          filePath: res.tempFilePath,
-          success: (res) => {
-            onClosePoster();
-            sheep.$helper.toast('保存成功');
-          },
-          fail: (err) => {
-            sheep.$helper.toast('保存失败');
-            console.log('图片保存失败:', err);
-          },
-        });
+        onClosePoster();
+        sheep.$helper.toast('保存成功');
+      },
+      fail: (err) => {
+        sheep.$helper.toast('保存失败');
+        console.log('图片保存失败:', err);
       },
     });
   };
@@ -102,6 +112,7 @@
       width: poster.css.width,
       shareInfo: props.shareInfo,
     });
+    await renderPoster();
   }
 
   defineExpose({