lex-xin 10 months ago
parent
commit
40563ae394
89 changed files with 246 additions and 200 deletions
  1. 3 3
      Jenkinsfile
  2. 0 0
      dist/assets/album-my-legacy.b4408557.js
  3. 0 0
      dist/assets/album-my.c6f6fef6.js
  4. 0 0
      dist/assets/auth-login-legacy.44237340.js
  5. 0 0
      dist/assets/auth-login.f781ba1d.js
  6. 0 0
      dist/assets/create-legacy.08621fc6.js
  7. 0 0
      dist/assets/create-legacy.346289f7.js
  8. 0 0
      dist/assets/create-legacy.4a5dc621.js
  9. 0 0
      dist/assets/create.2a2fa4c6.js
  10. 0 0
      dist/assets/create.67610629.js
  11. 0 0
      dist/assets/create.fa786f60.js
  12. 1 1
      dist/assets/home-layout-center-legacy.da24a47c.js
  13. 1 1
      dist/assets/home-layout-center.4acf0444.js
  14. 0 0
      dist/assets/index-legacy.08050ab3.js
  15. 0 0
      dist/assets/index-legacy.10c89c62.js
  16. 0 0
      dist/assets/index-legacy.1e0042cf.js
  17. 0 0
      dist/assets/index-legacy.1f2934fd.js
  18. 0 0
      dist/assets/index-legacy.39352dca.js
  19. 0 0
      dist/assets/index-legacy.489c20d4.js
  20. 0 0
      dist/assets/index-legacy.4d079e19.js
  21. 0 0
      dist/assets/index-legacy.503ce9d9.js
  22. 0 0
      dist/assets/index-legacy.5d0b1f58.js
  23. 0 0
      dist/assets/index-legacy.723e3357.js
  24. 0 0
      dist/assets/index-legacy.91392fe9.js
  25. 0 0
      dist/assets/index-legacy.a5439f45.js
  26. 0 0
      dist/assets/index-legacy.b489944b.js
  27. 0 0
      dist/assets/index-legacy.d18d11aa.js
  28. 0 0
      dist/assets/index-legacy.d8082775.js
  29. 0 0
      dist/assets/index-legacy.dede1c47.js
  30. 0 0
      dist/assets/index-legacy.f6f6486d.js
  31. 0 0
      dist/assets/index.03f33068.js
  32. 0 0
      dist/assets/index.0cb9bd36.js
  33. 0 0
      dist/assets/index.0f90792c.js
  34. 0 0
      dist/assets/index.343ed577.js
  35. 0 0
      dist/assets/index.3b9e1602.js
  36. 0 0
      dist/assets/index.43420db3.js
  37. 0 0
      dist/assets/index.532a3fdf.js
  38. 0 0
      dist/assets/index.566ba85e.js
  39. 0 0
      dist/assets/index.7a271ff4.js
  40. 0 0
      dist/assets/index.93ea6c1b.js
  41. 0 0
      dist/assets/index.a14c95a4.js
  42. 0 0
      dist/assets/index.be200afc.js
  43. 0 0
      dist/assets/index.c0c04343.js
  44. 0 0
      dist/assets/index.c7cc2349.js
  45. 0 0
      dist/assets/index.c7cebaa6.js
  46. 0 0
      dist/assets/index.db9709bd.js
  47. 0 0
      dist/assets/index.f6b54541.js
  48. 0 0
      dist/assets/index.fae7b8d3.js
  49. 0 0
      dist/assets/live-detail-legacy.0bc4773c.js
  50. 0 0
      dist/assets/live-detail-legacy.ab126ccf.js
  51. 0 0
      dist/assets/live-detail.4eeb38f0.js
  52. 0 0
      dist/assets/live-detail.ff30a036.js
  53. 0 0
      dist/assets/login-legacy.8ac9c01c.js
  54. 0 0
      dist/assets/login.9d2bdcc4.js
  55. 0 0
      dist/assets/organ-search.133b8c72.css
  56. 0 0
      dist/assets/polyfills-legacy.dd014733.js
  57. 0 0
      dist/assets/routes-common-legacy.e8855d3f.js
  58. 0 0
      dist/assets/routes-common.00768f5b.js
  59. 0 0
      dist/assets/routes-common.da3f1355.js
  60. 0 0
      dist/assets/search-result-legacy.af91b1ee.js
  61. 0 0
      dist/assets/search-result.45035e1a.js
  62. 0 0
      dist/assets/searchAlbum-legacy.842b0d1e.js
  63. 0 0
      dist/assets/searchAlbum.5434439d.js
  64. 0 0
      dist/assets/teacher-home-legacy.1e0c05f0.js
  65. 0 0
      dist/assets/teacher-home.87cae3eb.js
  66. 0 0
      dist/assets/teacher-legacy.6714b7ac.js
  67. 0 0
      dist/assets/teacher.1fadf283.js
  68. 0 0
      dist/assets/tenant-legacy.44b55ffb.js
  69. 0 0
      dist/assets/tenant.72882726.js
  70. 0 0
      dist/assets/video-detail-legacy.b5689b8e.js
  71. 0 0
      dist/assets/video-detail-legacy.d2b006cf.js
  72. 0 0
      dist/assets/video-detail.0a6a347a.js
  73. 0 0
      dist/assets/video-detail.34425714.js
  74. 4 4
      dist/index.html
  75. 4 4
      dist/teacher.html
  76. 3 3
      dist/tenant.html
  77. 10 5
      package-lock.json
  78. 1 1
      src/student/live-class/live-detail.tsx
  79. 1 1
      src/student/video-class/video-detail.tsx
  80. 5 5
      src/teacher/live-class/create-components/course-start.tsx
  81. 1 0
      src/teacher/video-class/class-info.tsx
  82. 12 9
      src/tenant/music/component/song/index.tsx
  83. 131 125
      src/tenant/music/coursewarePlay/component/video-item/index.tsx
  84. 12 6
      src/tenant/music/coursewarePlay/component/video-item/video-play.tsx
  85. 2 0
      src/views/article-center/theory.tsx
  86. 6 3
      src/views/music/component/song/index.tsx
  87. 2 1
      src/views/music/music-detail/index.tsx
  88. 24 0
      src/views/music/music.ts
  89. 23 28
      yarn.lock

+ 3 - 3
Jenkinsfile

