From dabefbe21cfbc3f545a425653511886b56eb6784 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Tue, 14 May 2024 23:23:31 +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=95=86=E5=93=81=E6=B5=B7=E6=8A=A5=E5=88=86=E4=BA=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                          |  2 +-
 pages/goods/index.vue                         |  1 -
 pages/index/index.vue                         |  1 +
 .../s-share-modal/canvas-poster/index.vue     | 79 +++++++++++------
 .../canvas-poster/poster/goods.js             |  1 -
 .../s-share-modal/canvas-poster/useCanvas.js  | 87 -------------------
 sheep/platform/share.js                       | 15 ++--
 sheep/store/user.js                           |  3 +-
 8 files changed, 63 insertions(+), 126 deletions(-)
 delete mode 100644 sheep/components/s-share-modal/canvas-poster/useCanvas.js

diff --git a/.env b/.env
index d38ffa8c..cb750ca4 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 = https://192.168.1.105:48080
+SHOPRO_DEV_BASE_URL = http://192.168.2.21:48080
 ### SHOPRO_DEV_BASE_URL = http://yunai.natapp1.cc
 
 # 后端接口前缀（一般不建议调整）
diff --git a/pages/goods/index.vue b/pages/goods/index.vue
index 45916b8d..0a69aa2b 100644
--- a/pages/goods/index.vue
+++ b/pages/goods/index.vue
@@ -196,7 +196,6 @@
 			title: state.goodsInfo.name,
 			image: sheep.$url.cdn(state.goodsInfo.picUrl),
 			desc: state.goodsInfo.introduction,
-      path: 'pages/goods/index',
 			params: {
 				page: '2',
 				query: state.goodsInfo.id,
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 66fc0594..208c9591 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -53,6 +53,7 @@
 		// 小程序识别二维码
 		if (options.scene) {
 			const sceneParams = decodeURIComponent(options.scene).split('=');
+      console.log("sceneParams=>",sceneParams);
 			options[sceneParams[0]] = sceneParams[1];
 		}
 		// #endif
diff --git a/sheep/components/s-share-modal/canvas-poster/index.vue b/sheep/components/s-share-modal/canvas-poster/index.vue
index 93acf1c3..c7627238 100644
--- a/sheep/components/s-share-modal/canvas-poster/index.vue
+++ b/sheep/components/s-share-modal/canvas-poster/index.vue
@@ -2,15 +2,39 @@
 <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">
-      <template v-if="poster.views.length > 0">
-        <l-painter :board="poster" />
-      </template>
+      <view
+        v-if="poster.views.length === 0"
+        class="poster-title ss-flex ss-row-center"
+        :style="{
+          height: poster.height + 'px',
+          width: poster.width + 'px',
+        }"
+      >
+        海报加载中...
+      </view>
+      <!-- v-if 保障等待所有的海报信息都加载完后才开始渲染 -->
+          <template v-if="poster.views.length > 0">
+            <l-painter :board="poster" ref="painterRef"/>
+          </template>
+    </view>
+    <view
+      class="poster-btn-box ss-m-t-20 ss-flex ss-row-between ss-col-center"
+      v-if="poster.views.length > 0"
+    >
+      <button class="cancel-btn ss-reset-button" @tap="onClosePoster">取消</button>
+      <button class="save-btn ss-reset-button ui-BG-Main" @tap="onSavePoster">
+        {{
+          ['wechatOfficialAccount', 'H5'].includes(sheep.$platform.name)
+            ? '长按图片保存'
+            : '保存图片'
+        }}
+      </button>
     </view>
   </su-popup>
 </template>
 
 <script setup>
-  import { getCurrentInstance, reactive } from 'vue';
+  import { reactive, ref } from 'vue';
   import sheep from '@/sheep';
   import { getPosterData } from '@/sheep/components/s-share-modal/canvas-poster/poster';
 
@@ -26,24 +50,22 @@
     },
   });
 
