合并打包

dist/assets/home-layout-center-legacy.7dccdf46.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/home-layout-center-legacy.fc7e9f40.js
+!function(){function e(e,t,n,r,o,s,u){try{var a=e[s](u),c=a.value}catch(i){return void n(i)}a.done?t(c):Promise.resolve(c).then(r,o)}System.register(["./ResizeObserver.es-legacy.550cdd79.js","./index-legacy.e022a6a2.js","./auth-legacy.5ebab0c6.js","./routes-common-legacy.9f70dad4.js"],(function(t){"use strict";var n,r,o,s,u,a,c,i,f,l;return{setters:[function(e){n=e.d,r=e.g,o=e.u,s=e.p,u=e.i,a=e.j,c=e.C,i=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,c;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:c=e.sent,u(c.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,c,"next",t)}function c(t){e(u,o,s,a,c,"throw",t)}a(void 0)}))})()}},render:function(){return a(i,null,[this.status?a("div",{class:l.error},[a(c,{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),c=a.value}catch(i){return void n(i)}a.done?t(c):Promise.resolve(c).then(r,o)}System.register(["./ResizeObserver.es-legacy.550cdd79.js","./index-legacy.434f34b4.js","./auth-legacy.5ebab0c6.js","./routes-common-legacy.9f70dad4.js"],(function(t){"use strict";var n,r,o,s,u,a,c,i,f,l;return{setters:[function(e){n=e.d,r=e.g,o=e.u,s=e.p,u=e.i,a=e.j,c=e.C,i=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,c;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:c=e.sent,u(c.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,c,"next",t)}function c(t){e(u,o,s,a,c,"throw",t)}a(void 0)}))})()}},render:function(){return a(i,null,[this.status?a("div",{class:l.error},[a(c,{type:"notFond",classImgSize:"CERT",tips:"加载失败，请稍后重试",buttonText:"重新加载",plain:!0,onClick:this.getUserInfo},null)]):a("div",null,null)])}}))}}}))}();
+>>>>>>>> iteration-20240813-fire:dist/assets/home-layout-center-legacy.7dccdf46.js

dist/assets/home-layout-center-legacy.fc7e9f40.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/home-layout-center-legacy.fc7e9f40.js
 !function(){function e(e,t,n,r,o,s,u){try{var a=e[s](u),c=a.value}catch(i){return void n(i)}a.done?t(c):Promise.resolve(c).then(r,o)}System.register(["./ResizeObserver.es-legacy.550cdd79.js","./index-legacy.e022a6a2.js","./auth-legacy.5ebab0c6.js","./routes-common-legacy.9f70dad4.js"],(function(t){"use strict";var n,r,o,s,u,a,c,i,f,l;return{setters:[function(e){n=e.d,r=e.g,o=e.u,s=e.p,u=e.i,a=e.j,c=e.C,i=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,c;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:c=e.sent,u(c.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,c,"next",t)}function c(t){e(u,o,s,a,c,"throw",t)}a(void 0)}))})()}},render:function(){return a(i,null,[this.status?a("div",{class:l.error},[a(c,{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),c=a.value}catch(i){return void n(i)}a.done?t(c):Promise.resolve(c).then(r,o)}System.register(["./ResizeObserver.es-legacy.550cdd79.js","./index-legacy.434f34b4.js","./auth-legacy.5ebab0c6.js","./routes-common-legacy.9f70dad4.js"],(function(t){"use strict";var n,r,o,s,u,a,c,i,f,l;return{setters:[function(e){n=e.d,r=e.g,o=e.u,s=e.p,u=e.i,a=e.j,c=e.C,i=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,c;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:c=e.sent,u(c.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,c,"next",t)}function c(t){e(u,o,s,a,c,"throw",t)}a(void 0)}))})()}},render:function(){return a(i,null,[this.status?a("div",{class:l.error},[a(c,{type:"notFond",classImgSize:"CERT",tips:"加载失败，请稍后重试",buttonText:"重新加载",plain:!0,onClick:this.getUserInfo},null)]):a("div",null,null)])}}))}}}))}();
