Pārlūkot izejas kodu

feat:iframe判断

ananzhusen 1 gadu atpakaļ
vecāks
revīzija
bb25797ed8

+ 3 - 3
src/services/download.ts

@@ -480,7 +480,7 @@ const zip3D = (name: string) => {
   const pen_3d = meta2d.store.data.pens.filter(
     (pen) =>
       pen.name === 'iframe' &&
-      (pen.tags.includes('meta3d') || pen.iframe.indexOf('3d') !== -1)
+      (pen.tags.includes('meta3d') || pen.iframe.indexOf('/3d') !== -1)
   );
   if (pen_3d && pen_3d.length) {
     //存在3d场景
@@ -506,9 +506,9 @@ const zip2D = (name: string) => {
     (pen) =>
       pen.name === 'iframe' &&
       (pen.iframe.indexOf('2d.le5le.com') !== -1 ||
-        pen.iframe.indexOf('/2d') !== -1 || pen.iframe.indexOf('=2d') !== -1 ||
+        pen.iframe.indexOf('/2d') !== -1 || pen.iframe.indexOf('data=2d') !== -1 ||
         pen.iframe.indexOf('v.le5le.com') !== -1 ||
-        pen.iframe.indexOf('/v') !== -1 ||
+        pen.iframe.indexOf('/view/v') !== -1 ||pen.iframe.indexOf('data=v') !== -1||
         pen.iframe.indexOf('/preview') !== -1)
   );
   if (pen_2d && pen_2d.length) {

+ 1 - 1
src/views/components/Graphics.vue

@@ -1106,7 +1106,7 @@ const dragStart = async (event: DragEvent | MouseEvent|TouchEvent, item: any) =>
       height: meta2d.store.data.height || meta2d.store.options.height,
       externElement: true,
       thumbImg: res.image,
-      iframe: 'https://view3d.le5le.com/?id=' + (item.id || item._id),
+      iframe:  location.origin+'/view/3d/?id=' + (item.id || item._id),
     };
   } else if (item.component) {
     // 默认

+ 3 - 3
src/views/components/Header.vue

@@ -1122,9 +1122,9 @@ const preGetPayList = async (key: Frame) => {
     (pen) =>
       pen.name === 'iframe' &&
       (pen.iframe.indexOf('2d.le5le.com') !== -1 ||
-        pen.iframe.indexOf('/2d') !== -1 || pen.iframe.indexOf('=2d') !== -1 ||
+        pen.iframe.indexOf('/2d') !== -1 || pen.iframe.indexOf('data=2d') !== -1 ||
         pen.iframe.indexOf('v.le5le.com') !== -1 ||
-        pen.iframe.indexOf('/v') !== -1 ||
+        pen.iframe.indexOf('/view/v') !== -1 ||pen.iframe.indexOf('data=v') !== -1 ||
         pen.iframe.indexOf('/preview') !== -1)
   );
   if (pen_pay && pen_pay.length) {
@@ -1307,7 +1307,7 @@ const preDownload = (meta2dData: any) => {
     (pen) =>
       pen.name === 'iframe' &&
       (pen.iframe.indexOf('v.le5le.com') !== -1 ||
-        pen.iframe.indexOf('/v') !== -1)
+        pen.iframe.indexOf('/view/v') !== -1||pen.iframe.indexOf('data=v') !== -1)
   );
 
   if (pen_v && pen_v.length) {