feat:img-cdn-replace

src/services/download.ts

@@ -445,9 +445,9 @@ async function zipJs(zip: JSZip) {
 export async function zipBkImg(zip: JSZip) {
   let img = meta2d.store.data.bkImage;
   if (img) {
-    if (img.startsWith('/') || img.startsWith(cdn) || img.startsWith(upCdn)) {
-      const pngs = await getTemPngs([img.replace(cdn, '').replace(upCdn, '')]);
-      await zipImage(zip, img, pngs[img.replace(cdn, '').replace(upCdn, '')]);
+    if (img.startsWith('/') || img.startsWith(img_cdn) || img.startsWith(img_upCdn)) {
+      const pngs = await getTemPngs([img.replace(img_cdn, '').replace(img_upCdn, '')]);
+      await zipImage(zip, img, pngs[img.replace(img_cdn, '').replace(img_upCdn, '')]);
     }
   }
 }
@@ -568,11 +568,11 @@ export async function zipImages(zip: JSZip, pens: Pen[]) {
   }
   //付费pngs
   const pngs = await getTemPngs(
-    images.map((i) => i.replace(cdn, '').replace(upCdn, ''))
+    images.map((i) => i.replace(img_cdn, '').replace(img_upCdn, ''))
   );
   await Promise.all(
     images.map((image) =>
-      zipImage(zip, image, pngs[image.replace(cdn, '').replace(upCdn, '')])
+      zipImage(zip, image, pngs[image.replace(img_cdn, '').replace(img_upCdn, '')])
     )
   );
 }

src/views/components/Header.vue

@@ -606,6 +606,8 @@ import {
   zipBkImg,
   zipImages,
   Frame,
+  img_cdn,
+  img_upCdn
 } from '@/services/download';
 import { formComponents } from '@/services/defaults';
 import WechatPay from './WechatPay.vue';
@@ -1347,8 +1349,11 @@ const saveDownload = async () => {
   ///png图形库
   const pngs = await getTemPngs([...prePayList.pngs]);
   list.forEach((item) => {
-    if (pngs[item.url]) {
-      item.url = pngs[item.url];
+    if(item.url){
+      let url =item.url.replace(img_cdn, '').replace(img_upCdn, '')
+      if (pngs[url]) {
+        item.url = pngs[url];
+      }
     }
   });
   //js线性图元 由对应页面处理
@@ -2067,6 +2072,7 @@ const prePay = async () => {
 
 const skipPay = () => {
   //跳过支付，直接下载
+  MessagePlugin.info('正在下载打包中，可能需要几分钟，请耐心等待...');
   if (downloadType === Frame.html) {
     preDownload(meta2d.data());
   } else {