+>>>>>>>> iteration-20240813-fire:dist/assets/home-layout-center-legacy.7dccdf46.js

dist/assets/home-layout-center.1504cdb1.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/home-layout-center.1504cdb1.js
 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.2ba57d2a.js";import{a,b as h}from"./index.c5ddf1e4.js";import"./auth.89fe7068.js";import"./routes-common.914c0f82.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.2ba57d2a.js";import{a,b as h}from"./index.285f4073.js";import"./auth.89fe7068.js";import"./routes-common.914c0f82.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};
+>>>>>>>> iteration-20240813-fire:dist/assets/home-layout-center.8457b133.js

dist/assets/home-layout-center.8457b133.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/home-layout-center.1504cdb1.js
+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.2ba57d2a.js";import{a,b as h}from"./index.c5ddf1e4.js";import"./auth.89fe7068.js";import"./routes-common.914c0f82.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.2ba57d2a.js";import{a,b as h}from"./index.285f4073.js";import"./auth.89fe7068.js";import"./routes-common.914c0f82.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};
+>>>>>>>> iteration-20240813-fire:dist/assets/home-layout-center.8457b133.js

dist/index.html

@@ -52,7 +52,11 @@
             _T_));
     })(Object);
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index.c5ddf1e4.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/index.285f4073.js"></script>
+>>>>>>> iteration-20240813-fire
   <link rel="modulepreload" href="./assets/ResizeObserver.es.2ba57d2a.js">
   <link rel="modulepreload" href="./assets/auth.89fe7068.js">
   <link rel="modulepreload" href="./assets/routes-common.914c0f82.js">
@@ -68,7 +72,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>
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.d15f7bf4.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.e022a6a2.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.434f34b4.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-20240813-fire
 </body>
 
 </html>

dist/teacher.html

@@ -52,7 +52,11 @@
             _T_));
     })(Object);
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/teacher.1f719aac.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/teacher.c765c7e8.js"></script>
+>>>>>>> iteration-20240813-fire
   <link rel="modulepreload" href="./assets/ResizeObserver.es.2ba57d2a.js">
   <link rel="modulepreload" href="./assets/routes-common.914c0f82.js">
   <link rel="stylesheet" href="./assets/ResizeObserver.es.ea6352ab.css">
@@ -65,7 +69,11 @@
   
   <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.d15f7bf4.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.20ea0ed7.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.bd3558ce.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-20240813-fire
 </body>
 
 </html>

src/tenant/music/courseList/index.module.less

@@ -23,7 +23,7 @@
     background-size: 100% 100%;
     flex-shrink: 0;
 
-    & > img {
+    &>img {
       display: block;
       width: 100%;
       height: 100%;
@@ -36,8 +36,7 @@
       .van-image__loading {
         position: relative;
         height: 100%;
-        animation: van-skeleton-blink var(--van-skeleton-duration) ease-in-out
-          infinite;
+        animation: van-skeleton-blink var(--van-skeleton-duration) ease-in-out infinite;
       }
     }
 
@@ -47,11 +46,9 @@
       left: 5px;
       width: 5px;
       height: 100%;
-      background: linear-gradient(
-        270deg,
-        rgba(0, 0, 0, 0.25) 0%,
-        rgba(0, 0, 0, 0.03) 100%
-      );
+      background: linear-gradient(270deg,
+          rgba(0, 0, 0, 0.25) 0%,
+          rgba(0, 0, 0, 0.03) 100%);
       box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.2);
       z-index: 1;
     }
@@ -155,6 +152,7 @@
   width: 24px;
   height: 24px;
   position: relative;
+
   .basePlay {
     width: 20px;
     height: 20px;
@@ -163,6 +161,7 @@
     top: 50%;
     transform: translate(-50%, -50%);
   }
