添加

dist/assets/index-8311081c.js

@@ -1,5 +0,0 @@
-<<<<<<<< HEAD:dist/assets/index-8311081c.js
-import{M as s,a as n}from"./index-74ab7d08.js";import{d as l,c as a,a as t}from"./index-c8146fd5.js";const e={banner:"_banner_12yz4_1",bannerImg:"_bannerImg_12yz4_6",title:"_title_12yz4_11",content:"_content_12yz4_34",section1:"_section1_12yz4_41",section2:"_section2_12yz4_57"},c=""+new URL("img2-f3e7eaac.png",import.meta.url).href,i=l({name:"about-us",setup:()=>()=>a("div",{"class":e.aboutUs},[a(s,null,null),a("div",{"class":e.banner},[a("img",{"class":e.bannerImg,src:"https://oss.dayaedu.com/klx/1699436923197banner.png"},null)]),a("div",{"class":e.section1},[a("div",{"class":[e.title]},[a("span",null,[t("关于酷乐秀")])]),a("img",{src:"https://oss.dayaedu.com/klx/1699519075644%E7%BC%96%E7%BB%84_14_2.png","class":"w100"},null),a("div",{"class":e.content},[a("p",null,[t("我们是一家专注于音乐教育创新的企业，深度融合新技术，为广大音乐爱好者和机构、学校提供高质量的音乐教育服务。")]),a("p",null,[t("未来数字化音乐教学将更加注重与人工智能、虚拟现实等新技术的深度融合，为音乐教学提供更加智能化、个性化的解决方案。我们深知数字化音乐课堂的重要性，因此积极布局数字化教育领域，现已拥有一系列成熟的音乐教学软件、教学团队及硬件供应链，助力音乐教育迈向新高峰。")])])]),a("div",{"class":e.section2},[a("div",{"class":[e.title]},[a("span",null,[t("选择我们你将得到")])]),a("img",{src:c,"class":"w100"},null)]),a(n,null,null)])});export{i as default};
-========
-import{M as s,a as n}from"./index-2da35654.js";import{d as l,c as a,a as t}from"./index-386a6905.js";const e={banner:"_banner_12yz4_1",bannerImg:"_bannerImg_12yz4_6",title:"_title_12yz4_11",content:"_content_12yz4_34",section1:"_section1_12yz4_41",section2:"_section2_12yz4_57"},c=""+new URL("img2-f3e7eaac.png",import.meta.url).href,i=l({name:"about-us",setup:()=>()=>a("div",{"class":e.aboutUs},[a(s,null,null),a("div",{"class":e.banner},[a("img",{"class":e.bannerImg,src:"https://oss.dayaedu.com/klx/1699436923197banner.png"},null)]),a("div",{"class":e.section1},[a("div",{"class":[e.title]},[a("span",null,[t("关于酷乐秀")])]),a("img",{src:"https://oss.dayaedu.com/klx/1699519075644%E7%BC%96%E7%BB%84_14_2.png","class":"w100"},null),a("div",{"class":e.content},[a("p",null,[t("我们是一家专注于音乐教育创新的企业，深度融合新技术，为广大音乐爱好者和机构、学校提供高质量的音乐教育服务。")]),a("p",null,[t("未来数字化音乐教学将更加注重与人工智能、虚拟现实等新技术的深度融合，为音乐教学提供更加智能化、个性化的解决方案。我们深知数字化音乐课堂的重要性，因此积极布局数字化教育领域，现已拥有一系列成熟的音乐教学软件、教学团队及硬件供应链，助力音乐教育迈向新高峰。")])])]),a("div",{"class":e.section2},[a("div",{"class":[e.title]},[a("span",null,[t("选择我们你将得到")])]),a("img",{src:c,"class":"w100"},null)]),a(n,null,null)])});export{i as default};
->>>>>>>> iteration-20240102:dist/assets/index-bc4796be.js

dist/assets/index-bc4796be.js

