更新样式

dist/assets/home-layout-center-legacy.360695e2.js

@@ -0,0 +1 @@
+!function(){function t(t,e,n,r,o,s,u){try{var a=t[s](u),c=a.value}catch(i){return void n(i)}a.done?e(c):Promise.resolve(c).then(r,o)}System.register(["./index-legacy.17323dca.js","./index-legacy.2b2b5726.js","./auth-legacy.b2120a26.js","./routes-common-legacy.387ce564.js"],(function(e){"use strict";var n,r,o,s,u,a,c,i,f,l;return{setters:[function(t){n=t.d,r=t.g,o=t.t,s=t.p,u=t.i,a=t.j,c=t.C,i=t.F},function(t){f=t.a,l=t.b},function(){},function(){}],execute:function(){e("default",n({name:"home-layout-center",data:function(){return{status:!1}},mounted:function(){this.getUserInfo()},methods:{getUserInfo:function(){var e,n=this;return(e=regeneratorRuntime.mark((function t(){var e,a,c;return regeneratorRuntime.wrap((function(t){for(;;)switch(t.prev=t.next){case 0:return t.prev=0,t.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 e=t.sent,a=e.data.authentication,o(a.token_type+" "+a.access_token),s({api:"setCache",content:{key:"h5-colexiu-token",value:a.token_type+" "+a.access_token}}),t.next=9,f.get("/api-student/student/queryUserInfo",{initRequest:!0});case 9:c=t.sent,u(c.data),n.$router.push("/home"),t.next=17;break;case 14:t.prev=14,t.t0=t.catch(0),n.status=!0;case 17:case"end":return t.stop()}}),t,null,[[0,14]])})),function(){var n=this,r=arguments;return new Promise((function(o,s){var u=e.apply(n,r);function a(e){t(u,o,s,a,c,"next",e)}function c(e){t(u,o,s,a,c,"throw",e)}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)])}}))}}}))}();

dist/assets/home-layout-center.2f2b6c76.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/home-layout-center.fce0cca1.js
+import{d as r,g as s,t as u,p as i,i as c,j as e,C as l,F as p}from"./index.f4ca3ffc.js";import{a,b as h}from"./index.0272d726.js";import"./auth.b2ea2ef5.js";import"./routes-common.8542a30b.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,t as u,p as i,i as c,j as e,C as l,F as p}from"./index.f4ca3ffc.js";import{a,b as h}from"./index.6baf36ae.js";import"./auth.b2ea2ef5.js";import"./routes-common.32dae168.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-20240618:dist/assets/home-layout-center.2f2b6c76.js

dist/assets/home-layout-center.fce0cca1.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/home-layout-center.fce0cca1.js
 import{d as r,g as s,t as u,p as i,i as c,j as e,C as l,F as p}from"./index.f4ca3ffc.js";import{a,b as h}from"./index.0272d726.js";import"./auth.b2ea2ef5.js";import"./routes-common.8542a30b.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,t as u,p as i,i as c,j as e,C as l,F as p}from"./index.f4ca3ffc.js";import{a,b as h}from"./index.6baf36ae.js";import"./auth.b2ea2ef5.js";import"./routes-common.32dae168.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-20240618:dist/assets/home-layout-center.2f2b6c76.js

dist/assets/index.01f67ad5.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.860820e9.js
+import{d as o,S as l,j as t,M as i,z as s}from"./index.f4ca3ffc.js";import{C as m}from"./index.7f585b2d.js";import{n as r,e as p,c as n}from"./icon_name_active.3e9031ca.js";import{C as c,a as v}from"./index.53bbbd56.js";import"./index.78055c66.js";import"./index.64296032.js";import"./index.f7de6056.js";import"./use-refs.6e87ad57.js";import"./utils.bd9663ed.js";import"./index.b2a879ff.js";import"./index.4d84ce6e.js";import"./index.b9718e89.js";import"./index.7ac7ae45.js";import"./index.110c37a8.js";import"./use-id.03e80ebf.js";import"./index.6b89d810.js";import"./index.efa7a3ea.js";import"./index.cd0796f4.js";import"./icon_tips.75e86958.js";import"./index.747424f2.js";import"./index.0fb6a631.js";import"./index.717b52ae.js";import"./index.1084d4bc.js";import"./index.145ba9e6.js";import"./icon_student.c3c58354.js";import"./checkbox_default.ae7153bb.js";import"./index.24715a68.js";import"./index.c93bc693.js";const u="_classWrap_kvlzi_1",b="_tabs_kvlzi_4",_="_tabItem_kvlzi_11",d="_title_kvlzi_23",I="_tabItemRight_kvlzi_26",A="_tabItemActive_kvlzi_29";var a={classWrap:u,tabs:b,tabItem:_,title:d,tabItemRight:I,tabItemActive:A},Q=o({name:"ClassArrangement",setup(){const e=l(1);return()=>t("div",{class:a.classWrap},[t(m,null,null),t("div",{class:a.tabs},[t("div",{class:[a.tabItem,a.tabItemActive]},[t(i,{name:r,size:38},null),t("span",{class:a.title},[s("\u8BFE\u7A0B\u4FE1\u606F")])]),t("div",{class:[a.tabItem,a.tabItemRight,e.value>1?a.tabItemActive:""]},[t(i,{name:e.value>1?p:n,size:38},null),t("span",{class:a.title},[s("\u8BFE\u7A0B\u5B89\u6392")])])]),t("div",{style:{display:e.value===1?"block":"none"}},[t(c,{onSubmit:k=>{e.value=2}},null)]),t("div",{style:{display:e.value===2?"block":"none"}},[t(v,{onBack:()=>e.value=1,active:e.value},null)])])}});export{Q as default};
+========
+import{d as o,S as l,j as t,M as i,z as s}from"./index.f4ca3ffc.js";import{C as m}from"./index.7f585b2d.js";import{n as r,e as p,c as n}from"./icon_name_active.3e9031ca.js";import{C as c,a as v}from"./index.501d7adc.js";import"./index.78055c66.js";import"./index.64296032.js";import"./index.f7de6056.js";import"./use-refs.6e87ad57.js";import"./utils.bd9663ed.js";import"./index.b2a879ff.js";import"./index.4d84ce6e.js";import"./index.b9718e89.js";import"./index.7ac7ae45.js";import"./index.110c37a8.js";import"./use-id.03e80ebf.js";import"./index.6b89d810.js";import"./index.efa7a3ea.js";import"./index.cd0796f4.js";import"./icon_tips.75e86958.js";import"./index.747424f2.js";import"./index.0fb6a631.js";import"./index.717b52ae.js";import"./index.1084d4bc.js";import"./index.145ba9e6.js";import"./icon_student.c3c58354.js";import"./checkbox_default.944f238b.js";import"./index.24715a68.js";import"./index.c93bc693.js";const u="_classWrap_kvlzi_1",b="_tabs_kvlzi_4",_="_tabItem_kvlzi_11",d="_title_kvlzi_23",I="_tabItemRight_kvlzi_26",A="_tabItemActive_kvlzi_29";var a={classWrap:u,tabs:b,tabItem:_,title:d,tabItemRight:I,tabItemActive:A},Q=o({name:"ClassArrangement",setup(){const e=l(1);return()=>t("div",{class:a.classWrap},[t(m,null,null),t("div",{class:a.tabs},[t("div",{class:[a.tabItem,a.tabItemActive]},[t(i,{name:r,size:38},null),t("span",{class:a.title},[s("\u8BFE\u7A0B\u4FE1\u606F")])]),t("div",{class:[a.tabItem,a.tabItemRight,e.value>1?a.tabItemActive:""]},[t(i,{name:e.value>1?p:n,size:38},null),t("span",{class:a.title},[s("\u8BFE\u7A0B\u5B89\u6392")])])]),t("div",{style:{display:e.value===1?"block":"none"}},[t(c,{onSubmit:k=>{e.value=2}},null)]),t("div",{style:{display:e.value===2?"block":"none"}},[t(v,{onBack:()=>e.value=1,active:e.value},null)])])}});export{Q as default};
+>>>>>>>> iteration-20240618:dist/assets/index.01f67ad5.js

dist/assets/index.860820e9.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.860820e9.js
 import{d as o,S as l,j as t,M as i,z as s}from"./index.f4ca3ffc.js";import{C as m}from"./index.7f585b2d.js";import{n as r,e as p,c as n}from"./icon_name_active.3e9031ca.js";import{C as c,a as v}from"./index.53bbbd56.js";import"./index.78055c66.js";import"./index.64296032.js";import"./index.f7de6056.js";import"./use-refs.6e87ad57.js";import"./utils.bd9663ed.js";import"./index.b2a879ff.js";import"./index.4d84ce6e.js";import"./index.b9718e89.js";import"./index.7ac7ae45.js";import"./index.110c37a8.js";import"./use-id.03e80ebf.js";import"./index.6b89d810.js";import"./index.efa7a3ea.js";import"./index.cd0796f4.js";import"./icon_tips.75e86958.js";import"./index.747424f2.js";import"./index.0fb6a631.js";import"./index.717b52ae.js";import"./index.1084d4bc.js";import"./index.145ba9e6.js";import"./icon_student.c3c58354.js";import"./checkbox_default.ae7153bb.js";import"./index.24715a68.js";import"./index.c93bc693.js";const u="_classWrap_kvlzi_1",b="_tabs_kvlzi_4",_="_tabItem_kvlzi_11",d="_title_kvlzi_23",I="_tabItemRight_kvlzi_26",A="_tabItemActive_kvlzi_29";var a={classWrap:u,tabs:b,tabItem:_,title:d,tabItemRight:I,tabItemActive:A},Q=o({name:"ClassArrangement",setup(){const e=l(1);return()=>t("div",{class:a.classWrap},[t(m,null,null),t("div",{class:a.tabs},[t("div",{class:[a.tabItem,a.tabItemActive]},[t(i,{name:r,size:38},null),t("span",{class:a.title},[s("\u8BFE\u7A0B\u4FE1\u606F")])]),t("div",{class:[a.tabItem,a.tabItemRight,e.value>1?a.tabItemActive:""]},[t(i,{name:e.value>1?p:n,size:38},null),t("span",{class:a.title},[s("\u8BFE\u7A0B\u5B89\u6392")])])]),t("div",{style:{display:e.value===1?"block":"none"}},[t(c,{onSubmit:k=>{e.value=2}},null)]),t("div",{style:{display:e.value===2?"block":"none"}},[t(v,{onBack:()=>e.value=1,active:e.value},null)])])}});export{Q as default};
+========
+import{d as o,S as l,j as t,M as i,z as s}from"./index.f4ca3ffc.js";import{C as m}from"./index.7f585b2d.js";import{n as r,e as p,c as n}from"./icon_name_active.3e9031ca.js";import{C as c,a as v}from"./index.501d7adc.js";import"./index.78055c66.js";import"./index.64296032.js";import"./index.f7de6056.js";import"./use-refs.6e87ad57.js";import"./utils.bd9663ed.js";import"./index.b2a879ff.js";import"./index.4d84ce6e.js";import"./index.b9718e89.js";import"./index.7ac7ae45.js";import"./index.110c37a8.js";import"./use-id.03e80ebf.js";import"./index.6b89d810.js";import"./index.efa7a3ea.js";import"./index.cd0796f4.js";import"./icon_tips.75e86958.js";import"./index.747424f2.js";import"./index.0fb6a631.js";import"./index.717b52ae.js";import"./index.1084d4bc.js";import"./index.145ba9e6.js";import"./icon_student.c3c58354.js";import"./checkbox_default.944f238b.js";import"./index.24715a68.js";import"./index.c93bc693.js";const u="_classWrap_kvlzi_1",b="_tabs_kvlzi_4",_="_tabItem_kvlzi_11",d="_title_kvlzi_23",I="_tabItemRight_kvlzi_26",A="_tabItemActive_kvlzi_29";var a={classWrap:u,tabs:b,tabItem:_,title:d,tabItemRight:I,tabItemActive:A},Q=o({name:"ClassArrangement",setup(){const e=l(1);return()=>t("div",{class:a.classWrap},[t(m,null,null),t("div",{class:a.tabs},[t("div",{class:[a.tabItem,a.tabItemActive]},[t(i,{name:r,size:38},null),t("span",{class:a.title},[s("\u8BFE\u7A0B\u4FE1\u606F")])]),t("div",{class:[a.tabItem,a.tabItemRight,e.value>1?a.tabItemActive:""]},[t(i,{name:e.value>1?p:n,size:38},null),t("span",{class:a.title},[s("\u8BFE\u7A0B\u5B89\u6392")])])]),t("div",{style:{display:e.value===1?"block":"none"}},[t(c,{onSubmit:k=>{e.value=2}},null)]),t("div",{style:{display:e.value===2?"block":"none"}},[t(v,{onBack:()=>e.value=1,active:e.value},null)])])}});export{Q as default};
+>>>>>>>> iteration-20240618:dist/assets/index.01f67ad5.js

dist/assets/teacherState-legacy.994d3769.js

@@ -0,0 +1 @@
+System.register(["./index-legacy.17323dca.js"],(function(e){"use strict";var t;return{setters:[function(e){t=e.Q}],execute:function(){e("t",t({authStatus:!1,subjectList:[],active:1,teacherInfo:{},teacherCert:{realName:null,idCardNo:null,gender:1,birthdate:null,subjectId:null,introduction:"",graduateSchool:null,subject:null,gradCertificate:null,degreeCertificate:null,teacherCertificate:null,styleVideoJson:"",styleVideo:[{videoUrl:"",cover:""}]}}))}}}));

dist/assets/teacherState.f1c82192.js

@@ -0,0 +1 @@
+import{Q as e}from"./index.f4ca3ffc.js";const l=e({authStatus:!1,subjectList:[],active:1,teacherInfo:{},teacherCert:{realName:null,idCardNo:null,gender:1,birthdate:null,subjectId:null,introduction:"",graduateSchool:null,subject:null,gradCertificate:null,degreeCertificate:null,teacherCertificate:null,styleVideoJson:"",styleVideo:[{videoUrl:"",cover:""}]}});export{l as t};

dist/index.html

@@ -52,10 +52,17 @@
             _T_));
     })(Object);
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index.0272d726.js"></script>
   <link rel="modulepreload" href="./assets/index.f4ca3ffc.js">
   <link rel="modulepreload" href="./assets/auth.b2ea2ef5.js">
   <link rel="modulepreload" href="./assets/routes-common.8542a30b.js">
