合并

dist/tenant.html

@@ -52,9 +52,15 @@
             _T_));
     })(Object);
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/tenant.a66f70ff.js"></script>
   <link rel="modulepreload" href="./assets/index.4f40e5e1.js">
   <link rel="modulepreload" href="./assets/auth.502d2fa7.js">
+=======
+  <script type="module" crossorigin src="./assets/tenant.1c2b8601.js"></script>
+  <link rel="modulepreload" href="./assets/index.65bb5fc0.js">
+  <link rel="modulepreload" href="./assets/auth.85fc1c66.js">
+>>>>>>> iteration-20231226
   <link rel="stylesheet" href="./assets/index.90dd4d0d.css">
   <link rel="stylesheet" href="./assets/auth.f09b6d78.css">
   <link rel="stylesheet" href="./assets/tenant.d44cc3f0.css">
@@ -66,8 +72,13 @@
   
   <!-- <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.c8e8477e.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.4868888f.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.9d7739ea.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.50682f06.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-20231226
 </body>
 
 </html>

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

@@ -896,8 +896,11 @@ export default defineComponent({
                         (i: any) => i.track === item?.track
                       )
                       musicBuy(musicDetail.value, () => {}, {
-                        'part-index': index || 0,
-                        sett: staff.radio
+                        'part-index': staffData.partIndex || 0,
+                        sett: staff.radio,
+                        // 1：忽略系统节拍器
+                        ignoreSysMetronome:
+                          route.query.subjectType === 'MUSIC' ? 1 : 0
                       })
                     }}
                   >

src/tenant/music/train-list/index.tsx

@@ -318,6 +318,7 @@ export default defineComponent({
                     router.push({
                       path: '/music-detail',
                       query: {
+                        subjectType,
                         id: item.id
                       }
                     })