@@ -6,13 +6,13 @@ pipeline {
     }
 
     stages {
-        
+
         stage('build param') {
             steps {
                 wrap([$class: 'BuildUser']) {
                     script {
                         BUILD_USER = "${env.BUILD_USER}"
-                    }           
+                    }
                 }
                 echo '${BUILD_USER}'
             }
@@ -40,7 +40,7 @@ pipeline {
     }
 
     post {
-        
+
         success {
             dingtalk (
                 robot: "Jenkins",

File diff suppressed because it is too large
+ 0 - 0
dist/assets/album-my-legacy.b4408557.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/album-my.c6f6fef6.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/auth-login-legacy.44237340.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/auth-login.f781ba1d.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/create-legacy.08621fc6.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/create-legacy.346289f7.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/create-legacy.4a5dc621.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/create.2a2fa4c6.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/create.67610629.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/create.fa786f60.js


+ 1 - 1
dist/assets/home-layout-center-legacy.2647dd3f.js → dist/assets/home-layout-center-legacy.da24a47c.js

@@ -1 +1 @@
-!function(){function e(e,t,n,r,o,s,u){try{var a=e[s](u),i=a.value}catch(c){return void n(c)}a.done?t(i):Promise.resolve(i).then(r,o)}System.register(["./ResizeObserver.es-legacy.a86d6777.js","./index-legacy.8df13df7.js","./auth-legacy.488eab8f.js","./routes-common-legacy.4596641a.js"],(function(t){"use strict";var n,r,o,s,u,a,i,c,f,l;return{setters:[function(e){n=e.d,r=e.g,o=e.u,s=e.p,u=e.i,a=e.j,i=e.C,c=e.F},function(e){f=e.a,l=e.b},function(){},function(){}],execute:function(){t("default",n({name:"home-layout-center",data:function(){return{status:!1}},mounted:function(){this.getUserInfo()},methods:{getUserInfo:function(){var t,n=this;return(t=regeneratorRuntime.mark((function e(){var t,a,i;return regeneratorRuntime.wrap((function(e){for(;;)switch(e.prev=e.next){case 0:return e.prev=0,e.next=3,f.post("/api-auth/smsLogin",{requestType:"form",data:{clientId:"student",clientSecret:"student",phone:r.orchestraInfo.phone,token:r.orchestraInfo.token,isSurportRegister:!0}});case 3:return t=e.sent,a=t.data.authentication,o(a.token_type+" "+a.access_token),s({api:"setCache",content:{key:"h5-colexiu-token",value:a.token_type+" "+a.access_token}}),e.next=9,f.get("/api-student/student/queryUserInfo",{initRequest:!0});case 9:i=e.sent,u(i.data),n.$router.push("/home"),e.next=17;break;case 14:e.prev=14,e.t0=e.catch(0),n.status=!0;case 17:case"end":return e.stop()}}),e,null,[[0,14]])})),function(){var n=this,r=arguments;return new Promise((function(o,s){var u=t.apply(n,r);function a(t){e(u,o,s,a,i,"next",t)}function i(t){e(u,o,s,a,i,"throw",t)}a(void 0)}))})()}},render:function(){return a(c,null,[this.status?a("div",{class:l.error},[a(i,{type:"notFond",classImgSize:"CERT",tips:"加载失败,请稍后重试",buttonText:"重新加载",plain:!0,onClick:this.getUserInfo},null)]):a("div",null,null)])}}))}}}))}();
+!function(){function e(e,t,n,r,o,s,u){try{var a=e[s](u),i=a.value}catch(c){return void n(c)}a.done?t(i):Promise.resolve(i).then(r,o)}System.register(["./ResizeObserver.es-legacy.a86d6777.js","./index-legacy.5d0b1f58.js","./auth-legacy.488eab8f.js","./routes-common-legacy.e8855d3f.js"],(function(t){"use strict";var n,r,o,s,u,a,i,c,f,l;return{setters:[function(e){n=e.d,r=e.g,o=e.u,s=e.p,u=e.i,a=e.j,i=e.C,c=e.F},function(e){f=e.a,l=e.b},function(){},function(){}],execute:function(){t("default",n({name:"home-layout-center",data:function(){return{status:!1}},mounted:function(){this.getUserInfo()},methods:{getUserInfo:function(){var t,n=this;return(t=regeneratorRuntime.mark((function e(){var t,a,i;return regeneratorRuntime.wrap((function(e){for(;;)switch(e.prev=e.next){case 0:return e.prev=0,e.next=3,f.post("/api-auth/smsLogin",{requestType:"form",data:{clientId:"student",clientSecret:"student",phone:r.orchestraInfo.phone,token:r.orchestraInfo.token,isSurportRegister:!0}});case 3:return t=e.sent,a=t.data.authentication,o(a.token_type+" "+a.access_token),s({api:"setCache",content:{key:"h5-colexiu-token",value:a.token_type+" "+a.access_token}}),e.next=9,f.get("/api-student/student/queryUserInfo",{initRequest:!0});case 9:i=e.sent,u(i.data),n.$router.push("/home"),e.next=17;break;case 14:e.prev=14,e.t0=e.catch(0),n.status=!0;case 17:case"end":return e.stop()}}),e,null,[[0,14]])})),function(){var n=this,r=arguments;return new Promise((function(o,s){var u=t.apply(n,r);function a(t){e(u,o,s,a,i,"next",t)}function i(t){e(u,o,s,a,i,"throw",t)}a(void 0)}))})()}},render:function(){return a(c,null,[this.status?a("div",{class:l.error},[a(i,{type:"notFond",classImgSize:"CERT",tips:"加载失败,请稍后重试",buttonText:"重新加载",plain:!0,onClick:this.getUserInfo},null)]):a("div",null,null)])}}))}}}))}();

+ 1 - 1
dist/assets/home-layout-center.11082130.js → dist/assets/home-layout-center.4acf0444.js

@@ -1 +1 @@
-import{d as r,g as s,u,p as i,i as c,j as e,C as l,F as p}from"./ResizeObserver.es.493a14ba.js";import{a,b as h}from"./index.be200afc.js";import"./auth.1afb5182.js";import"./routes-common.00768f5b.js";var g=r({name:"home-layout-center",data(){return{status:!1}},mounted(){this.getUserInfo()},methods:{async getUserInfo(){try{const o=await a.post("/api-auth/smsLogin",{requestType:"form",data:{clientId:"student",clientSecret:"student",phone:s.orchestraInfo.phone,token:s.orchestraInfo.token,isSurportRegister:!0}}),{authentication:t}=o.data;u(t.token_type+" "+t.access_token),i({api:"setCache",content:{key:"h5-colexiu-token",value:t.token_type+" "+t.access_token}});const n=await a.get("/api-student/student/queryUserInfo",{initRequest:!0});c(n.data),this.$router.push("/home")}catch{this.status=!0}}},render(){return e(p,null,[this.status?e("div",{class:h.error},[e(l,{type:"notFond",classImgSize:"CERT",tips:"\u52A0\u8F7D\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5",buttonText:"\u91CD\u65B0\u52A0\u8F7D",plain:!0,onClick:this.getUserInfo},null)]):e("div",null,null)])}});export{g as default};
+import{d as r,g as s,u,p as i,i as c,j as e,C as l,F as p}from"./ResizeObserver.es.493a14ba.js";import{a,b as h}from"./index.43420db3.js";import"./auth.1afb5182.js";import"./routes-common.da3f1355.js";var g=r({name:"home-layout-center",data(){return{status:!1}},mounted(){this.getUserInfo()},methods:{async getUserInfo(){try{const o=await a.post("/api-auth/smsLogin",{requestType:"form",data:{clientId:"student",clientSecret:"student",phone:s.orchestraInfo.phone,token:s.orchestraInfo.token,isSurportRegister:!0}}),{authentication:t}=o.data;u(t.token_type+" "+t.access_token),i({api:"setCache",content:{key:"h5-colexiu-token",value:t.token_type+" "+t.access_token}});const n=await a.get("/api-student/student/queryUserInfo",{initRequest:!0});c(n.data),this.$router.push("/home")}catch{this.status=!0}}},render(){return e(p,null,[this.status?e("div",{class:h.error},[e(l,{type:"notFond",classImgSize:"CERT",tips:"\u52A0\u8F7D\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5",buttonText:"\u91CD\u65B0\u52A0\u8F7D",plain:!0,onClick:this.getUserInfo},null)]):e("div",null,null)])}});export{g as default};

File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.08050ab3.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.10c89c62.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.1e0042cf.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.1f2934fd.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.39352dca.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.489c20d4.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.4d079e19.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.503ce9d9.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.5d0b1f58.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.723e3357.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.91392fe9.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.a5439f45.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.b489944b.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.d18d11aa.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.d8082775.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.dede1c47.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.f6f6486d.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.03f33068.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.0cb9bd36.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.0f90792c.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.343ed577.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.3b9e1602.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.43420db3.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.532a3fdf.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.566ba85e.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.7a271ff4.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.93ea6c1b.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.a14c95a4.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.be200afc.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.c0c04343.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.c7cc2349.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.c7cebaa6.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.db9709bd.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.f6b54541.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.fae7b8d3.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/live-detail-legacy.0bc4773c.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/live-detail-legacy.ab126ccf.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/live-detail.4eeb38f0.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/live-detail.ff30a036.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/login-legacy.8ac9c01c.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/login.9d2bdcc4.js


+ 0 - 0
dist/assets/select-subject.5e7efcef.css → dist/assets/organ-search.133b8c72.css


File diff suppressed because it is too large
+ 0 - 0
dist/assets/polyfills-legacy.dd014733.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/routes-common-legacy.e8855d3f.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/routes-common.00768f5b.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/routes-common.da3f1355.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/search-result-legacy.af91b1ee.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/search-result.45035e1a.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/searchAlbum-legacy.842b0d1e.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/searchAlbum.5434439d.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/teacher-home-legacy.1e0c05f0.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/teacher-home.87cae3eb.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/teacher-legacy.6714b7ac.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/teacher.1fadf283.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/tenant-legacy.44b55ffb.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/tenant.72882726.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/video-detail-legacy.b5689b8e.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/video-detail-legacy.d2b006cf.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/video-detail.0a6a347a.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/video-detail.34425714.js


+ 4 - 4
dist/index.html

@@ -52,10 +52,10 @@
             _T_));
     })(Object);
   </script>