@@ -1,5 +0,0 @@
-<<<<<<<< HEAD:dist/assets/index-8311081c.js
-import{M as s,a as n}from"./index-74ab7d08.js";import{d as l,c as a,a as t}from"./index-c8146fd5.js";const e={banner:"_banner_12yz4_1",bannerImg:"_bannerImg_12yz4_6",title:"_title_12yz4_11",content:"_content_12yz4_34",section1:"_section1_12yz4_41",section2:"_section2_12yz4_57"},c=""+new URL("img2-f3e7eaac.png",import.meta.url).href,i=l({name:"about-us",setup:()=>()=>a("div",{"class":e.aboutUs},[a(s,null,null),a("div",{"class":e.banner},[a("img",{"class":e.bannerImg,src:"https://oss.dayaedu.com/klx/1699436923197banner.png"},null)]),a("div",{"class":e.section1},[a("div",{"class":[e.title]},[a("span",null,[t("关于酷乐秀")])]),a("img",{src:"https://oss.dayaedu.com/klx/1699519075644%E7%BC%96%E7%BB%84_14_2.png","class":"w100"},null),a("div",{"class":e.content},[a("p",null,[t("我们是一家专注于音乐教育创新的企业，深度融合新技术，为广大音乐爱好者和机构、学校提供高质量的音乐教育服务。")]),a("p",null,[t("未来数字化音乐教学将更加注重与人工智能、虚拟现实等新技术的深度融合，为音乐教学提供更加智能化、个性化的解决方案。我们深知数字化音乐课堂的重要性，因此积极布局数字化教育领域，现已拥有一系列成熟的音乐教学软件、教学团队及硬件供应链，助力音乐教育迈向新高峰。")])])]),a("div",{"class":e.section2},[a("div",{"class":[e.title]},[a("span",null,[t("选择我们你将得到")])]),a("img",{src:c,"class":"w100"},null)]),a(n,null,null)])});export{i as default};
-========
-import{M as s,a as n}from"./index-2da35654.js";import{d as l,c as a,a as t}from"./index-386a6905.js";const e={banner:"_banner_12yz4_1",bannerImg:"_bannerImg_12yz4_6",title:"_title_12yz4_11",content:"_content_12yz4_34",section1:"_section1_12yz4_41",section2:"_section2_12yz4_57"},c=""+new URL("img2-f3e7eaac.png",import.meta.url).href,i=l({name:"about-us",setup:()=>()=>a("div",{"class":e.aboutUs},[a(s,null,null),a("div",{"class":e.banner},[a("img",{"class":e.bannerImg,src:"https://oss.dayaedu.com/klx/1699436923197banner.png"},null)]),a("div",{"class":e.section1},[a("div",{"class":[e.title]},[a("span",null,[t("关于酷乐秀")])]),a("img",{src:"https://oss.dayaedu.com/klx/1699519075644%E7%BC%96%E7%BB%84_14_2.png","class":"w100"},null),a("div",{"class":e.content},[a("p",null,[t("我们是一家专注于音乐教育创新的企业，深度融合新技术，为广大音乐爱好者和机构、学校提供高质量的音乐教育服务。")]),a("p",null,[t("未来数字化音乐教学将更加注重与人工智能、虚拟现实等新技术的深度融合，为音乐教学提供更加智能化、个性化的解决方案。我们深知数字化音乐课堂的重要性，因此积极布局数字化教育领域，现已拥有一系列成熟的音乐教学软件、教学团队及硬件供应链，助力音乐教育迈向新高峰。")])])]),a("div",{"class":e.section2},[a("div",{"class":[e.title]},[a("span",null,[t("选择我们你将得到")])]),a("img",{src:c,"class":"w100"},null)]),a(n,null,null)])});export{i as default};
->>>>>>>> iteration-20240102:dist/assets/index-bc4796be.js

dist/index.html

@@ -15,11 +15,7 @@
   <meta name="HandheldFriendly" content="true" />
   <title>酷乐秀官网</title>
   <script src="./flexible.js" charset="UTF-8"></script>
-<<<<<<< HEAD
-  <script type="module" crossorigin src="./assets/index-c8146fd5.js"></script>
-=======
-  <script type="module" crossorigin src="./assets/index-386a6905.js"></script>
->>>>>>> iteration-20240102
+  <script type="module" crossorigin src="./assets/index-aa7687e0.js"></script>
   <link rel="stylesheet" href="./assets/index-cc7b827c.css">
   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};if(location.protocol!="file:"){window.__vite_is_modern_browser=true}</script>
   <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
@@ -30,11 +26,7 @@
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-9f17e47e.js"></script>
-<<<<<<< HEAD
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-7983c377.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
-=======
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-b3d7e78c.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
->>>>>>> iteration-20240102
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-8d738336.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>