Merge branch 'master' into dev

dist/assets/index-7e6413fe.js

@@ -0,0 +1 @@
+import{d as t,h as e,aF as n,aG as s,O as o,F as r,ad as i}from"./index-34557a50.js";const l=t({name:"page-404",setup(){const a=i();return()=>e(r,null,[e(n,null,null),e(s,{style:{"min-height":"calc(100vh - var(--van-nav-bar-height))",paddingTop:"0 !important"},showButton:!0,description:"页面找不到了～",image:"404",onClick:()=>{o().isApp?postMessage({api:"back"}):a.back()}},null)])}});export{l as default};

dist/assets/index-legacy-c4511777.js

@@ -0,0 +1 @@
+System.register(["./index-legacy-eb0afb2c.js"],(function(n,t){"use strict";var e,a,i,u,r,c,s;return{setters:[function(n){e=n.d,a=n.h,i=n.aF,u=n.aG,r=n.O,c=n.F,s=n.ad}],execute:function(){n("default",e({name:"page-404",setup:function(){var n=s();return function(){return a(c,null,[a(i,null,null),a(u,{style:{"min-height":"calc(100vh - var(--van-nav-bar-height))",paddingTop:"0 !important"},showButton:!0,description:"页面找不到了～",image:"404",onClick:function(){r().isApp?postMessage({api:"back"}):n.back()}},null)])}}}))}}}));

dist/index.html

@@ -37,8 +37,13 @@
   <meta name="referrer" content="no-referrer" />
   <title>学生端</title>
   <script src="./flexible.js" charset="UTF-8"></script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index-0b3380a9.js"></script>
   <link rel="stylesheet" href="./assets/index-466c9a64.css">
+=======
+  <script type="module" crossorigin src="./assets/index-34557a50.js"></script>
+  <link rel="stylesheet" href="./assets/index-f8710e46.css">
+>>>>>>> master
   <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>
 </head>
@@ -58,8 +63,13 @@
       //   }
   </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 crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-5a819075.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-ad70297a.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-763956e3.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-eb0afb2c.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> master
 </body>
 
 </html>

src/views/co-ai/data.json

@@ -6,7 +6,7 @@
             "firstTone": "https://cloud-coach.ks3-cn-beijing.ksyuncs.com/music-sheet-first/1671757941570-1.png,https://cloud-coach.ks3-cn-beijing.ksyuncs.com/music-sheet-first/1671757942013-2.png",
             "fixedTone": "https://cloud-coach.ks3-cn-beijing.ksyuncs.com/music-sheet-fixed/1675776823337-1.png,https://cloud-coach.ks3-cn-beijing.ksyuncs.com/music-sheet-fixed/1675776823784-2.png",
             "musicSheetName": "孤勇者",
-            "id": 21167,
+            "id": 22213,
             "musicImg": "https://cloud-coach.ks3-cn-beijing.ksyuncs.com/music-sheet/1671757934802-1.png,https://cloud-coach.ks3-cn-beijing.ksyuncs.com/music-sheet/1671757941112-2.png",
             "delFlag": false,
             "updateBy": 3113,
@@ -41,7 +41,7 @@
             "fixedTone": "https://cloud-coach.ks3-cn-beijing.ksyuncs.com/music-sheet-fixed/1687847690485-1.png",
             "hasBeat": null,
             "hotFlag": null,
-            "id": 43541,
+            "id": 43554,
             "lastMusicSheet": null,
             "metronomeUrl": "",
             "midiUrl": "",
@@ -112,7 +112,7 @@
             "fixedTone": "https://cloud-coach.ks3-cn-beijing.ksyuncs.com/music-sheet-fixed/1687673062731-1.png",
             "hasBeat": null,
             "hotFlag": null,
-            "id": 43539,
+            "id": 43558,
             "lastMusicSheet": null,
             "metronomeUrl": "",
             "midiUrl": "",