Merge branch 'feature-tianyong'

dist/index.html

@@ -67,7 +67,11 @@
   
   <!-- <script type="module" src="/src/teacher/main.ts"></script> -->
   <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>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.4f87b3bc.js"></script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.860f5400.js"></script>
+>>>>>>> feature-tianyong
   <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.8e60dec0.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 

dist/teacher.html

@@ -64,7 +64,11 @@
   <div id="app"></div>
   
   <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>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.4f87b3bc.js"></script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.860f5400.js"></script>
+>>>>>>> feature-tianyong
   <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.cf85824e.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 

dist/tenant.html

@@ -66,7 +66,11 @@
   
   <!-- <script type="module" src="/src/teacher/main.ts"></script> -->
   <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>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.4f87b3bc.js"></script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.860f5400.js"></script>
+>>>>>>> feature-tianyong
   <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.0532e4a2.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 

src/tenant/music/music-detail/new-index.tsx

@@ -631,7 +631,7 @@ export default defineComponent({
       const musicScoreUrl = getHttpOrigin() + musicScorePath
       // const musicScoreUrl = "https://dev.colexiu.com" + musicScorePath;
       // const musicScoreUrl = 'http://192.168.3.68:3000/instrument.html';
-      let href = `${musicScoreUrl}?t=${Date.now()}#/?id=${musicId}&Authorization=${Authorization}&isPreView=true&zoom=0.5&downPng=A4`
+      let href = `${musicScoreUrl}?t=${Date.now()}#/?id=${musicId}&Authorization=${Authorization}&isPreView=true&zoom=0.3&downPng=A4`
       // // 老师端加上systemType=teacher
       href +=
         '&systemType=' +

src/views/music/music-detail/index.tsx

@@ -746,7 +746,7 @@ export default defineComponent({
     const musicScoreUrl = getHttpOrigin() + musicScorePath;
     // const musicScoreUrl = "https://test.colexiu.com" + musicScorePath;
     // const musicScoreUrl = 'http://192.168.3.68:3000/instrument.html';
-    let href = `${musicScoreUrl}?t=${Date.now()}#/?id=${musicId}&Authorization=${Authorization}&isPreView=true&zoom=0.5&downPng=A4`;
+    let href = `${musicScoreUrl}?t=${Date.now()}#/?id=${musicId}&Authorization=${Authorization}&isPreView=true&zoom=0.3&downPng=A4`;
     // // 老师端加上systemType=teacher
     href += ('&systemType=' +( state.platformType === "STUDENT" ? `student` : 'teacher'));
     // 总谱还是什么

vite.config.ts

@@ -12,7 +12,7 @@ function resolve(dir: string) {
 // https://vitejs.dev/config/
 // https://github.com/vitejs/vite/issues/1930 .env
 // const proxyUrl = 'https://online.colexiu.com/'
-const proxyUrl = 'https://dev.colexiu.com/'
+const proxyUrl = 'https://test.colexiu.com/'
 // const proxyUrl = 'http://192.168.3.14:8000/'
 export default defineConfig({
   base: './',