-  <script type="module" crossorigin src="./assets/index.be200afc.js"></script>
+  <script type="module" crossorigin src="./assets/index.43420db3.js"></script>
   <link rel="modulepreload" href="./assets/ResizeObserver.es.493a14ba.js">
   <link rel="modulepreload" href="./assets/auth.1afb5182.js">
-  <link rel="modulepreload" href="./assets/routes-common.00768f5b.js">
+  <link rel="modulepreload" href="./assets/routes-common.da3f1355.js">
   <link rel="stylesheet" href="./assets/ResizeObserver.es.ea6352ab.css">
   <link rel="stylesheet" href="./assets/auth.f09b6d78.css">
   <link rel="stylesheet" href="./assets/index.820e7d12.css">
@@ -67,8 +67,8 @@
   
   <!-- <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>
-  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.f001d713.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.8df13df7.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.dd014733.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.5d0b1f58.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

+ 4 - 4
dist/teacher.html

@@ -52,9 +52,9 @@
             _T_));
     })(Object);
   </script>
-  <script type="module" crossorigin src="./assets/teacher.b478c309.js"></script>
+  <script type="module" crossorigin src="./assets/teacher.1fadf283.js"></script>
   <link rel="modulepreload" href="./assets/ResizeObserver.es.493a14ba.js">
-  <link rel="modulepreload" href="./assets/routes-common.00768f5b.js">
+  <link rel="modulepreload" href="./assets/routes-common.da3f1355.js">
   <link rel="stylesheet" href="./assets/ResizeObserver.es.ea6352ab.css">
   <link rel="stylesheet" href="./assets/teacher.ded4b243.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>
@@ -64,8 +64,8 @@
   <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>
-  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.f001d713.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.6d0e00e8.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.dd014733.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.6714b7ac.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

+ 3 - 3
dist/tenant.html

@@ -52,7 +52,7 @@
             _T_));
     })(Object);
   </script>
-  <script type="module" crossorigin src="./assets/tenant.0a14a494.js"></script>
+  <script type="module" crossorigin src="./assets/tenant.72882726.js"></script>
   <link rel="modulepreload" href="./assets/ResizeObserver.es.493a14ba.js">
   <link rel="modulepreload" href="./assets/auth.1afb5182.js">
   <link rel="stylesheet" href="./assets/ResizeObserver.es.ea6352ab.css">
@@ -66,8 +66,8 @@
   
   <!-- <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>
-  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.f001d713.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.f25821b4.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.dd014733.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.44b55ffb.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

+ 10 - 5
package-lock.json

@@ -10858,7 +10858,8 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmmirror.com/@vitejs/plugin-vue/-/plugin-vue-2.0.1.tgz",
       "integrity": "sha512-wtdMnGVvys9K8tg+DxowU1ytTrdVveXr3LzdhaKakysgGXyrsfaeds2cDywtvujEASjWOwWL/OgWM+qoeM8Plg==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "@vitejs/plugin-vue-jsx": {
       "version": "1.3.8",
@@ -11152,7 +11153,8 @@
       "version": "5.3.1",
       "resolved": "https://registry.npmmirror.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
       "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "aggregate-error": {
       "version": "3.1.0",