+
   :global {
     .van-circle {
       position: absolute;
@@ -171,8 +170,10 @@
       transform: translate(-50%, -50%);
       width: 20px;
       height: 20px;
+      padding-bottom: 2px;
     }
   }
+
   .tips {
     position: absolute;
     left: 50%;
@@ -184,6 +185,7 @@
     border-radius: 1px;
   }
 }
+
 .periodItem {
   width: 36px;
   height: 40px;
@@ -201,6 +203,7 @@
 .courseDialog {
   width: 305px;
   box-sizing: border-box;
+
   :global {
     .van-dialog__header {
       // padding-top: 0;
@@ -302,7 +305,7 @@
     display: flex;
     align-items: center;
 
-    & > button {
+    &>button {
       height: 40px;
       flex: 1;
       font-weight: 400;
@@ -314,14 +317,17 @@
     }
   }
 }
+
 .btnLeft {
   color: #333;
   border-color: #dbdbdb;
 }
+
 .btnRight {
   background: #fe2451;
   border-color: #fe2451;
 }
+
 .finch {
   width: 150px;
   margin: 140px auto 0;
@@ -334,6 +340,7 @@
   margin-top: 4px;
   margin-bottom: 120px;
 }
+
 .footers {
   padding: 0 25px 20px; // height: 45px;
 
@@ -343,13 +350,12 @@
       font-weight: 500;
       color: #ffffff;
       line-height: 25px;
+
       &.van-button--disabled {
         opacity: initial;
-        background: linear-gradient(
-          270deg,
-          #ff7a93 0%,
-          #ff9daa 100%
-        ) !important;
+        background: linear-gradient(270deg,
+            #ff7a93 0%,
+            #ff9daa 100%) !important;
       }
     }
   }

src/tenant/music/train-list/index.module.less

@@ -25,27 +25,40 @@
       }
     }
 
+    .van-search {
+      padding-bottom: 0;
+      align-items: flex-start;
+    }
+
+    // .van-dropdown-menu {
+    //   padding-bottom: 10px;
+    // }
+
     .van-dropdown-menu__bar {
       background-color: transparent;
       box-shadow: none;
       padding-right: 15px;
+      padding-bottom: 10px;
       height: 36px;
     }
 
     .van-dropdown-menu__title {
       padding-left: 0;
       color: #131415;
+
       &:after {
-        border-color: transparent transparent rgba(0, 0, 0, 0.4)
-          rgba(0, 0, 0, 0.4);
+        border-color: transparent transparent rgba(0, 0, 0, 0.4) rgba(0, 0, 0, 0.4);
       }
+
       &.van-dropdown-menu__title--active {
         color: #fe2451;
+
         &:after {
           border-color: transparent transparent #fe2451 #fe2451;
         }
       }
     }
+
     .van-dropdown-item__content {
       border-radius: 0px 0px 20px 20px;
     }
@@ -59,6 +72,7 @@
   //   color: #fe2451;
   // }
 }
+
 .search {
   :global {
     .van-search {
@@ -66,6 +80,7 @@
     }
   }
 }