-
   const poster = reactive({
     css: {
       // 根节点若无尺寸，自动获取父级节点
       width: sheep.$platform.device.windowWidth * 0.9,
-      height: 600,
+      height: 600
     },
     views: [],
   });
 
-
   const emits = defineEmits(['success', 'close']);
-  const vm = getCurrentInstance();
 
   const onClosePoster = () => {
     emits('close');
   };
 
+  const painterRef = ref()
   // 保存海报图片
   const onSavePoster = () => {
     if (['WechatOfficialAccount', 'H5'].includes(sheep.$platform.name)) {
@@ -51,26 +73,35 @@
       return;
     }
 
-    uni.saveImageToPhotosAlbum({
-      filePath: poster.src,
+    painterRef.value.canvasToTempFilePathSync({
+      fileType: "jpg",
+      // 如果返回的是base64是无法使用 saveImageToPhotosAlbum，需要设置 pathType为url
+      pathType: 'url',
+      quality: 1,
       success: (res) => {
-        onClosePoster();
-        sheep.$helper.toast('保存成功');
-      },
-      fail: (err) => {
-        sheep.$helper.toast('保存失败');
-        console.log('图片保存失败:', err);
+        console.log(res.tempFilePath);
+        // 非H5 保存到相册
+        uni.saveImageToPhotosAlbum({
+          filePath: res.tempFilePath,
+          success: (res) => {
+            onClosePoster();
+            sheep.$helper.toast('保存成功');
+          },
+          fail: (err) => {
+            sheep.$helper.toast('保存失败');
+            console.log('图片保存失败:', err);
+          },
+        });
       },
     });
   };
 
-  // 使用 canvas 生成海报
-  async function getPoster(params) {
-    let drawer = await getPosterData({
-      width: sheep.$platform.device.windowWidth * 0.9,
+  // 获得海报数据
+  async function getPoster() {
+    poster.views = await getPosterData({
+      width: poster.css.width,
       shareInfo: props.shareInfo,
     });
-    poster.views = drawer;
   }
 
   defineExpose({
@@ -120,10 +151,4 @@
     border-radius: 20rpx;
   }
 
-  .hideCanvas {
-    position: fixed;
-    top: -99999rpx;
-    left: -99999rpx;
-    z-index: -99999;
-  }
 </style>
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 ab14c0e1..adca6f79 100644
--- a/sheep/components/s-share-modal/canvas-poster/poster/goods.js
+++ b/sheep/components/s-share-modal/canvas-poster/poster/goods.js
@@ -12,7 +12,6 @@ const goods = async (poster) => {
       src: formatImageUrlProtocol(sheep.$url.cdn(sheep.$store('app').platform.share.posterInfo.goods_bg)),
       css: {
         width,
-        background: 'white',
         position: 'fixed',
         'object-fit': 'contain',
         top: '0',
diff --git a/sheep/components/s-share-modal/canvas-poster/useCanvas.js b/sheep/components/s-share-modal/canvas-poster/useCanvas.js
deleted file mode 100644
index 3f0d8e65..00000000
--- a/sheep/components/s-share-modal/canvas-poster/useCanvas.js
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * Shopro + qs-canvas 绘制海报
- * @version 1.0.0
- * @author lidongtony
- * @param {Object} options - 海报参数
- * @param {Object} vm - 自定义组件实例
- */
-import QSCanvas from 'qs-canvas';
-import { getPosterData } from './poster';
-
-export default async function useCanvas(options, vm) {
-  const width = options.width;
-  const qsc = new QSCanvas(
-    {
-      canvasId: options.canvasId,
-      width: options.width,
-      height: options.height,
-      setCanvasWH: (canvas) => {
-        options.height = canvas.height;
-      },
-    },
-    vm,
-  );
-
-  let drawer = await getPosterData(options);
-  console.log(drawer);
-  // 绘制背景图
-  const background = await qsc.drawImg({
-    type: 'image',
-    val: drawer.background,
-    x: 0,
-    y: 0,
-    width,
-    mode: 'widthFix',
-    zIndex: 0,
-  });
-  await qsc.updateCanvasWH({
-    width: background.width,
-    height: background.bottom,
-  });
-
-  let list = drawer.list;
-
-  for (let i = 0; i < list.length; i++) {
-    let item = list[i];
-    // 绘制文字
-    if (item.type === 'text') {
-      await qsc.drawText(item);
-    }
-    // 绘制图片
-    if (item.type === 'image') {
-      if (item.d) {
-        qsc.setCircle({
-          x: item.x,
-          y: item.y,
-          d: item.d,
-          clip: true,
-        });
-      }
-
-      if (item.r) {
-        qsc.setRect({
-          x: item.x,
-          y: item.y,
-          height: item.height,
-          width: item.width,
-          r: item.r,
-          clip: true,
-        });
-      }
-      await qsc.drawImg(item);
-      qsc.restore();
-    }
-
-    // 绘制二维码
-    if (item.type === 'qrcode') {
-      await qsc.drawQrCode(item);
-    }
-  }
-
-  await qsc.draw();
-  // 延迟执行, 防止不稳定
-  setTimeout(async () => {
-    options.src = await qsc.toImage();
-  }, 100);
-  return options;
-}
diff --git a/sheep/platform/share.js b/sheep/platform/share.js
index 2a96ccf7..471c587a 100644
--- a/sheep/platform/share.js
+++ b/sheep/platform/share.js
@@ -19,7 +19,6 @@ const getShareInfo = (
     title: '', // 自定义分享标题
     desc: '', // 自定义描述
     image: '', // 自定义分享图片
-    path: '', // 页面基础路径，不要以 / 开头
     params: {}, // 自定义分享参数
   },
   poster = {
@@ -46,6 +45,8 @@ const getShareInfo = (
 
   // 配置分享链接地址
   shareInfo.link = buildSpmLink(query, shareConfig.linkAddress);
+  // 配置页面地址带参数
+  shareInfo.path = buildSpmPath(query);
 
   // 配置转发参数
   if (shareConfig.methods.includes('forward')) {
@@ -59,8 +60,7 @@ const getShareInfo = (
     shareInfo.desc = scene.desc || shareConfig.forwardInfo.subtitle;
     shareInfo.path = buildSpmPath(scene.path, query);
   }
-  shareInfo.path = scene.path;
-  console.log('shareInfo', shareInfo);
+
   return shareInfo;
 };
 
@@ -70,7 +70,6 @@ const buildSpmQuery = (params) => {
   let shareId = '0'; // 设置分享者用户ID
   if (typeof params.shareId === 'undefined') {
     if (user.isLogin) {
-      // todo @芋艿 id为空
       shareId = user.userInfo.id;
     }
   }
@@ -91,9 +90,11 @@ const buildSpmQuery = (params) => {
   return `spm=${shareId}.${page}.${query}.${platform}.${from}`;
 };
 
-// 构造页面分享参数
-const buildSpmPath = (path, query) => {
-  return `/${path}?${query}`;
+// 构造页面分享参数: 所有的分享都先到首页进行 spm 参数解析
+const buildSpmPath = (query) => {
+  // 默认是主页，页面 page，例如 pages/index/index，根路径前不要填加 /，
+  // 不能携带参数（参数请放在scene字段里），如果不填写这个字段，默认跳主页面。scancode_time为系统保留参数，不允许配置
+  return `pages/index/index`;
 };
 
 // 构造分享链接
diff --git a/sheep/store/user.js b/sheep/store/user.js
index d4a85f6f..4e641a36 100644
--- a/sheep/store/user.js
+++ b/sheep/store/user.js
@@ -1,7 +1,6 @@
 import {
 	defineStore
 } from 'pinia';
-// import userApi from '@/sheep/api/user';
 import $share from '@/sheep/platform/share';
 import {
 	isEmpty,
@@ -184,4 +183,4 @@ const user = defineStore({
 	},
 });
 
-export default user;
\ No newline at end of file
+export default user;