+=======
+  <script type="module" crossorigin src="./assets/index.6baf36ae.js"></script>
+  <link rel="modulepreload" href="./assets/index.f4ca3ffc.js">
+  <link rel="modulepreload" href="./assets/auth.b2ea2ef5.js">
+  <link rel="modulepreload" href="./assets/routes-common.32dae168.js">
+>>>>>>> iteration-20240618
   <link rel="stylesheet" href="./assets/index.d06f6378.css">
   <link rel="stylesheet" href="./assets/auth.f09b6d78.css">
   <link rel="stylesheet" href="./assets/index.820e7d12.css">
@@ -68,7 +75,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.dc361b28.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.2b2b5726.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-20240618
 </body>
 
 </html>

dist/teacher.html

@@ -52,9 +52,15 @@
             _T_));
     })(Object);
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/teacher.0eb4fa44.js"></script>
   <link rel="modulepreload" href="./assets/index.f4ca3ffc.js">
   <link rel="modulepreload" href="./assets/routes-common.8542a30b.js">
+=======
+  <script type="module" crossorigin src="./assets/teacher.b1ef4cf9.js"></script>
+  <link rel="modulepreload" href="./assets/index.f4ca3ffc.js">
+  <link rel="modulepreload" href="./assets/routes-common.32dae168.js">
+>>>>>>> iteration-20240618
   <link rel="stylesheet" href="./assets/index.d06f6378.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>
