2 月之前 · 8a4ede907a
--- a/dist/assets/index-BPW1Oc4x.js
+++ b/dist/assets/index-BPW1Oc4x.js
@@ -0,0 +1 @@
 
				+import{u as c,a9 as l}from"./index-C9blN9-O.js";import{a5 as i,cw as m,R as t,ae as a,af as p,al as u,ag as f,bG as _}from"./index-CEVeWsXw.js";import"./vuedraggable.umd-Dj7kUH70.js";const S=i({__name:"mobileScreen",setup(d){const s=m(),e=t(!0),n=t(!1),r=c();return s.setScreenMode("mobileScreen"),r.initPPTData().then(()=>{e.value=!1}),(k,o)=>(a(),p("div",{class:"mobileScreen",onClick:o[0]||(o[0]=b=>n.value=!1)},[e.value?f("",!0):(a(),u(l,{key:0}))]))}}),B=_(S,[["__scopeId","data-v-2471f971"]]);export{B as default};
			
--- a/dist/assets/index-Bi5XHI52.js
+++ b/dist/assets/index-Bi5XHI52.js
--- a/dist/assets/index-C9blN9-O.js
+++ b/dist/assets/index-C9blN9-O.js
--- a/dist/assets/index-CAByilJL.js
+++ b/dist/assets/index-CAByilJL.js
@@ -0,0 +1 @@
 
				+import{u as s,a9 as r}from"./index-C9blN9-O.js";import{a5 as c,cw as n,R as p,ae as t,af as _,al as u,ag as i,bG as l}from"./index-CEVeWsXw.js";const m={class:"pptScreen"},d=c({__name:"pptScreen",setup(f){const a=n(),e=p(!0),o=s();return a.setScreenMode("pptScreen"),o.initPPTData().then(()=>{e.value=!1}),(S,k)=>(t(),_("div",m,[e.value?i("",!0):(t(),u(r,{key:0}))]))}}),h=l(d,[["__scopeId","data-v-678905e9"]]);export{h as default};
			
--- a/dist/assets/index-CEVeWsXw.js
+++ b/dist/assets/index-CEVeWsXw.js
--- a/dist/assets/index-CqM3AiIK.js
+++ b/dist/assets/index-CqM3AiIK.js
@@ -0,0 +1 @@
 
				+import{_ as a}from"./404-R0y5dkvZ.js";import{a5 as o,ek as t,ae as r,af as c,bH as _,bI as d,ak as s,bG as p}from"./index-CEVeWsXw.js";const i=e=>(_("data-v-dda25179"),e=e(),d(),e),n={class:"errorPage"},m=i(()=>s("div",{class:"error"},[s("img",{src:a,class:"img",alt:""}),s("div",{class:"tit"},"页面找不到了～")],-1)),l=[m],f=o({__name:"errorPage",setup(e){return t(),(u,h)=>(r(),c("div",n,l))}}),I=p(f,[["__scopeId","data-v-dda25179"]]);export{I as default};
			
--- a/dist/assets/index-DU7ZwbBD.js
+++ b/dist/assets/index-DU7ZwbBD.js
@@ -0,0 +1 @@
 
				+import{_ as t}from"./404-R0y5dkvZ.js";import{E as c}from"./index-DX9Kxodv.js";import{a5 as n,ae as i,af as r,ak as o,aq as _,am as d,P as l,bo as p,bH as m,bI as f,bG as u}from"./index-CEVeWsXw.js";const s=a=>(m("data-v-340bbdaa"),a=a(),f(),a),b={class:"login"},h={class:"error"},g=s(()=>o("img",{src:t,class:"img",alt:""},null,-1)),k=s(()=>o("div",{class:"tit"},"登录已过期或服务器错误!",-1)),v=n({__name:"login",setup(a){function e(){window.close()}return(x,B)=>(i(),r("div",b,[o("div",h,[g,k,_(l(c),{class:"backBtn",type:"primary",plain:"",onClick:e},{default:d(()=>[p("关闭页面")]),_:1})])]))}}),E=u(v,[["__scopeId","data-v-340bbdaa"]]);export{E as default};
			
--- a/dist/assets/index-DX9Kxodv.js
+++ b/dist/assets/index-DX9Kxodv.js
--- a/dist/assets/index-KuVO9aRm.css
+++ b/dist/assets/index-KuVO9aRm.css
--- a/dist/assets/musicBg-CQo7Euvp.png
+++ b/dist/assets/musicBg-CQo7Euvp.png
--- a/dist/assets/vuedraggable.umd-Dj7kUH70.js
+++ b/dist/assets/vuedraggable.umd-Dj7kUH70.js
--- a/dist/index.html
+++ b/dist/index.html
@@ -10,7 +10,11 @@
 
				     <meta name="description" content="ppt编辑器" />

			
 
				     <meta name="keywords" content="ppt,powerpoint,office powerpoint,在线ppt,幻灯片,演示文稿,ppt在线制作,Vue3,TypeScript" />

			
 
				     <title>PPT</title>

			
 
				+<<<<<<< HEAD

			
 
				     <script type="module" crossorigin src="./assets/index-BAfHr9ib.js"></script>
			
 
				+=======

			
 
				+    <script type="module" crossorigin src="./assets/index-CEVeWsXw.js"></script>
			
 
				+>>>>>>> ef8deae6f24380c46804ac548534324708aacc31

			
 
				     <link rel="stylesheet" crossorigin href="./assets/index-BrUV76Xx.css">
			
 
				   </head>

			
 
				   <body>

			
--- a/src/libs/jsonTool.ts
+++ b/src/libs/jsonTool.ts
@@ -59,7 +59,7 @@ export function getJsonToBlob() {
 
				 }
			
 
				 
			
 
				 function formatSlides(slides: any[]): any[] {
			
 
				-  return slides.map(item => {
			
 
				+  return (slides || []).map(item => {
			
 
				     // 背景兼容  当为渐变并且没有渐变数据的时候，判定为妙极客数据兼容
			
 
				     if (item.background?.type === "gradient") {
			
 
				       if (item.background.gradientType === "linear" && !item.background?.gradient) {
			
--- a/src/views/components/element/cloudCoachElement/cloudCoachPlayer/cloudCoachPlayer.vue
+++ b/src/views/components/element/cloudCoachElement/cloudCoachPlayer/cloudCoachPlayer.vue
@@ -37,7 +37,11 @@ const props = withDefaults(
 
				   }
			
 
				 )
			
 
				 const url = computed(() => {
			
 
				-  return `${YJL_URL_API}?v=${Date.now()}&showGuide=true&showWebGuide=false&platform=pc&imagePos=right&zoom=0.8&modelType=practise&instrumentId=${queryParams.instrumentId}&iscurseplay=play&id=${props.id}&Authorization=${getToken()}`
			
 
				+  if (queryParams.fromType === "CLASS") {
			
 
				+    return `${YJL_URL_API}?v=${Date.now()}&Authorization=${getToken()}&id=${props.id}&iscurseplay=play&modelType=practise&showCourseMember=true&showGuide=true&showWebGuide=false&instrumentId=${queryParams.instrumentId}&zoom=0.8`
			
 
				+  } else {
			
 
				+    return `${YJL_URL_API}?v=${Date.now()}&showGuide=true&showWebGuide=false&platform=pc&imagePos=right&zoom=0.8&modelType=practise&instrumentId=${queryParams.instrumentId}&iscurseplay=play&id=${props.id}&Authorization=${getToken()}`
			
 
				+  }
			
 
				 })
			
 
				 
			
 
				 // 先关闭这个功能