+
 .albumSearchSection {
   :global {
     .van-dropdown-menu__bar {
@@ -81,7 +96,7 @@
   padding: 2px 21px 0 8px !important;
   border-radius: 30px !important;
 
-  & > div {
+  &>div {
     max-width: 70px;
   }
 
@@ -170,6 +185,7 @@
   color: #131415;
 
   :global {
+
     .van-list__loading,
     .van-list__finished-text,
     .van-list__error-text {
@@ -188,6 +204,7 @@
   background-color: #fff;
   margin: 6px 12px 0px 12px;
   min-height: 90vh;
+
   :global {
     .van-list__loading {
       display: none;
@@ -338,10 +355,12 @@
     }
   }
 }
+
 .resetting {
   border-color: #dbdbdb !important;
   color: #333333 !important;
 }
+
 .confirm,
 .resetting {
   :global {

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

@@ -303,6 +303,8 @@ export default defineComponent({
                     isSearchStatus.value && (
                       <DropdownMenu>
                         <DropdownItem
+                          class="searchOther"
+                          // teleport="body"
                           titleClass={
                             params.subjectId || params.type || params.level
                               ? styles.titleActive

src/tenant/music/train-tool/index.module.less

@@ -7,7 +7,80 @@
       }
     }
   }
+
+  :global {
+
+    // 选择框
+    // 上拉选择 - ✅
+    // 选择器 - ✅
+    .van-picker {
+      --van-picker-toolbar-height: 44px !important;
+
+      --k-font-primary: #FE2451;
+      --k-bg-4: #f2f2f2;
+      --k-gray-1: #333333;
+      --k-gray-2: #666666;
+      --k-gray-3: #777777;
+
+      .van-picker__toolbar {
+        position: relative;
+
+        &::after {
+          position: absolute;
+          box-sizing: border-box;
+          content: ' ';
+          pointer-events: none;
+          right: var(--van-padding-md);
+          bottom: 0;
+          left: var(--van-padding-md);
+          border-bottom: 1px solid var(--van-cell-border-color);
+          transform: scaleY(0.5);
+        }
+      }
+
+      .van-picker__columns {
+        padding: 0 24px;
+      }
+
+      .van-picker-column {
+        position: relative;
+        z-index: 1;
+      }
+
+      .van-picker__frame {
+        z-index: 0;
+
+        &::after {
+          background: var(--k-bg-4);
+          border-radius: 8px;
+        }
+      }
+
+      .van-picker__cancel,
+      .van-picker__confirm {
+        font-size: 15px;
+      }
+
+      .van-picker__cancel {
+        color: var(--k-gray-3);
+      }
+
+      .van-picker__confirm {
+        color: var(--k-font-primary);
+      }
+
+      .van-picker-column__item {
+        color: var(--k-gray-1);
+        font-size: 16px;
+      }
+
+      .van-picker-column__item--selected {
+        font-weight: 600;
+      }
+    }
+  }
 }
+
 .musicContent {
   position: absolute;
   top: 0;
@@ -24,6 +97,38 @@
   background-size: cover;
 }
 
+.changeSubjectSection {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  border: 1px solid rgba(254, 36, 81, 0.5);
+  border-radius: 100px;
+  padding: 3px 8px 2px;
+
+  .subjectName {
+    font-weight: 400;
+    font-size: 14px;
+    color: #FE2451;
+    line-height: 20px;
+    padding-right: 4px;
+    max-width: 60px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  img {
+    width: 9px;
+    height: 5px;
+    transition: .2s ease;
+
+    &.active {
+      transform: rotate(180deg);
+      transition: .2s ease;
+    }
+  }
+}
+
 .bgImg {
   position: absolute;
   left: 0;
@@ -157,11 +262,9 @@
           top: 0;
           bottom: 0;
           width: 9px;
-          background: linear-gradient(
-            270deg,
-            rgba(0, 0, 0, 0.18) 0%,
-            rgba(255, 255, 255, 0) 100%
-          );
+          background: linear-gradient(270deg,
+              rgba(0, 0, 0, 0.18) 0%,
+              rgba(255, 255, 255, 0) 100%);
         }
       }
     }
@@ -302,10 +405,12 @@
     .van-tabs {
       padding-bottom: 16px;
     }
+
     .van-tabs__nav {
       padding-left: 6px;
       padding-right: 6px;
     }
+
     .van-tab {
       font-size: 16px !important;
       margin-top: 15px;
@@ -321,11 +426,9 @@
     .van-tabs__line {
       width: 24px;
       height: 4px;
-      background: linear-gradient(
-        90deg,
-        #ff3c5e 0%,
-        rgba(255, 118, 155, 0.5) 100%
-      ) !important;
+      background: linear-gradient(90deg,
+          #ff3c5e 0%,
+          rgba(255, 118, 155, 0.5) 100%) !important;
       border-radius: 36px 36px 0px 0px;
     }
 
@@ -341,26 +444,33 @@
       background-color: #fff;
     }
   }
+
   .alumnList {
     padding: 0 15px;
+
     &.alumnListCourseware {
       padding: 0 3px 3px;
     }
+
     :global {
       .van-empty {
         margin-top: -24px;
       }
+
       .songItem {
         &:first-child {
           padding-top: 0;
         }
       }
+
       .courseItem:nth-child(1) {
         margin-top: 0 !important;
       }
+
       .courseItem:nth-child(2) {
         margin-top: 0 !important;
       }
+
       .courseItem:nth-child(3) {
         margin-top: 0 !important;
       }
@@ -381,13 +491,12 @@
     .van-button {
       font-size: 18px;
       font-weight: 500;
+
       &.van-button--disabled {
         opacity: initial;
-        background: linear-gradient(
-          270deg,
-          #ff7a93 0%,
-          #ff9daa 100%
-        ) !important;
+        background: linear-gradient(270deg,
+            #ff7a93 0%,
+            #ff9daa 100%) !important;
       }
     }
   }
@@ -399,4 +508,4 @@
       padding-top: 0;
     }
   }
-}
+}

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

@@ -17,7 +17,8 @@ import {
   Dialog,
   Sticky,
   Swipe,
-  SwipeItem
+  SwipeItem,
+  Picker
 } from 'vant'
 import styles from './index.module.less'
 import TheSticky from '@/components/the-sticky'
@@ -28,6 +29,7 @@ import iconMenu from './images/icon-menu.png'
 import iconRightTop from './images/icon-right-top.png'
 import iconAlbumCover from '../../images/icon-album-cover.png'
 import iconTimer from './images/icon-timer.png'
+import iconArrow from './images/icon-arrow.png'
 import { state as baseState, setLogout } from '@/state'
 import Song from '../component/song'
 import { useRoute, useRouter } from 'vue-router'
@@ -80,7 +82,13 @@ export default defineComponent({
       heightV: 0,
       hasBuyStatus: true, // 是否能继续购买
       albumList: [] as any, // 专辑列表
-      initialSlide: 0
+      initialSlide: 0,
+      subjectStatus: false,
+      openStatus: false,
+      teacherSubjectId: null as any,
+      teacherSubjectName: null as any,
+      teacherSubjectIndex: 0,
+      subjectList: [] // 声部列表
     })
     const params = reactive({
       page: 1,
@@ -206,8 +214,8 @@ export default defineComponent({
 
       // 老师端默认查询声部
       if (baseState.platformType === 'TEACHER') {
-        const users = baseState.user.data
-        tempParams.subjectId = users.defaultSubject || null
+        // const users = baseState.user.data
+        tempParams.subjectId = state.teacherSubjectId || null
       }
 
       try {
@@ -236,6 +244,41 @@ export default defineComponent({
       state.loading = false
     }
 
+    const getSubjectList = async () => {
+      try {
+        const res = await request.get('/api-tenant/open/subject/queryPage', {
+          data: { page: 1, rows: 9999 }
+        })
+        const result = res.data.rows || []
+        result.forEach((item: any) => {
+          item.text = item.name
+        })
+        state.subjectList = result || []
+        const index = state.subjectList.findIndex(
+          (item: any) => item.id == state.teacherSubjectId
+        )
+        state.teacherSubjectIndex = index === -1 ? 0 : index
+      } catch (e) {
+        console.log(e)
+      }
+    }
+
+    /** 设置声部 */
+    const operatoinCatchSubjectInfo = (
+      type: 'set' | 'get',
+      params?: { defaultSubject: string; defaultSubjectName: string }
+    ) => {
+      if (type === 'set') {
+        localStorage.setItem(
+          'trainTool-teacherSubjectInfo',
+          JSON.stringify(params)
+        )
+      } else if (type === 'get') {
+        const result = localStorage.getItem('trainTool-teacherSubjectInfo')
+        return result ? JSON.parse(result) : null
+      }
+    }
+
     onMounted(async () => {
       // useEventListener(document, 'scroll', evt => {
       //   const { y } = useWindowScroll()
@@ -246,10 +289,29 @@ export default defineComponent({
       //   }
       // })
 
+      // 老师端默认查询声部
+      if (baseState.platformType === 'TEACHER') {
+        const users = baseState.user.data
+        const catchSubject = operatoinCatchSubjectInfo('get')
+        if (catchSubject) {
+          state.teacherSubjectId = catchSubject.defaultSubject || null
+          state.teacherSubjectName = catchSubject.defaultSubjectName || null
+        } else {
+          state.teacherSubjectId = users.defaultSubject || null
+          state.teacherSubjectName = users.defaultSubjectName || null
+        }
+
+        operatoinCatchSubjectInfo('set', {
+          defaultSubject: state.teacherSubjectId,
+          defaultSubjectName: state.teacherSubjectName
+        })
+      }
+
       state.loading = true
       state.loadingAlbum = true
       await getDetails()
       await FetchList()
+      getSubjectList()
       state.loadingAlbum = false
       state.loading = false
 
@@ -366,8 +428,7 @@ export default defineComponent({
               class={styles.theSticky}
               position="top"
               onBarHeight={(height: any) => {
-                console.log(height, 'height', height)
-                state.heightV = height
+                state.heightV = Math.floor(height)
               }}
             >
               <ColHeader border={false} isFixed={false} />
@@ -396,7 +457,7 @@ export default defineComponent({
                 class={styles.theSticky}
                 position="top"
                 onBarHeight={(height: any) => {
-                  state.heightV = height
+                  state.heightV = Math.floor(height)
                 }}
               >
                 <ColHeader
@@ -406,7 +467,27 @@ export default defineComponent({
                   hideHeader={route.query.taId ? true : false}
                   // color={color.value}
                   // backIconColor="white"
-                />
+                >
+                  {{
+                    right: () =>
+                      baseState.platformType === 'TEACHER' && (
+                        <div
+                          class={styles.changeSubjectSection}
+                          onClick={() => {
+                            state.subjectStatus = true
+                          }}
+                        >
+                          <span class={styles.subjectName}>
+                            {state.teacherSubjectName}
+                          </span>
+                          <img
+                            class={state.subjectStatus && styles.active}
+                            src={iconArrow}
+                          />
+                        </div>
+                      )
+                  }}
+                </ColHeader>
               </TheSticky>
 
               {/* <img class={styles.bgImg} src={state.details?.coverImg} /> */}
@@ -664,6 +745,38 @@ export default defineComponent({
             </>
           )
         )}
+
+        {/* 选择声部 */}
+        <Popup
+          show={state.subjectStatus}
+          position="bottom"
+          round
+          safe-area-inset-bottom
+          onClose={() => (state.subjectStatus = false)}
+          onClosed={() => (state.openStatus = false)}
+        >
+          <Picker
+            defaultIndex={state.teacherSubjectIndex}
+            columns={state.subjectList}
+            onCancel={() => {
+              state.subjectStatus = false
+            }}
+            onConfirm={(val: any) => {
+              state.teacherSubjectId = val.id
+              state.teacherSubjectName = val.name
+              params.page = 1
+              state.finished = false
+              state.list = []
+              FetchList()
+              state.subjectStatus = false
+
+              operatoinCatchSubjectInfo('set', {
+                defaultSubject: state.teacherSubjectId,
+                defaultSubjectName: state.teacherSubjectName
+              })
+            }}
+          ></Picker>
+        </Popup>
       </div>
     )
   }