@@ -14762,7 +14764,8 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmmirror.com/postcss-pxtorem/-/postcss-pxtorem-6.0.0.tgz",
       "integrity": "sha512-ZRXrD7MLLjLk2RNGV6UA4f5Y7gy+a/j1EqjAfp9NdcNYVjUMvg5HTYduTjSkKBkRkfqbg/iKrjMO70V4g1LZeg==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-value-parser": {
       "version": "4.2.0",
@@ -14968,7 +14971,8 @@
     "qrcode.vue": {
       "version": "3.3.3",
       "resolved": "https://registry.npmmirror.com/qrcode.vue/-/qrcode.vue-3.3.3.tgz",
-      "integrity": "sha512-OsD4tQjIbxg/K6D5ZkWjBdYI9eg9K2i8qeYILdEAX5mdAydSAxV7xKmmZSP/hA12olLqEMZ9ryqDQrwa9jEMgw=="
+      "integrity": "sha512-OsD4tQjIbxg/K6D5ZkWjBdYI9eg9K2i8qeYILdEAX5mdAydSAxV7xKmmZSP/hA12olLqEMZ9ryqDQrwa9jEMgw==",
+      "requires": {}
     },
     "qs": {
       "version": "6.10.3",
@@ -16045,7 +16049,8 @@
     "vue-demi": {
       "version": "0.13.2",
       "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.13.2.tgz",
-      "integrity": "sha512-41ukrclEbMddAyP7PvxMSYqnOSzPV6r7GNnyTSKSCNTaz19GehxmTiXyP9kwHSUv2+Dr6hHqiUiF7L1VAw2KdQ=="
+      "integrity": "sha512-41ukrclEbMddAyP7PvxMSYqnOSzPV6r7GNnyTSKSCNTaz19GehxmTiXyP9kwHSUv2+Dr6hHqiUiF7L1VAw2KdQ==",
+      "requires": {}
     },
     "vue-echarts": {
       "version": "6.2.3",

+ 1 - 1
src/student/live-class/live-detail.tsx

@@ -33,7 +33,7 @@ export default defineComponent({
       recomUserId: query.recomUserId, // 推荐人id
       groupId: query.groupId,
       courseId: query.classId,
-      platform: query.p, // 属于哪个平台,//机构老师 tenant,平台老师 无
+      // platform: query.p, // 属于哪个平台,//机构老师 tenant,平台老师 无
       live: {} as any,
       shareStatus: false,
       shareUrl: ''

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

@@ -28,7 +28,7 @@ export default defineComponent({
       params: {
         groupId: query.groupId
       },
-      platform: query.p, // 属于哪个平台,//机构老师 tenant,平台老师 无
+      // platform: query.p, // 属于哪个平台,//机构老师 tenant,平台老师 无
       shareStatus: false,
       shareUrl: ''
     }

+ 5 - 5
src/teacher/live-class/create-components/course-start.tsx

@@ -189,7 +189,7 @@ export default defineComponent({
           >
             <p class={styles.photoTip}>模板图片将作为该课程封面为学员展示</p>
             {/* {createState.tabIndex === 1 ? ( */}
-            <Field
+            {/* <Field
               name="backgroundPicTemplate"
               border={false}
               v-show={createState.tabIndex === 1}
@@ -234,16 +234,16 @@ export default defineComponent({
                   </RadioGroup>
                 )
               }}
-            />
+            /> */}
             {/* ) : null} */}
-            {/* {createState.tabIndex == 2 ? ( */}
+            {/* {createState.tabIndex == 2 ? (   v-show={createState.tabIndex == 2}*/}
             <Field
               name="backgroundPic"
               border={false}
-              v-show={createState.tabIndex == 2}
+
               rules={[
                 {
-                  required: createState.tabIndex == 2,
+                  required: true,
                   message: '请上传自定义模板'
                 }
               ]}

+ 1 - 0
src/teacher/video-class/class-info.tsx

@@ -1,3 +1,4 @@
+
 import ColField from '@/components/col-field'
 import ColFieldGroup from '@/components/col-field-group'
 import ColPopup from '@/components/col-popup'

+ 12 - 9
src/tenant/music/component/song/index.tsx

@@ -118,15 +118,18 @@ export default defineComponent({
                   )}
 
                   <div class={styles.tags}>
-                    {n.subjectNames
-                      ? n.subjectNames
-                          ?.split(',')
-                          .map((name: any) => <span>{name}</span>)
-                      : n.musicSubjectName &&
-                        n.musicSubjectName
-                          ?.split(',')
-                          .map((name: any) => <span>{name}</span>)}
-                    {n.musicSheetType === 'CONCERT' && <span>合奏</span>}
+                    {n.musicSheetType === 'CONCERT' ? (
+                      <span>合奏</span>
+                    ) : n.subjectNames ? (
+                      n.subjectNames
+                        ?.split(',')
+                        .map((name: any) => <span>{name}</span>)
+                    ) : (
+                      n.musicSubjectName &&
+                      n.musicSubjectName
+                        ?.split(',')
+                        .map((name: any) => <span>{name}</span>)
+                    )}
                   </div>
 
                   <span class={[styles.name]}>

+ 131 - 125
src/tenant/music/coursewarePlay/component/video-item/index.tsx

@@ -6,10 +6,10 @@ import {
   render,
   toRefs,
   watch
-} from 'vue';
-import 'plyr/dist/plyr.css';
-import Plyr from 'plyr';
-import styles from './index.module.less';
+} from 'vue'
+import 'plyr/dist/plyr.css'
+import Plyr from 'plyr'
+import styles from './index.module.less'
 
 import {
   iconVideoBg,
@@ -18,9 +18,9 @@ import {
   iconPlay,
   iconPause,
   iconSpeed
-} from '../../image/icons.json';
-import { Popup, Slider } from 'vant';
-import { useElementBounding } from '@vueuse/core';
+} from '../../image/icons.json'
+import { Popup, Slider } from 'vant'
+import { useElementBounding } from '@vueuse/core'
 
 export default defineComponent({
   name: 'video-play',
@@ -28,7 +28,7 @@ export default defineComponent({
     item: {
       type: Object,
       default: () => {
-        return {};
+        return {}
       }
     },
     activeModel: {
@@ -38,7 +38,7 @@ export default defineComponent({
   },
   emits: ['play', 'pause', 'ended', 'close'],
   setup(props, { emit, expose }) {
-    const { item } = toRefs(props);
+    const { item } = toRefs(props)
     const data = reactive({
       videoContianerRef: null as unknown as HTMLAudioElement,
       videoState: 'pause' as 'init' | 'play' | 'pause',
@@ -49,77 +49,77 @@ export default defineComponent({
         left: '1px'
       },
       defaultSpeed: 1 // 默认速度
-    });
-    const controlID = 'v' + Date.now() + Math.floor(Math.random() * 100);
-    const playBtnId = 'play' + Date.now() + Math.floor(Math.random() * 100);
-    const loopBtnId = 'loop' + Date.now() + Math.floor(Math.random() * 100);
-    const speedBtnId = 'speed' + Date.now() + Math.floor(Math.random() * 100);
+    })
+    const controlID = 'v' + Date.now() + Math.floor(Math.random() * 100)
+    const playBtnId = 'play' + Date.now() + Math.floor(Math.random() * 100)
+    const loopBtnId = 'loop' + Date.now() + Math.floor(Math.random() * 100)
+    const speedBtnId = 'speed' + Date.now() + Math.floor(Math.random() * 100)
     const speedPopoverId =
-      'popover' + Date.now() + Math.floor(Math.random() * 100);
+      'popover' + Date.now() + Math.floor(Math.random() * 100)
 
     const togglePlay = (e: Event) => {
-      e.stopPropagation();
-      data.speedControl = false;
+      e.stopPropagation()
+      data.speedControl = false
       if (!data.videoContianerRef.paused) {
-        data.videoItem?.pause();
+        data.videoItem?.pause()
       } else {
-        data.videoContianerRef?.play();
+        data.videoContianerRef?.play()
       }
-    };
+    }
     const toggleLoop = () => {
-      data.speedControl = false;
-      const loopBtn = document.getElementById(loopBtnId);
-      if (!loopBtn || !data.videoItem) return;
-      const isLoop = data.videoItem.loop;
+      data.speedControl = false
+      const loopBtn = document.getElementById(loopBtnId)
+      if (!loopBtn || !data.videoItem) return
+      const isLoop = data.videoItem.loop
       if (isLoop) {
-        loopBtn.classList.remove(styles.active);
+        loopBtn.classList.remove(styles.active)
       } else {
-        loopBtn.classList.add(styles.active);
+        loopBtn.classList.add(styles.active)
       }
-      data.videoItem.loop = !data.videoItem.loop;
-    };
+      data.videoItem.loop = !data.videoItem.loop
+    }
     const onDefault = () => {
       document
         .getElementById(controlID)
         ?.addEventListener('click', (e: Event) => {
-          e.stopPropagation();
-          data.speedControl = false;
-          if (data.videoContianerRef.paused) return;
-          emit('close');
-        });
+          e.stopPropagation()
+          data.speedControl = false
+          if (data.videoContianerRef.paused) return
+          emit('close')
+        })
       document.getElementById(controlID)?.addEventListener('touchmove', () => {
-        data.speedControl = false;
-        if (data.videoContianerRef.paused) return;
-        emit('close');
-      });
-      document.getElementById(playBtnId)?.addEventListener('click', togglePlay);
-      document.getElementById(loopBtnId)?.addEventListener('click', toggleLoop);
+        data.speedControl = false
+        if (data.videoContianerRef.paused) return
+        emit('close')
+      })
+      document.getElementById(playBtnId)?.addEventListener('click', togglePlay)
+      document.getElementById(loopBtnId)?.addEventListener('click', toggleLoop)
 
       document.getElementById(speedBtnId)?.addEventListener('click', e => {
-        e.stopPropagation();
-        data.speedControl = !data.speedControl;
-      });
+        e.stopPropagation()
+        data.speedControl = !data.speedControl
+      })
 
-      setName();
-    };
+      setName()
+    }
     const setName = () => {
-      const nameEl = document.getElementById('videoItemName');
+      const nameEl = document.getElementById('videoItemName')
       if (nameEl) {
-        nameEl.innerHTML = item.value.name || '';
+        nameEl.innerHTML = item.value.name || ''
       }
-    };
+    }
 
     const changePlayBtn = (code: string) => {
-      const playBtn = document.getElementById(playBtnId);
-      if (!playBtn) return;
+      const playBtn = document.getElementById(playBtnId)
+      if (!playBtn) return
       if (code == 'play') {
-        playBtn.classList.remove(styles.btnPause);
-        playBtn.classList.add(styles.btnPlay);
+        playBtn.classList.remove(styles.btnPause)
+        playBtn.classList.add(styles.btnPlay)
       } else {
-        playBtn.classList.remove(styles.btnPlay);
-        playBtn.classList.add(styles.btnPause);
+        playBtn.classList.remove(styles.btnPlay)
+        playBtn.classList.add(styles.btnPause)
       }
-    };
+    }
     const controls = `
             <div id="${controlID}" class="plyr__controls bottomFixed ${styles.controls}">
                 <div class="${styles.time}">
@@ -152,7 +152,7 @@ export default defineComponent({
                     </div>
                     <div id="videoItemName"></div>
                 </div>
-            </div>`;
+            </div>` as any
 
     onMounted(() => {
       data.videoItem = new Plyr(data.videoContianerRef, {
@@ -162,79 +162,79 @@ export default defineComponent({
         hideControls: false, // 在 2 秒没有鼠标或焦点移动、控制元素模糊(制表符退出)、播放开始或进入全屏时自动隐藏视频控件。只要移动鼠标、聚焦控制元素或暂停播放,控件就会立即重新出现。
         clickToPlay: false, // 单击(或点击)视频容器将切换播放/暂停
         fullscreen: { enabled: false, fallback: false, iosNative: false } // 不适用全屏
-      });
+      })
 
       nextTick(() => {
-        onDefault();
-      });
-    });
+        onDefault()
+      })
+    })
 
     const toggleHideControl = (isShow: boolean) => {
-      data.videoItem?.toggleControls(isShow);
+      data.videoItem?.toggleControls(isShow)
 
       if (!isShow) {
-        data.speedControl = isShow;
+        data.speedControl = isShow
       }
-    };
+    }
     watch(
       () => props.activeModel,
       () => {
-        toggleHideControl(props.activeModel);
+        toggleHideControl(props.activeModel)
       }
-    );
+    )
 
     watch(
       () => props.item,
       () => {
-        setName();
+        setName()
         // 设置视屏播放器的默认速度
-        if (data.videoItem) data.videoItem.speed = data.defaultSpeed || 1;
+        if (data.videoItem) data.videoItem.speed = data.defaultSpeed || 1
 
         // 切换的时候隐藏
-        data.speedControl = false;
+        data.speedControl = false
       }
-    );
-    let videoTimer = null as any;
+    )
+    let videoTimer = null as any
     const handlePlayVideo = () => {
-      clearTimeout(videoTimer);
+      clearTimeout(videoTimer)
       nextTick(() => {
         data.videoContianerRef.play().catch(err => {
-          console.log('🚀 ~ err:', err);
+          console.log('🚀 ~ err:', err)
           videoTimer = setTimeout(() => {
             if (err?.message?.includes('play()')) {
-              emit('play');
+              emit('play')
             }
-            handlePlayVideo();
-          }, 1000);
-        });
-      });
-    };
+            handlePlayVideo()
+          }, 1000)
+        })
+      })
+    }
 
-    let videoErrorTimer = null as any;
-    let videoErrorCount = 0;
+    let videoErrorTimer = null as any
+    let videoErrorCount = 0
     const handleErrorVideo = () => {
       if (videoErrorCount > 5) {
-        return;
+        return
       }
-      clearTimeout(videoErrorTimer);
+      clearTimeout(videoErrorTimer)
       nextTick(() => {
         videoErrorTimer = setTimeout(() => {
-          data.videoContianerRef.src = props.item?.content;
+          data.videoContianerRef.src = props.item?.content
 
-          emit('play');
-          data.videoContianerRef.load();
+          emit('play')
+          data.videoContianerRef.load()
           // eslint-disable-next-line @typescript-eslint/no-unused-vars
-          handleErrorVideo();
-        }, 1000);
-      });
-      videoErrorCount++;
-    };
+          handleErrorVideo()
+        }, 1000)
+      })
+      videoErrorCount++
+    }
     const getVideoRef = () => {
-      return data.videoContianerRef;
-    };
+      return data.videoContianerRef
+    }
     expose({
       getVideoRef
-    });
+    })
 
     return () => (
       <div class={styles.videoWrap}>
@@ -249,57 +249,61 @@ export default defineComponent({
           playsinline
           x5-video-player-type="h5"
           onLoadedmetadata={() => {
-            data.videoState = 'pause';
-            changePlayBtn('play');
+            data.videoState = 'pause'
+            changePlayBtn('play')
             nextTick(() => {
-              data.videoContianerRef.currentTime = 0;
-              nextTick(handlePlayVideo);
-            });
+              data.videoContianerRef.currentTime = 0
+              nextTick(handlePlayVideo)
+            })
           }}
           onPlay={() => {
-            videoErrorCount = 0;
+            videoErrorCount = 0
             // console.log('开始播放')
-            data.videoState = 'play';
-            changePlayBtn('pause');
-            emit('close');
-            emit('play');
-            clearTimeout(videoErrorTimer);
+            data.videoState = 'play'
+            changePlayBtn('pause')
+            emit('close')
+            emit('play')
+            clearTimeout(videoErrorTimer)
           }}
           onPause={() => {
             // console.log('暂停播放')
-            data.videoState = 'pause';
-            changePlayBtn('play');
-            emit('pause');
+            data.videoState = 'pause'
+            changePlayBtn('play')
+            emit('pause')
           }}
           onEnded={() => {
             // console.log('播放结束')
-            data.videoState = 'pause';
-            changePlayBtn('play');
-            emit('ended');
+            data.videoState = 'pause'
+            changePlayBtn('play')
+            emit('ended')
           }}
-          onError={handleErrorVideo}></video>
+          onError={handleErrorVideo}
+        ></video>
 
         <div
           style={{
             display: data.speedControl ? 'block' : 'none'
-          }}>
+          }}
+        >
           <div
             class={styles.sliderPopup}
             onClick={(e: Event) => {
-              e.stopPropagation();
-            }}>
+              e.stopPropagation()
+            }}
+          >
             <i
               class={styles.iconAdd}
               onClick={() => {
                 if (data.defaultSpeed >= 1.5) {
-                  return;
+                  return
                 }
 
                 if (data.videoItem) {
-                  data.defaultSpeed = (data.defaultSpeed * 10 + 1) / 10;
-                  data.videoItem.speed = data.defaultSpeed;
+                  data.defaultSpeed = (data.defaultSpeed * 10 + 1) / 10
+                  data.videoItem.speed = data.defaultSpeed
                 }
-              }}></i>
+              }}
+            ></i>
             <Slider
               min={0.5}
               max={1.5}
@@ -310,9 +314,10 @@ export default defineComponent({
               reverse
               onChange={() => {
                 if (data.videoItem) {
-                  data.videoItem.speed = data.defaultSpeed;
+                  data.videoItem.speed = data.defaultSpeed
                 }
-              }}>
+              }}
+            >
               {{
                 button: () => (
                   <div class={styles.sliderPoint}>
@@ -326,16 +331,17 @@ export default defineComponent({
               class={[styles.iconCut]}
               onClick={() => {
                 if (data.defaultSpeed <= 0.5) {
-                  return;
+                  return
                 }
                 if (data.videoItem) {
-                  data.defaultSpeed = (data.defaultSpeed * 10 - 1) / 10;
-                  data.videoItem.speed = data.defaultSpeed;
+                  data.defaultSpeed = (data.defaultSpeed * 10 - 1) / 10
+                  data.videoItem.speed = data.defaultSpeed
                 }
-              }}></i>
+              }}
+            ></i>
           </div>
         </div>
       </div>
-    );
+    )
   }
-});
+})

+ 12 - 6
src/tenant/music/coursewarePlay/component/video-item/video-play.tsx

@@ -54,10 +54,12 @@ export default defineComponent({
       videoItem.value.loop = !videoItem.value.loop
     }
     const onDefault = () => {
-      document.getElementById(controlID)?.addEventListener('click', (e: Event) => {
-        e.stopPropagation()
-        emit('reset')
-      })
+      document
+        .getElementById(controlID)
+        ?.addEventListener('click', (e: Event) => {
+          e.stopPropagation()
+          emit('reset')
+        })
       document.getElementById(playBtnId)?.addEventListener('click', togglePlay)
       document.getElementById(loopBtnId)?.addEventListener('click', toggleLoop)
     }
@@ -100,7 +102,7 @@ export default defineComponent({
                     </div>
                     <div>${item.value.name}</div>
                 </div>
-            </div>`
+            </div>` as any
 
     onMounted(() => {
       emit('prepare', false)
@@ -121,7 +123,11 @@ export default defineComponent({
           }
 
           // console.log('开始播放', item.value)
-          if (!item.value.autoPlay && !item.value.isprepare && videoItem.value) {
+          if (
+            !item.value.autoPlay &&
+            !item.value.isprepare &&
+            videoItem.value
+          ) {
             // 加载完成后,取消静音播放
             videoItem.value.pause()
             console.log(videoItem.value?.paused, 'video status')

+ 2 - 0
src/views/article-center/theory.tsx

@@ -1,3 +1,4 @@
+
 import request from '@/helpers/request'
 import {
   Cell,
@@ -187,3 +188,4 @@ export default defineComponent({
     )
   }
 })
+

+ 6 - 3
src/views/music/component/song/index.tsx

@@ -104,11 +104,14 @@ export default defineComponent({
                       : `作曲:${n.composer}`}
                   </span>
                   <div class={styles.tags}>
-                    {n?.subjectNames &&
+                    {n.musicSheetType === 'CONCERT' ? (
+                      <span>合奏</span>
+                    ) : (
+                      n?.subjectNames &&
                       n?.subjectNames
                         .split(',')
-                        .map((name: any) => <span>{name}</span>)}
-                    {n.musicSheetType === 'CONCERT' && <span>合奏</span>}
+                        .map((name: any) => <span>{name}</span>)
+                    )}
                   </div>
                 </div>
               </div>

+ 2 - 1
src/views/music/music-detail/index.tsx

@@ -33,7 +33,7 @@ import styles from './index.module.less'
 // import Item from '../list/item'
 import { useRect } from '@vant/use'
 import { Vue3Lottie } from 'vue3-lottie'
-import { getRandomKey, musicBuy } from '../music'
+import { getRandomKey, handleGotoMusicScore, musicBuy } from '../music'
 import { getOssUploadUrl, state } from '@/state'
 import { useEventTracking } from '@/helpers/hooks'
 import ColSticky from '@/components/col-sticky'
@@ -59,6 +59,7 @@ import firstDefault from './images/first-default.png'
 import firstActive from './images/first-active.png'
 import fixedDefault from './images/fixed-default.png'
 import fixedActive from './images/fixed-active.png'
+import qs from 'query-string'
 
 import Plyr from 'plyr'
 import 'plyr/dist/plyr.css'

+ 24 - 0
src/views/music/music.ts

@@ -35,3 +35,27 @@ export const musicBuy = (item: any, callBack?: any, moreQuery = {}) => {
     }
   })
 }
+
+/**
+ * 去云教练
+ * @param url 云教练地址
+ */
+export const handleGotoMusicScore = (item: any) => {
+  const query = qs.stringify({
+    ...qs.parse(location.hash.split('?')[1]),
+    id: item.id,
+  })
+  const url = location.origin + '/music-score/#/?' + query
+  console.log("🚀 ~ 云教练URL:", url)
+  postMessage({
+    api: 'openAccompanyWebView',
+    content: {
+      url,
+      orientation: 0,
+      isHideTitle: true,
+      statusBarTextColor: false,
+      isOpenLight: true
+    }
+  })
+  
+}

+ 23 - 28
yarn.lock

@@ -22,7 +22,7 @@
   "resolved" "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.18.8.tgz"
   "version" "7.18.8"
 
-"@babel/core@^7.16.5", "@babel/core@^7.17.2":
+"@babel/core@^7.0.0", "@babel/core@^7.0.0-0", "@babel/core@^7.12.0", "@babel/core@^7.13.0", "@babel/core@^7.16.5", "@babel/core@^7.17.2", "@babel/core@^7.4.0-0":
   "integrity" "sha512-1LIb1eL8APMy91/IMW+31ckrfBM4yCoLaVzoDhZUKSM4cu1L1nIidyxkCgzPAgrC5WEz36IPEr/eSeSF9pIn+g=="
   "resolved" "https://registry.npmmirror.com/@babel/core/-/core-7.18.9.tgz"
   "version" "7.18.9"
@@ -1105,7 +1105,7 @@
   "resolved" "https://registry.npmmirror.com/@types/web-bluetooth/-/web-bluetooth-0.0.14.tgz"
   "version" "0.0.14"
 
-"@typescript-eslint/eslint-plugin@^5.7.0":
+"@typescript-eslint/eslint-plugin@^5.0.0", "@typescript-eslint/eslint-plugin@^5.7.0":
   "integrity" "sha512-8RTGBpNn5a9M628wBPrCbJ+v3YTEOE2qeZb7TDkGKTDXSj36KGRg92SpFFaR/0S3rSXQxM0Og/kV9EyadsYSBg=="
   "resolved" "https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.7.0.tgz"
   "version" "5.7.0"
@@ -1131,7 +1131,7 @@
     "eslint-scope" "^5.1.1"
     "eslint-utils" "^3.0.0"
 
-"@typescript-eslint/parser@^5.7.0":
+"@typescript-eslint/parser@^5.0.0", "@typescript-eslint/parser@^5.7.0":
   "integrity" "sha512-m/gWCCcS4jXw6vkrPQ1BjZ1vomP01PArgzvauBqzsoZ3urLbsRChexB8/YV8z9HwE3qlJM35FxfKZ1nfP/4x8g=="
   "resolved" "https://registry.npmmirror.com/@typescript-eslint/parser/-/parser-5.7.0.tgz"
   "version" "5.7.0"
@@ -1453,16 +1453,16 @@
   "resolved" "https://registry.npmmirror.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz"
   "version" "5.3.1"
 
+"acorn@^6.0.0 || ^7.0.0 || ^8.0.0", "acorn@^8.6.0":
+  "integrity" "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A=="
+  "resolved" "https://registry.npmmirror.com/acorn/-/acorn-8.7.1.tgz"
+  "version" "8.7.1"
+
 "acorn@^7.1.1":
   "integrity" "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
   "resolved" "https://registry.npmmirror.com/acorn/-/acorn-7.4.1.tgz"
   "version" "7.4.1"
 
-"acorn@^8.6.0":
-  "integrity" "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A=="
-  "resolved" "https://registry.npmmirror.com/acorn/-/acorn-8.7.1.tgz"
-  "version" "8.7.1"
-
 "aggregate-error@^3.0.0":
   "integrity" "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="
   "resolved" "https://registry.npmmirror.com/aggregate-error/-/aggregate-error-3.1.0.tgz"
@@ -1685,7 +1685,7 @@
   dependencies:
     "fill-range" "^7.0.1"
 
-"browserslist@^4.17.6", "browserslist@^4.20.2", "browserslist@^4.20.3":
+"browserslist@^4.17.6", "browserslist@^4.20.2", "browserslist@^4.20.3", "browserslist@>= 4.21.0":
   "integrity" "sha512-Nq8MFCSrnJXSc88yliwlzQe3qNe3VntIjhsArW9IJOEPSHNx23FalwApUVbzAWABLhYJJ7y8AynWI/XM8OdfjQ=="
   "resolved" "https://registry.npmmirror.com/browserslist/-/browserslist-4.21.1.tgz"
   "version" "4.21.1"
@@ -2213,7 +2213,7 @@
   "resolved" "https://registry.npmmirror.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz"
   "version" "0.2.0"
 
-"echarts@^5.3.3":
+"echarts@^5.1.2", "echarts@^5.3.3":
   "integrity" "sha512-BRw2serInRwO5SIwRviZ6Xgm5Lb7irgz+sLiFMmy/HOaf4SQ+7oYqxKzRHAKp4xHQ05AuHw1xvoQWJjDQq/FGw=="
   "resolved" "https://registry.npmmirror.com/echarts/-/echarts-5.3.3.tgz"
   "version" "5.3.3"
@@ -2256,7 +2256,7 @@
   dependencies:
     "iconv-lite" "^0.6.2"
 
-"enquirer@^2.3.5", "enquirer@^2.3.6":
+"enquirer@^2.3.5", "enquirer@^2.3.6", "enquirer@>= 2.3.0 < 3":
   "integrity" "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg=="
   "resolved" "https://registry.npmmirror.com/enquirer/-/enquirer-2.3.6.tgz"
   "version" "2.3.6"
@@ -2290,9 +2290,9 @@
   "resolved" "https://registry.npmmirror.com/es5-shim/-/es5-shim-4.6.7.tgz"
   "version" "4.6.7"
 
-"esbuild-darwin-64@0.14.54":
-  "integrity" "sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug=="
-  "resolved" "https://registry.npmmirror.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.54.tgz"
+"esbuild-windows-64@0.14.54":
+  "integrity" "sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ=="
+  "resolved" "https://registry.npmmirror.com/esbuild-windows-64/-/esbuild-windows-64-0.14.54.tgz"
   "version" "0.14.54"
 
 "esbuild@^0.14.27":
@@ -2344,14 +2344,14 @@
   dependencies:
     "get-stdin" "^6.0.0"
 
-"eslint-plugin-prettier@^4.0.0":
+"eslint-plugin-prettier@^3.1.0", "eslint-plugin-prettier@^4.0.0":
   "integrity" "sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ=="
   "resolved" "https://registry.npmmirror.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz"
   "version" "4.0.0"
   dependencies:
     "prettier-linter-helpers" "^1.0.0"
 
-"eslint-plugin-vue@^8.2.0":
+"eslint-plugin-vue@^8.0.1", "eslint-plugin-vue@^8.2.0":
   "integrity" "sha512-cLIdTuOAMXyHeQ4drYKcZfoyzdwdBpH279X8/N0DgmotEI9yFKb5O/cAgoie/CkQZCH/MOmh0xw/KEfS90zY2A=="
   "resolved" "https://registry.npmmirror.com/eslint-plugin-vue/-/eslint-plugin-vue-8.2.0.tgz"
   "version" "8.2.0"
@@ -2402,7 +2402,7 @@
   "resolved" "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz"
   "version" "3.1.0"
 
-"eslint@^8.4.1":
+"eslint@*", "eslint@^6.0.0 || ^7.0.0 || ^8.0.0", "eslint@^6.2.0 || ^7.0.0 || ^8.0.0", "eslint@^8.4.1", "eslint@>= 5.0.0", "eslint@>=3.14.1", "eslint@>=5", "eslint@>=6.0.0", "eslint@>=7.28.0":
   "integrity" "sha512-TxU/p7LB1KxQ6+7aztTnO7K0i+h0tDi81YRY9VzB6Id71kNz+fFYnf5HD5UOQmxkzcoa0TlVZf9dpMtUv0GpWg=="
   "resolved" "https://registry.npmmirror.com/eslint/-/eslint-8.4.1.tgz"
   "version" "8.4.1"
@@ -2707,11 +2707,6 @@
   "resolved" "https://registry.npmmirror.com/fs.realpath/-/fs.realpath-1.0.0.tgz"
   "version" "1.0.0"
 
-"fsevents@~2.3.2":
-  "integrity" "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="
-  "resolved" "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.2.tgz"
-  "version" "2.3.2"
-
 "function-bind@^1.1.1", "function-bind@^1.1.2":
   "integrity" "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
   "resolved" "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.2.tgz"
@@ -3386,7 +3381,7 @@
   dependencies:
     "klona" "^2.0.4"
 
-"less@^4.1.2":
+"less@*", "less@^3.5.0 || ^4.0.0", "less@^4.1.2":
   "integrity" "sha512-EoQp/Et7OSOVu0aJknJOtlXZsnr8XE8KwuzTHOLeVSEx8pVWUICc8Q0VYRHgzyjX78nMEyC/oztWFbgyhtNfDA=="
   "resolved" "https://registry.npmmirror.com/less/-/less-4.1.2.tgz"
   "version" "4.1.2"
@@ -4108,7 +4103,7 @@
   "resolved" "https://registry.npmmirror.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"
   "version" "4.2.0"
 
-"postcss@^8.1.10", "postcss@^8.4.13", "postcss@^8.4.5":
+"postcss@^8.0.0", "postcss@^8.1.0", "postcss@^8.1.10", "postcss@^8.4.13", "postcss@^8.4.5":
   "integrity" "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig=="
   "resolved" "https://registry.npmmirror.com/postcss/-/postcss-8.4.14.tgz"
   "version" "8.4.14"
@@ -4129,7 +4124,7 @@
   dependencies:
     "fast-diff" "^1.1.2"
 
-"prettier@^2.5.1":
+"prettier@^2.5.1", "prettier@>= 1.13.0", "prettier@>=2.0.0":
   "integrity" "sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg=="
   "resolved" "https://registry.npmmirror.com/prettier/-/prettier-2.5.1.tgz"
   "version" "2.5.1"
@@ -4960,7 +4955,7 @@
   "resolved" "https://registry.npmmirror.com/type-fest/-/type-fest-0.21.3.tgz"
   "version" "0.21.3"
 
-"typescript@^4.5.2":
+"typescript@*", "typescript@^4.5.2", "typescript@>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta":
   "integrity" "sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw=="
   "resolved" "https://registry.npmmirror.com/typescript/-/typescript-4.5.2.tgz"
   "version" "4.5.2"
@@ -5122,7 +5117,7 @@
     "fs-extra" "^10.0.0"
     "magic-string" "^0.25.7"
 
-"vite@^2.9.8":
+"vite@^2.5.10", "vite@^2.8.0", "vite@^2.9.8", "vite@>=2.0.0":
   "integrity" "sha512-zsBGwn5UT3YS0NLSJ7hnR54+vUKfgzMUh/Z9CxF1YKEBVIe213+63jrFLmZphgGI5zXwQCSmqIdbPuE8NJywPw=="
   "resolved" "https://registry.npmmirror.com/vite/-/vite-2.9.8.tgz"
   "version" "2.9.8"
@@ -5314,7 +5309,7 @@
     "@volar/shared" "0.29.8"
     "vscode-vue-languageservice" "0.29.8"
 
-"vue@^3.2.26":
+"vue@^2.6.0 || ^3.2.0", "vue@^2.6.12 || ^3.1.1", "vue@^3.0.0", "vue@^3.0.0-0 || ^2.6.0", "vue@^3.0.2", "vue@^3.2", "vue@^3.2.25", "vue@^3.2.26", "vue@3.2.26":
   "integrity" "sha512-KD4lULmskL5cCsEkfhERVRIOEDrfEL9CwAsLYpzptOGjaGFNWo3BQ9g8MAb7RaIO71rmVOziZ/uEN/rHwcUIhg=="
   "resolved" "https://registry.npmmirror.com/vue/-/vue-3.2.26.tgz"
   "version" "3.2.26"

Some files were not shown because too many files changed in this diff