添加老师添加专辑

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.8be2fb2d.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.7e41be2c.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.e1e7326c.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.9ac87f1a.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> ponline
 </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.8be2fb2d.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.2c9267b4.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.e1e7326c.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.4dc4777b.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> ponline
 </body>
 
 </html>

dist/tenant.html

@@ -52,7 +52,11 @@
             _T_));
     })(Object);
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/tenant.6a65f37c.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/tenant.f96d73e3.js"></script>
+>>>>>>> ponline
   <link rel="modulepreload" href="./assets/ResizeObserver.es.90bde5ba.js">
   <link rel="modulepreload" href="./assets/auth.8b0d9608.js">
   <link rel="stylesheet" href="./assets/ResizeObserver.es.cf474077.css">
@@ -66,8 +70,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.8be2fb2d.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.e24262d5.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.e1e7326c.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.3fd27d03.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> ponline
 </body>
 
 </html>

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

@@ -19,7 +19,8 @@ import {
   Picker,
   DropdownMenu,
   DropdownItem,
-  Tag
+  Tag,
+  Toast
 } from 'vant'
 import styles from './index.module.less'
 import TheSticky from '@/components/the-sticky'
@@ -464,6 +465,11 @@ export default defineComponent({
       }, 0)
     }
     const onSubmit = async () => {
+      if(baseState.platformType === 'TEACHER') {
+        Toast('请联系平台客服开通权限')
+        return
+      }
+
       const album = state.details
       const details = state.details
       orderStatus.orderObject.orderType = 'TENANT_ALBUM'
@@ -747,7 +753,8 @@ export default defineComponent({
                     </div>
                   </div>
 
-                  {state.buy != '1' && baseState.platformType === 'STUDENT' && (
+                  {/* && baseState.platformType === 'STUDENT' */}
+                  {state.buy != '1'  && (
                     <div class={styles.albumPriceGroup}>
                       <div class={styles.albumTimer}>
                         <img
@@ -1127,7 +1134,8 @@ export default defineComponent({
                   </List>
                 </div>
               </div>
-              {baseState.platformType === 'STUDENT' && state.buy != '1' && (
+              {/* baseState.platformType === 'STUDENT' &&  */}
+              {state.buy != '1' && (
                 <TheSticky
                   position="bottom"
                   varName="--bottom-train-tool-height"
@@ -1141,10 +1149,11 @@ export default defineComponent({
                       onClick={onSubmit}
                     >
                       {/* 开通训练教程 */}
-                      <span>
+                      {baseState.platformType === 'STUDENT' && <span >
                         ¥{state.details?.actualPrice || 0}/
                         {state.details?.purchaseNum || 0}天
-                      </span>
+                      </span>}
+
                       <span>
                         {state.details?.albumStatus === 'NO_BUY'
                           ? '立即开通'