Merge branch 'online' into jenkins

dist/assets/index-legacy.6441024f.js → dist/assets/index-legacy.2bad5660.js

@@ -1,2 +1,2 @@
-;(function(){var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._pagination-container_1x1u9_1{background:transparent;padding:24px 16px 32px;width:100%;display:flex;flex-direction:row;justify-content:center}._pagination-container_1x1u9_1 .el-pagination.is-background .btn-next,._pagination-container_1x1u9_1 .el-pagination.is-background .btn-prev,._pagination-container_1x1u9_1 .el-pagination.is-background .el-pager li{border-radius:999px;box-sizing:border-box;border:1px solid #329e8a;background-color:#fff;color:#329e8a}._pagination-container_1x1u9_1 .el-pagination.is-background .el-pager li:not(.is-disabled).is-active{border-color:var(--el-color-primary)}._pagination-container_1x1u9_1 .el-input__wrapper{border-radius:99px}._pagination-container_1x1u9_1 .el-input__inner{border-radius:99px;background-color:#fff!important}._pagination-container_1x1u9_1._hidden_1x1u9_28{display:none}\n";document.head.appendChild(__vite_style__);System.register(['./index-legacy.61c6abee.js','./vendor-legacy.ae5b0118.js'],function(exports){'use strict';var scrollAnimation,defineComponent,createVNode,ElPagination;return{setters:[function(module){scrollAnimation=module.d;},function(module){defineComponent=module.d;createVNode=module.c;ElPagination=module.a3;}],execute:function execute(){var hidden="_hidden_1x1u9_28";var styles={"pagination-container":"_pagination-container_1x1u9_1",hidden:hidden};var Pagination=exports('P',defineComponent({name:'pagination',props:{total:{required:true,type:Number},page:{type:Number,default:1},limit:{type:Number,default:10},pageSizes:{type:Array,default:[5,10,20,30,50]},// , jumper
+;(function(){var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._pagination-container_1x1u9_1{background:transparent;padding:24px 16px 32px;width:100%;display:flex;flex-direction:row;justify-content:center}._pagination-container_1x1u9_1 .el-pagination.is-background .btn-next,._pagination-container_1x1u9_1 .el-pagination.is-background .btn-prev,._pagination-container_1x1u9_1 .el-pagination.is-background .el-pager li{border-radius:999px;box-sizing:border-box;border:1px solid #329e8a;background-color:#fff;color:#329e8a}._pagination-container_1x1u9_1 .el-pagination.is-background .el-pager li:not(.is-disabled).is-active{border-color:var(--el-color-primary)}._pagination-container_1x1u9_1 .el-input__wrapper{border-radius:99px}._pagination-container_1x1u9_1 .el-input__inner{border-radius:99px;background-color:#fff!important}._pagination-container_1x1u9_1._hidden_1x1u9_28{display:none}\n";document.head.appendChild(__vite_style__);System.register(['./index-legacy.e19accde.js','./vendor-legacy.ae5b0118.js'],function(exports){'use strict';var scrollAnimation,defineComponent,createVNode,ElPagination;return{setters:[function(module){scrollAnimation=module.d;},function(module){defineComponent=module.d;createVNode=module.c;ElPagination=module.a3;}],execute:function execute(){var hidden="_hidden_1x1u9_28";var styles={"pagination-container":"_pagination-container_1x1u9_1",hidden:hidden};var Pagination=exports('P',defineComponent({name:'pagination',props:{total:{required:true,type:Number},page:{type:Number,default:1},limit:{type:Number,default:10},pageSizes:{type:Array,default:[5,10,20,30,50]},// , jumper
 layout:{type:String,default:'total, sizes, prev, pager, next'},showMuitiple:{type:Number,default:10},hideOnSinglePage:{type:Boolean,default:true},background:{type:Boolean,default:true},autoScroll:{type:Boolean,default:true},hidden:{type:Boolean,default:false},sync:{type:Boolean,default:false},saveKey:{type:String,default:''},pagination:{type:Function,default:function _default(){}}},methods:{handleSizeChange:function handleSizeChange(val){this.$emit('update:page',1);this.$emit('update:limit',val);this.pagination();if(this.autoScroll){var currentY=document.documentElement.scrollTop||document.body.scrollTop;scrollAnimation(currentY,0);}},handleCurrentChange:function handleCurrentChange(val){this.$emit('update:page',val);this.$emit('update:limit',this.limit);this.pagination();if(this.autoScroll){var currentY=document.documentElement.scrollTop||document.body.scrollTop;scrollAnimation(currentY,0);}}},render:function render(){var _this=this;return createVNode("div",{"class":[styles['pagination-container'],this.hidden&&styles.hidden]},[createVNode(ElPagination,{"currentPage":this.page,"pageSize":this.limit,"onUpdate:currentPage":function onUpdateCurrentPage(val){},"onUpdate:pageSize":function onUpdatePageSize(val){_this.handleSizeChange(val);},"pageSizes":this.pageSizes,"total":this.total,"hideOnSinglePage":this.total>this.showMuitiple?false:this.hideOnSinglePage,"background":this.background,"layout":this.layout,"onSise-change":this.handleSizeChange,"onCurrent-change":this.handleCurrentChange},null)]);}}));}};});})();

