Ver código fonte

Merge branch '2023-9-5_简谱和节奏'

liushengqiang 1 ano atrás
pai
commit
23e45e9308
4 arquivos alterados com 10 adições e 4 exclusões
  1. 1 0
      dist/assets/index-6929d84d.js
  2. 1 0
      dist/assets/index-f7bdede4.js
  3. 6 2
      dist/index.html
  4. 2 2
      vite.config.ts

Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 0
dist/assets/index-6929d84d.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 0
dist/assets/index-f7bdede4.js


+ 6 - 2
dist/index.html

@@ -12,8 +12,8 @@
   <script src="./flexible.js"></script>
   <script src="./abc2svg/xml2abc.js"></script>
   <script src="./abc2svg/jquery-1.11.1.min.js"></script>
-  <script type="module" crossorigin src="./assets/index-f7bdede4.js"></script>
-  <link rel="stylesheet" href="./assets/index-7fd59d44.css">
+  <script type="module" crossorigin src="./assets/index-6929d84d.js"></script>
+  <link rel="stylesheet" href="./assets/index-e441ae60.css">
   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};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>
 </head>
@@ -23,7 +23,11 @@
   
   <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-2011adef.js"></script>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-be90a4c7.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-cc353a9a.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> 2023-9-5_简谱和节奏
 </body>
 
 </html>

+ 2 - 2
vite.config.ts

@@ -48,8 +48,8 @@ export default defineConfig({
 		// https: true,
 		proxy: {
 			"^/edu-app/.*": {
-				// target: "https://test.lexiaoya.cn",
-				target: "https://dev.kt.colexiu.com",
+				target: "https://test.lexiaoya.cn",
+				// target: "https://dev.kt.colexiu.com",
 				changeOrigin: true,
 				// rewrite: (path) => path.replace(/^\/edu-app/, ""),
 			},

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff