更新

dist/index.html

@@ -35,11 +35,18 @@
     <meta name="msapplication-tap-highlight" content="no" />
     <title>酷乐秀</title>
     <script src="./flexible.js" charset="UTF-8"></script>
+<<<<<<< HEAD
     <script type="module" crossorigin src="./assets/index.3b43262e.js"></script>
     <link rel="modulepreload" href="./assets/vendor.5359187d.js">
     <link rel="modulepreload" href="./assets/index.393586b1.js">
     <link rel="stylesheet" href="./assets/index.cb2212cc.css">
+=======
+    <script type="module" crossorigin src="./assets/index.6667fcca.js"></script>
+    <link rel="modulepreload" href="./assets/vendor.8653297b.js">
+    <link rel="modulepreload" href="./assets/index.175ef1eb.js">
+>>>>>>> b2b1e2e8a16bd3a15f40c0bbccf0b3102c3e766f
     <link rel="stylesheet" href="./assets/vendor.68261ebd.css">
+    <link rel="stylesheet" href="./assets/index.cb2212cc.css">
     <link rel="stylesheet" href="./assets/index.5062a520.css">
     <script type="module">!function(){try{new Function("m","return import(m)")}catch(o){console.warn("vite: loading legacy build because dynamic import is unsupported, syntax error above 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>
@@ -49,7 +56,12 @@
     
     <!-- <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.11b78793.js"></script>
     <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.8f924d5f.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+    <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.f20d3101.js"></script>
+    <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.ceab47a7.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> b2b1e2e8a16bd3a15f40c0bbccf0b3102c3e766f
   </body>
 </html>

dist/teacher.html

@@ -35,11 +35,18 @@
     <meta name="msapplication-tap-highlight" content="no" />
     <title>酷乐秀</title>
     <script src="./flexible.js" charset="UTF-8"></script>
+<<<<<<< HEAD
     <script type="module" crossorigin src="./assets/teacher.85d99a52.js"></script>
     <link rel="modulepreload" href="./assets/vendor.5359187d.js">
     <link rel="modulepreload" href="./assets/index.393586b1.js">
     <link rel="stylesheet" href="./assets/vendor.68261ebd.css">
+=======
+    <script type="module" crossorigin src="./assets/teacher.121c35e0.js"></script>
+    <link rel="modulepreload" href="./assets/vendor.8653297b.js">
+    <link rel="modulepreload" href="./assets/index.175ef1eb.js">
+>>>>>>> b2b1e2e8a16bd3a15f40c0bbccf0b3102c3e766f
     <link rel="stylesheet" href="./assets/index.cb2212cc.css">
+    <link rel="stylesheet" href="./assets/vendor.68261ebd.css">
     <link rel="stylesheet" href="./assets/index.5062a520.css">
     <script type="module">!function(){try{new Function("m","return import(m)")}catch(o){console.warn("vite: loading legacy build because dynamic import is unsupported, syntax error above 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>
@@ -48,7 +55,12 @@
     <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.11b78793.js"></script>
     <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.42f624b6.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+    <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.f20d3101.js"></script>
+    <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.88ee2150.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> b2b1e2e8a16bd3a15f40c0bbccf0b3102c3e766f
   </body>
 </html>

src/student/video-class/video-detail.tsx

@@ -37,6 +37,7 @@ export default defineComponent({
         )
         const result = res.data || {}
         const lessonGroup = result.lessonGroup || {}
+        const teachertTag = result.teachertTag || ''
         this.userInfo = {
           alreadyBuy: result.alreadyBuy,
           username:
@@ -51,8 +52,8 @@ export default defineComponent({
           teacherId: lessonGroup.teacherId,
           lessonCoverUrl: lessonGroup.lessonCoverUrl,
           auditVersion: lessonGroup.auditVersion,
-          isDegree: lessonGroup.teachertTag?.includes('DEGREE') || false,
-          isTeacher: lessonGroup.teachertTag?.includes('TEACHER') || false
+          isDegree: teachertTag?.includes('DEGREE') || false,
+          isTeacher: teachertTag?.includes('TEACHER') || false
         }
         this.detailList = result.detailList || []
       } catch {