dist/assets/index-legacy.1077646c.js → dist/assets/index-legacy.bb2d701e.js

@@ -1,4 +1,4 @@
-;(function(){function asyncGeneratorStep(gen,resolve,reject,_next,_throw,key,arg){try{var info=gen[key](arg);var value=info.value;}catch(error){reject(error);return;}if(info.done){resolve(value);}else{Promise.resolve(value).then(_next,_throw);}}function _asyncToGenerator(fn){return function(){var self=this,args=arguments;return new Promise(function(resolve,reject){var gen=fn.apply(self,args);function _next(value){asyncGeneratorStep(gen,resolve,reject,_next,_throw,"next",value);}function _throw(err){asyncGeneratorStep(gen,resolve,reject,_next,_throw,"throw",err);}_next(undefined);});};}System.register(['./index-legacy.cd1430a3.js','./index-legacy.6441024f.js','./index-legacy.61c6abee.js','./icon_vip_default-legacy.d2430bdf.js','./vendor-legacy.ae5b0118.js'],function(exports){'use strict';var ColEmpty,Pagination,request,iconVip,iconVipDefault,defineComponent,createVNode,createTextVNode,ElSkeleton,ElImage,ElTag,ElSkeletonItem;return{setters:[function(module){ColEmpty=module.C;},function(module){Pagination=module.P;},function(module){request=module.r;},function(module){iconVip=module.i;iconVipDefault=module.b;},function(module){defineComponent=module.d;createVNode=module.c;createTextVNode=module.a;ElSkeleton=module.aj;ElImage=module.x;ElTag=module.T;ElSkeletonItem=module.ak;}],execute:function execute(){var index=exports('default',defineComponent({name:'MyFans',data:function data(){return{pageInfo:{// 分页规则
+;(function(){function asyncGeneratorStep(gen,resolve,reject,_next,_throw,key,arg){try{var info=gen[key](arg);var value=info.value;}catch(error){reject(error);return;}if(info.done){resolve(value);}else{Promise.resolve(value).then(_next,_throw);}}function _asyncToGenerator(fn){return function(){var self=this,args=arguments;return new Promise(function(resolve,reject){var gen=fn.apply(self,args);function _next(value){asyncGeneratorStep(gen,resolve,reject,_next,_throw,"next",value);}function _throw(err){asyncGeneratorStep(gen,resolve,reject,_next,_throw,"throw",err);}_next(undefined);});};}System.register(['./index-legacy.cd1430a3.js','./index-legacy.2bad5660.js','./index-legacy.e19accde.js','./icon_vip_default-legacy.d2430bdf.js','./vendor-legacy.ae5b0118.js'],function(exports){'use strict';var ColEmpty,Pagination,request,iconVip,iconVipDefault,defineComponent,createVNode,createTextVNode,ElSkeleton,ElImage,ElTag,ElSkeletonItem;return{setters:[function(module){ColEmpty=module.C;},function(module){Pagination=module.P;},function(module){request=module.r;},function(module){iconVip=module.i;iconVipDefault=module.b;},function(module){defineComponent=module.d;createVNode=module.c;createTextVNode=module.a;ElSkeleton=module.aj;ElImage=module.x;ElTag=module.T;ElSkeletonItem=module.ak;}],execute:function execute(){var index=exports('default',defineComponent({name:'MyFans',data:function data(){return{pageInfo:{// 分页规则
 limit:12,// 限制显示条数
 page:1,// 当前页
 total:0,// 总条数

dist/assets/index-legacy.820503bf.js → dist/assets/index-legacy.ee65b5be.js

@@ -1,4 +1,4 @@
-;(function(){function asyncGeneratorStep(gen,resolve,reject,_next,_throw,key,arg){try{var info=gen[key](arg);var value=info.value;}catch(error){reject(error);return;}if(info.done){resolve(value);}else{Promise.resolve(value).then(_next,_throw);}}function _asyncToGenerator(fn){return function(){var self=this,args=arguments;return new Promise(function(resolve,reject){var gen=fn.apply(self,args);function _next(value){asyncGeneratorStep(gen,resolve,reject,_next,_throw,"next",value);}function _throw(err){asyncGeneratorStep(gen,resolve,reject,_next,_throw,"throw",err);}_next(undefined);});};}System.register(['./index-legacy.61c6abee.js','./item-legacy.8f5fc4a2.js','./index-legacy.cd1430a3.js','./index-legacy.6441024f.js','./vendor-legacy.ae5b0118.js','./icon_album_active-legacy.72d719cb.js'],function(exports){'use strict';var state,request,MusicItem,styles,ColEmpty,Pagination,defineComponent,ElMessageBox,ElMessage,createVNode,Fragment,ElSkeleton,ElSkeletonItem,ElButton,createTextVNode,ElTabs,ElTabPane,ElBadge;return{setters:[function(module){state=module.c;request=module.r;},function(module){MusicItem=module.M;styles=module.s;},function(module){ColEmpty=module.C;},function(module){Pagination=module.P;},function(module){defineComponent=module.d;ElMessageBox=module.j;ElMessage=module.E;createVNode=module.c;Fragment=module.F;ElSkeleton=module.aj;ElSkeletonItem=module.ak;ElButton=module.k;createTextVNode=module.a;ElTabs=module.C;ElTabPane=module.D;ElBadge=module.aA;},function(){}],execute:function execute(){var List=defineComponent({name:'list',props:{auditStatus:{type:String,default:''},onNumber:{type:Function,default:function _default(data){}}},data:function data(){return{pageInfo:{// 分页规则
+;(function(){function asyncGeneratorStep(gen,resolve,reject,_next,_throw,key,arg){try{var info=gen[key](arg);var value=info.value;}catch(error){reject(error);return;}if(info.done){resolve(value);}else{Promise.resolve(value).then(_next,_throw);}}function _asyncToGenerator(fn){return function(){var self=this,args=arguments;return new Promise(function(resolve,reject){var gen=fn.apply(self,args);function _next(value){asyncGeneratorStep(gen,resolve,reject,_next,_throw,"next",value);}function _throw(err){asyncGeneratorStep(gen,resolve,reject,_next,_throw,"throw",err);}_next(undefined);});};}System.register(['./index-legacy.e19accde.js','./item-legacy.8f5fc4a2.js','./index-legacy.cd1430a3.js','./index-legacy.2bad5660.js','./vendor-legacy.ae5b0118.js','./icon_album_active-legacy.72d719cb.js'],function(exports){'use strict';var state,request,MusicItem,styles,ColEmpty,Pagination,defineComponent,ElMessageBox,ElMessage,createVNode,Fragment,ElSkeleton,ElSkeletonItem,ElButton,createTextVNode,ElTabs,ElTabPane,ElBadge;return{setters:[function(module){state=module.c;request=module.r;},function(module){MusicItem=module.M;styles=module.s;},function(module){ColEmpty=module.C;},function(module){Pagination=module.P;},function(module){defineComponent=module.d;ElMessageBox=module.j;ElMessage=module.E;createVNode=module.c;Fragment=module.F;ElSkeleton=module.aj;ElSkeletonItem=module.ak;ElButton=module.k;createTextVNode=module.a;ElTabs=module.C;ElTabPane=module.D;ElBadge=module.aA;},function(){}],execute:function execute(){var List=defineComponent({name:'list',props:{auditStatus:{type:String,default:''},onNumber:{type:Function,default:function _default(data){}}},data:function data(){return{pageInfo:{// 分页规则
 limit:10,// 限制显示条数
 page:1,// 当前页
 total:0,// 总条数

dist/assets/index.a12314c1.js → dist/assets/index.3c70e69f.js

@@ -1 +1 @@
-import{_ as i,a as g,b as n,c as l,d as t,e as m,f as r,g as p,h as c,i as d,j as u,k as b,l as f,m as x,n as v,o as A}from"./music_default.211e2c2b.js";import{_ as D}from"./icon_timer.ca726814.js";import{_ as T,a as j}from"./icon_vip_default.803a2c38.js";import{g as _,z as h,e as w}from"./index.e4fbd5b2.js";import{d as E,c as e,a as o}from"./vendor.9e719f20.js";const F=s=>{const a=`../../images/${s}`;return{"../../images/course_bg.png":i,"../../images/entry_active.png":g,"../../images/entry_default.png":n,"../../images/icon_cert.png":l,"../../images/icon_cert_default.png":t,"../../images/icon_king.png":m,"../../images/icon_live.png":r,"../../images/icon_live_default.png":p,"../../images/icon_member.png":c,"../../images/icon_member_default.png":d,"../../images/icon_music.png":u,"../../images/icon_music_default.png":b,"../../images/icon_timer.png":D,"../../images/icon_video.png":f,"../../images/icon_video_default.png":x,"../../images/icon_vip.png":T,"../../images/icon_vip_default.png":j,"../../images/music_active.png":v,"../../images/music_default.png":A}[a].default};var H=E({name:"open-member",render(){return console.log(_()),e("div",null,[e("img",{src:F("icon_king.png"),class:"w-[318px] absolute -top-10 left-1/2 -ml-[158px]"},null),e("div",{class:"text-center text-2xl font-semibold text-[#333] pt-[70px] pb-9"},[o("\u624B\u673A\u626B\u7801\u4E0B\u8F7D"),_()==="STUDENT"?"\u9177\u4E50\u79C0":"\u9177\u4E50\u79C0\u5B66\u9662",o("App")]),_()==="TEACHER"?e("img",{src:h,class:"mx-auto w-[216px] h-[216px] align-middle border-4 border-solid border-[#2DC7AA] rounded-[10px]"},null):e("img",{src:w,class:"mx-auto w-[216px] h-[216px] align-middle border-4 border-solid border-[#2DC7AA] rounded-[10px]"},null),e("p",{class:"text-lg text-center text-[#333] pt-8"},[o("\u6253\u5F00"),_()==="STUDENT"?"\u9177\u4E50\u79C0":"\u9177\u4E50\u79C0\u5B66\u9662",o("App\u5F00\u901A\u4F1A\u5458")])])}});export{H as O};
+import{_ as i,a as g,b as n,c as l,d as t,e as m,f as r,g as p,h as c,i as d,j as u,k as b,l as f,m as x,n as v,o as A}from"./music_default.211e2c2b.js";import{_ as D}from"./icon_timer.ca726814.js";import{_ as T,a as j}from"./icon_vip_default.803a2c38.js";import{g as _,z as h,e as w}from"./index.52ebe9e2.js";import{d as E,c as e,a as o}from"./vendor.9e719f20.js";const F=s=>{const a=`../../images/${s}`;return{"../../images/course_bg.png":i,"../../images/entry_active.png":g,"../../images/entry_default.png":n,"../../images/icon_cert.png":l,"../../images/icon_cert_default.png":t,"../../images/icon_king.png":m,"../../images/icon_live.png":r,"../../images/icon_live_default.png":p,"../../images/icon_member.png":c,"../../images/icon_member_default.png":d,"../../images/icon_music.png":u,"../../images/icon_music_default.png":b,"../../images/icon_timer.png":D,"../../images/icon_video.png":f,"../../images/icon_video_default.png":x,"../../images/icon_vip.png":T,"../../images/icon_vip_default.png":j,"../../images/music_active.png":v,"../../images/music_default.png":A}[a].default};var H=E({name:"open-member",render(){return console.log(_()),e("div",null,[e("img",{src:F("icon_king.png"),class:"w-[318px] absolute -top-10 left-1/2 -ml-[158px]"},null),e("div",{class:"text-center text-2xl font-semibold text-[#333] pt-[70px] pb-9"},[o("\u624B\u673A\u626B\u7801\u4E0B\u8F7D"),_()==="STUDENT"?"\u9177\u4E50\u79C0":"\u9177\u4E50\u79C0\u5B66\u9662",o("App")]),_()==="TEACHER"?e("img",{src:h,class:"mx-auto w-[216px] h-[216px] align-middle border-4 border-solid border-[#2DC7AA] rounded-[10px]"},null):e("img",{src:w,class:"mx-auto w-[216px] h-[216px] align-middle border-4 border-solid border-[#2DC7AA] rounded-[10px]"},null),e("p",{class:"text-lg text-center text-[#333] pt-8"},[o("\u6253\u5F00"),_()==="STUDENT"?"\u9177\u4E50\u79C0":"\u9177\u4E50\u79C0\u5B66\u9662",o("App\u5F00\u901A\u4F1A\u5458")])])}});export{H as O};

dist/assets/index.1d735cfc.js → dist/assets/index.75a7d577.js

@@ -1 +1 @@
-import{d as a}from"./index.e4fbd5b2.js";import{d as o,c as i,a3 as l}from"./vendor.9e719f20.js";const d="_hidden_1x1u9_28";var n={"pagination-container":"_pagination-container_1x1u9_1",hidden:d},u=o({name:"pagination",props:{total:{required:!0,type:Number},page:{type:Number,default:1},limit:{type:Number,default:10},pageSizes:{type:Array,default:[5,10,20,30,50]},layout:{type:String,default:"total, sizes, prev, pager, next"},showMuitiple:{type:Number,default:10},hideOnSinglePage:{type:Boolean,default:!0},background:{type:Boolean,default:!0},autoScroll:{type:Boolean,default:!0},hidden:{type:Boolean,default:!1},sync:{type:Boolean,default:!1},saveKey:{type:String,default:""},pagination:{type:Function,default:()=>{}}},methods:{handleSizeChange(e){if(this.$emit("update:page",1),this.$emit("update:limit",e),this.pagination(),this.autoScroll){const t=document.documentElement.scrollTop||document.body.scrollTop;a(t,0)}},handleCurrentChange(e){if(this.$emit("update:page",e),this.$emit("update:limit",this.limit),this.pagination(),this.autoScroll){const t=document.documentElement.scrollTop||document.body.scrollTop;a(t,0)}}},render(){return i("div",{class:[n["pagination-container"],this.hidden&&n.hidden]},[i(l,{currentPage:this.page,pageSize:this.limit,"onUpdate:currentPage":e=>{},"onUpdate:pageSize":e=>{this.handleSizeChange(e)},pageSizes:this.pageSizes,total:this.total,hideOnSinglePage:this.total>this.showMuitiple?!1:this.hideOnSinglePage,background:this.background,layout:this.layout,"onSise-change":this.handleSizeChange,"onCurrent-change":this.handleCurrentChange},null)])}});export{u as P};
+import{d as a}from"./index.52ebe9e2.js";import{d as o,c as i,a3 as l}from"./vendor.9e719f20.js";const d="_hidden_1x1u9_28";var n={"pagination-container":"_pagination-container_1x1u9_1",hidden:d},u=o({name:"pagination",props:{total:{required:!0,type:Number},page:{type:Number,default:1},limit:{type:Number,default:10},pageSizes:{type:Array,default:[5,10,20,30,50]},layout:{type:String,default:"total, sizes, prev, pager, next"},showMuitiple:{type:Number,default:10},hideOnSinglePage:{type:Boolean,default:!0},background:{type:Boolean,default:!0},autoScroll:{type:Boolean,default:!0},hidden:{type:Boolean,default:!1},sync:{type:Boolean,default:!1},saveKey:{type:String,default:""},pagination:{type:Function,default:()=>{}}},methods:{handleSizeChange(e){if(this.$emit("update:page",1),this.$emit("update:limit",e),this.pagination(),this.autoScroll){const t=document.documentElement.scrollTop||document.body.scrollTop;a(t,0)}},handleCurrentChange(e){if(this.$emit("update:page",e),this.$emit("update:limit",this.limit),this.pagination(),this.autoScroll){const t=document.documentElement.scrollTop||document.body.scrollTop;a(t,0)}}},render(){return i("div",{class:[n["pagination-container"],this.hidden&&n.hidden]},[i(l,{currentPage:this.page,pageSize:this.limit,"onUpdate:currentPage":e=>{},"onUpdate:pageSize":e=>{this.handleSizeChange(e)},pageSizes:this.pageSizes,total:this.total,hideOnSinglePage:this.total>this.showMuitiple?!1:this.hideOnSinglePage,background:this.background,layout:this.layout,"onSise-change":this.handleSizeChange,"onCurrent-change":this.handleCurrentChange},null)])}});export{u as P};

dist/index.html

@@ -43,7 +43,7 @@
         }
       }
     </script>
-    <script type="module" crossorigin src="./assets/index.e4fbd5b2.js"></script>
+    <script type="module" crossorigin src="./assets/index.52ebe9e2.js"></script>
     <link rel="modulepreload" href="./assets/vendor.9e719f20.js">
     <link rel="stylesheet" href="./assets/index.5d6adc3a.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>
@@ -54,6 +54,6 @@
     
     <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.f3531228.js"></script>
-    <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.61c6abee.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+    <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.e19accde.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
   </body>
 </html>

src/views/muiscDetial/index.module.less

@@ -3,6 +3,20 @@
 }
 .wallWrap {
   background-color: #f8f8f8;
+  :global {
+    .el-carousel__container {
+      height: 100%;
+    }
+    .el-carousel__button {
+      // background-color: #2dc7aa;
+      background-color: #c2c2c2;
+      height: 4px;
+      border-radius: 4px;
+    }
+    .is-active .el-carousel__button {
+      background-color: #2dc7aa;
+    }
+  }
 }
 .musicWraps {
   // min-height: 100vh;
@@ -83,7 +97,7 @@
       align-items: center;
       // justify-content: center;
       overflow-y: auto;
-      padding: 34px 10px 0;
+      padding: 34px 0 0;
       .musicTitle {
         font-size: 20px;
         font-weight: bold;
@@ -94,6 +108,7 @@
         position: absolute;
         right: 0;
         top: 0;
+        z-index: 99;
       }
       img {
         width: 100%;

src/views/muiscDetial/index.tsx

@@ -14,7 +14,9 @@ import {
   ElOption,
   ElSelect,
   ElScrollbar,
-  ElMessageBox
+  ElMessageBox,
+  ElCarousel,
+  ElCarouselItem
 } from 'element-plus'
 import printIcon from './images/printIcon.png'
 import noMore from './images/noMore.png'
@@ -117,7 +119,8 @@ export default defineComponent({
       accompanyUrl: '',
       imgData: '',
       imgUrl: '',
-      showImg: '',
+      activeIndex: 0,
+      showImg: [] as any,
       iconList: [] as any,
       // ossUploadUrl: 'https://ks3-cn-beijing.ksyuncs.com/cloud-coach',
       ossUploadUrl: `https://cloud-coach.ks3-cn-beijing.ksyuncs.com/`,
@@ -178,25 +181,23 @@ export default defineComponent({
         state.teacherDetail = res.data.teacher
         if (res.data.musicImg) {
           // 有图片
-          state.showImg = res.data.musicImg
+          state.showImg = res.data.musicImg ? res.data.musicImg.split(',') : []
         } else {
-          window.addEventListener(
-            'message',
-            async e => {
-              console.log(e)
-              state.imgData = e.data
-
-              // alert(e.data);
-              const tempCanvas = await imgToCanvas(state.imgData)
-              const showImg = convasToImg(tempCanvas)
-
-              //  开始上传图片
-              uploadFunction(showImg)
-            },
-            false
-          )
+          // window.addEventListener(
+          //   'message',
+          //   async e => {
+          //     console.log(e)
+          //     state.imgData = e.data
+          //     // alert(e.data);
+          //     const tempCanvas = await imgToCanvas(state.imgData)
+          //     const showImg = convasToImg(tempCanvas)
+          //     //  开始上传图片
+          //     uploadFunction(showImg)
+          //   },
+          //   false
+          // )
         }
-        setAccompanyUrl()
+        // setAccompanyUrl()
         setUser()
       } catch (e) {
         console.log(e)
@@ -221,7 +222,7 @@ export default defineComponent({
       router.push({
         query: { ...route.query, id: state.id }
       })
-      state.showImg = ''
+      state.showImg = []
       getMusicList()
     }
     watch(
@@ -326,7 +327,7 @@ export default defineComponent({
           data: { musicSheetId: state.musicDetail.id, musicImg: imgurl }
         })
         console.log('赋值')
-        state.showImg = imgurl
+        state.showImg = [imgurl]
       } catch (e) {
         console.log(e)
       }
@@ -357,9 +358,11 @@ export default defineComponent({
     }
     const printHander = async () => {
       //  img 转 canvas
-      const tempCanvas = await imgToCanvas(state.showImg)
+      const tempCanvas = await imgToCanvas(
+        state.showImg[state.activeIndex] as any
+      )
       const showImg = convasToImg(tempCanvas)
-      state.showImg = showImg
+      // state.showImg = showImg
       const titleCanvas = addMusicTitle(tempCanvas, {
         title: state.musicDetail.musicSheetName,
         size: 18
@@ -459,19 +462,41 @@ export default defineComponent({
                       src={chargeImg[state.musicDetail.chargeType]}
                       alt=""
                     />
-                    <iframe
+                    {/* <iframe
                       id="containerPrint"
                       ref="print"
                       style="width: 538px;page-break-after:always; "
                       src={state.accompanyUrl}
                       class={classes.iframe}
-                    />
+                    /> */}
                     <p class={classes.musicTitle}>
                       {state.musicDetail.musicSheetName}
                     </p>
-                    {state.showImg ? (
-                      <img src={state.showImg} alt="" />
+                    {state.showImg.length > 0 ? (
+                      <ElCarousel
+                        arrow="always"
+                        style="width: 100%; height: 541px"
+                        autoplay={false}
+                        loop={false}
+                        onChange={(index: number) => {
+                          state.activeIndex = index
+                        }}
+                      >
+                        {state.showImg &&
+                          state.showImg.map((img: any) => (
+                            <ElCarouselItem>
+                              <div style="height: 541px; overflow: hidden auto ;">
+                                <img src={img} alt="" />
+                              </div>
+                            </ElCarouselItem>
+                          ))}
+                      </ElCarousel>
                     ) : (
+                      //                     <el-carousel :interval="5000" arrow="always">
+                      //   <el-carousel-item v-for="item in 4" :key="item">
+                      //     <h3>{{ item }}</h3>
+                      //   </el-carousel-item>
+                      // </el-carousel>
                       <div>
                         <Vue3Lottie
                           animationData={AstronautJSON}

vite.config.ts

@@ -66,7 +66,7 @@ export default defineConfig({
   },
   server: {
     host: '0.0.0.0',
-    port: 5500,
+    port: 5100,
     strictPort: true,
     proxy: {
       '/api-auth': {