@@ -65,7 +71,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.9d0dcc9b.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.440f6727.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-20240618
 </body>
 
 </html>

dist/tenant.html

@@ -52,7 +52,11 @@
             _T_));
     })(Object);
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/tenant.56d8c9cc.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/tenant.08800010.js"></script>
+>>>>>>> iteration-20240618
   <link rel="modulepreload" href="./assets/index.f4ca3ffc.js">
   <link rel="modulepreload" href="./assets/auth.b2ea2ef5.js">
   <link rel="stylesheet" href="./assets/index.d06f6378.css">
@@ -67,7 +71,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/tenant-legacy.9022d88f.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.f2708204.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-20240618
 </body>
 
 </html>

src/tenant/music/component/song/index.module.less

@@ -32,8 +32,7 @@
       height: 50px;
       border-radius: 8px;
       margin-right: 10px;
-      background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGYAAABmCAMAAAAOARRQAAAASFBMVEXq6ur29vbIyMjFxcW2tra9vb3Pz8/Dw8PKysrR0dG/v7+4uLi6urrMzMzT09PY2Njb29vn5+fe3t7k5OTh4eHV1dXz8/Pw8PBVXjwWAAACtUlEQVRo3u3WS7LjIAxAUSIFJD7mY+Nk/zttESduu3uW4Bln8OpldEuCoqyGYRiGYRiGYbhcKUudc65FXeZVSAbI6aAhVnWFpeY6G9IvIcgfmLtHypznHNE5985477Xn0nmUXFMyzu0Z6Yjg+m6u1pyStbx1QnNvvO69uJqEbRVISxswsW6d3jchp3VdUU/l9vHM7u5d3/OZ1xgjuHw7eiTvTddLEKON7OrtH4ruHddWpGKNS7f/PBE7HsxqjEF47NtSj73T71YXI/jvwTwp4PPzYzHdhrGTMUDq9pa89vnVW7JlUt87PcLRTNN02Fn2wdeW03fhy/c3i6d1XvadTcxM/PciG2elae+b75+CmSdjjZS2pgDix23X/lXtYWvTpO9PY+IWiq1UCoNAeN5O8t379rqF9etMahk5d2PXuCZokMo5s9594GS1Tj9koGWEtTEBIkpmPWeS19BWSj+cjWT4nZHV4UadMrPf5ijl+/v8yuwdJCJE4tPplKDzr08lAxwyhhrpHOd5OpnmR5YR/mZWpm2e6XaAOv6ayQYJ9ky05JwjJHPMGG1+zRQGItgybRxwAimebrSe1K/yJAPgvrVJt3HOmay5w+MP5LTj9zRGCyLbO6MqoNPBazByNqvVwuHpbJIs7XczkGTaVxIh4paBx+lsrOrRQdKS2QRB54fA6qR6qOz0J+MFAeVDhrt9dCYKwe8ZhOPWHtTvW7Bkdp/FaQA8jFMcq56WeU4t5SSDWPYb4LLqLErGwysD6vMhSKVzZWk3geDVIayvTHRJdQZBVsZbBomsLG4h7l2xXs6fGfYO8Yq0XFBxfMqIufO5sFRwOmSkg9j7ls1aDoamY4cAZtXbYkK4a5j2DICp6gLVBB8cbPMwTFldZInkvUNpcJyLutCSVxtTLWoYhmEYhmEYhiv9Aca9JZ3n1bdkAAAAAElFTkSuQmCC')
-        no-repeat;
+      background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGYAAABmCAMAAAAOARRQAAAASFBMVEXq6ur29vbIyMjFxcW2tra9vb3Pz8/Dw8PKysrR0dG/v7+4uLi6urrMzMzT09PY2Njb29vn5+fe3t7k5OTh4eHV1dXz8/Pw8PBVXjwWAAACtUlEQVRo3u3WS7LjIAxAUSIFJD7mY+Nk/zttESduu3uW4Bln8OpldEuCoqyGYRiGYRiGYbhcKUudc65FXeZVSAbI6aAhVnWFpeY6G9IvIcgfmLtHypznHNE5985477Xn0nmUXFMyzu0Z6Yjg+m6u1pyStbx1QnNvvO69uJqEbRVISxswsW6d3jchp3VdUU/l9vHM7u5d3/OZ1xgjuHw7eiTvTddLEKON7OrtH4ruHddWpGKNS7f/PBE7HsxqjEF47NtSj73T71YXI/jvwTwp4PPzYzHdhrGTMUDq9pa89vnVW7JlUt87PcLRTNN02Fn2wdeW03fhy/c3i6d1XvadTcxM/PciG2elae+b75+CmSdjjZS2pgDix23X/lXtYWvTpO9PY+IWiq1UCoNAeN5O8t379rqF9etMahk5d2PXuCZokMo5s9594GS1Tj9koGWEtTEBIkpmPWeS19BWSj+cjWT4nZHV4UadMrPf5ijl+/v8yuwdJCJE4tPplKDzr08lAxwyhhrpHOd5OpnmR5YR/mZWpm2e6XaAOv6ayQYJ9ky05JwjJHPMGG1+zRQGItgybRxwAimebrSe1K/yJAPgvrVJt3HOmay5w+MP5LTj9zRGCyLbO6MqoNPBazByNqvVwuHpbJIs7XczkGTaVxIh4paBx+lsrOrRQdKS2QRB54fA6qR6qOz0J+MFAeVDhrt9dCYKwe8ZhOPWHtTvW7Bkdp/FaQA8jFMcq56WeU4t5SSDWPYb4LLqLErGwysD6vMhSKVzZWk3geDVIayvTHRJdQZBVsZbBomsLG4h7l2xXs6fGfYO8Yq0XFBxfMqIufO5sFRwOmSkg9j7ls1aDoamY4cAZtXbYkK4a5j2DICp6gLVBB8cbPMwTFldZInkvUNpcJyLutCSVxtTLWoYhmEYhmEYhiv9Aca9JZ3n1bdkAAAAAElFTkSuQmCC') no-repeat;
       background-size: 100% 100%;
 
       img {
@@ -102,7 +101,7 @@
       .tags {
         margin-right: 6px;
 
-        & > span {
+        &>span {
           display: inline-block;
           background: #ffeaf2;
           border-radius: 4px;
@@ -167,6 +166,7 @@
   width: 15px;
   height: 16px;
   margin-right: 6px;
+  flex-shrink: 0;
 }
 
 .musicInfo {
@@ -186,7 +186,7 @@
     margin-right: 14px;
     word-break: break-all;
 
-    > h4 {
+    >h4 {
       font-size: 16px;
       font-weight: bold;
       color: #1a1a1a;
@@ -194,7 +194,7 @@
       padding-bottom: 3px;
     }
 
-    > p {
+    >p {
       font-size: 12px;
       color: #999;
       line-height: 17px;
@@ -237,14 +237,14 @@
     margin-right: 14px;
     word-break: break-all;
 
-    > h4 {
+    >h4 {
       color: var(--music-list-item-title-color);
       font-size: 14px;
       font-weight: 600;
       width: 200px;
     }
 
-    > p {
+    >p {
       color: var(--music-list-item-mate-color);
       line-height: 17px;
     }

src/tenant/music/component/song/index.tsx

@@ -131,7 +131,11 @@ export default defineComponent({
 
                   <span class={[styles.name]}>
                     {/* {n.addName ? `上传者：${n.addName}` : `作曲：${n.composer}`} */}
-                    {n.composer ? `${n.composer}` : `${n.addName}`}
+                    {n.composer
+                      ? `${n.composer}`
+                      : n.addName
+                      ? `${n.addName}`
+                      : ''}
                   </span>
                 </div>
               </div>

src/tenant/music/music-detail/new-index.tsx

@@ -687,12 +687,12 @@ export default defineComponent({
           staffData.xmlPartList = partList
         }
 
-        // staffData.iframeSrc = `${
-        //   location.origin
-        // }/osmd/index.html?t=${new Date().getTime()}`
-        staffData.iframeSrc = `${location.origin}${
-          location.pathname
-        }osmd/index.html?t=${new Date().getTime()}`
+        staffData.iframeSrc = `${
+          location.origin
+        }/osmd/index.html?t=${new Date().getTime()}`
+        // staffData.iframeSrc = `${location.origin}${
+        //   location.pathname
+        // }osmd/index.html?t=${new Date().getTime()}`
         staffData.musicXml = musicDetail.value?.xmlFileUrl || ''
         const tempList = musicDetail.value?.background || []
         const tempPartList = [] as any
@@ -1086,7 +1086,9 @@ export default defineComponent({
           ) : (
             <>
               {showImg.value.length > 0 ? (
-                <img src={showImg.value[0]} alt="" class={styles.musicImg} />
+                <div class={styles.musicImg}>
+                  <img src={showImg.value[0]} alt="" />
+                </div>
               ) : loading.value ? (
                 <>
                   <Vue3Lottie

src/views/music/music-detail/index.module.less

@@ -88,6 +88,10 @@
 
   .musicImg {
     width: 100%;
+
+    img {
+      width: 100%;
+    }
   }
 
   .finch {
@@ -617,4 +621,4 @@
       line-height: 15px;
     }
   }
-}
+}

src/views/music/music-detail/index.tsx

@@ -857,11 +857,9 @@ export default defineComponent({
               ) : (
                 <>
                   {showImg.value.length > 0 ? (
-                    <img
-                      src={showImg.value[0]}
-                      alt=""
-                      class={styles.musicImg}
-                    />
+                    <div class={styles.musicImg}>
+                      <img src={showImg.value[0]} alt="" />
+                    </div>
                   ) : loading.value ? (
                     <>
                       <Vue3Lottie

vite.config.ts

@@ -12,7 +12,7 @@ function resolve(dir: string) {
 // https://vitejs.dev/config/
 // https://github.com/vitejs/vite/issues/1930 .env
 // const proxyUrl = 'https://online.colexiu.com/'
-const proxyUrl = 'https://dev.colexiu.com/'
+const proxyUrl = 'https://test.colexiu.com/'
 // const proxyUrl = 'http://192.168.3.14:8000/'
 export default defineConfig({
   base: './',