合并

dist/index.html

@@ -67,8 +67,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.e2059479.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.4049d960.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.f80d84d0.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.d131b7b3.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-20240513-text
 </body>
 
 </html>

dist/teacher.html

@@ -64,8 +64,13 @@
   <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.e2059479.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.054ab264.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.f80d84d0.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.7a635d84.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-20240513-text
 </body>
 
 </html>

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.e2059479.js"></script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.f80d84d0.js"></script>
+>>>>>>> iteration-20240513-text
   <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.8509217a.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 

src/router/routes-tenant.ts

@@ -127,7 +127,7 @@ export default [
         path: '/lessonCourseware',
         component: () => import('@/tenant/music/lessonCourseware'),
         meta: {
-          title: '云教程'
+          title: '云课堂'
         }
       },
       {

src/tenant/music/coursewarePlay/component/musicScore.tsx

@@ -65,7 +65,7 @@ export default defineComponent({
       }
     })
 
-    // 去云教练完整版
+    // 去云练习完整版
     const gotoAccomany = () => {
       if (isLoading.value) return
       if (!browserInfo.ios){

src/tenant/music/lessonCourseware/index.tsx

@@ -139,7 +139,7 @@ export default defineComponent({
                 background="transparent"
                 isFixed={false}
                 border={false}
-                title={'云教程'}
+                title={'云课堂'}
                 color="#131415"
               ></ColHeader>
               <Search

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

@@ -535,7 +535,7 @@ export default defineComponent({
                     }}
                   >
                     {state.coursewareCounts && (
-                      <Tab title="云教程" name="COURSEWARE"></Tab>
+                      <Tab title="云课堂" name="COURSEWARE"></Tab>
                     )}
                     {state.subjectCounts && (
                       <Tab title="声部云练" name="SUBJECT"></Tab>