修改

dist/assets/index-legacy.11c7c189.js

@@ -1,6 +0,0 @@
-<<<<<<<< HEAD:dist/assets/index-legacy.0ce1197b.js
-;(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.76320f47.js','./vendor-legacy.a91ca8a3.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.ad;}],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.4068049a.js','./vendor-legacy.a91ca8a3.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.ad;}],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
->>>>>>>> iteration-20241129:dist/assets/index-legacy.11c7c189.js
-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.27ceaa04.js → dist/assets/index-legacy.519bacd5.js

@@ -1,8 +1,4 @@
-<<<<<<<< HEAD:dist/assets/index-legacy.391c51e5.js
-;(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);});};}var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._removeBtn_n5kjp_1{display:inline-block;width:76px;background:#f2f2f2;border-radius:14px;font-weight:500;font-size:14px;color:#1e2022;line-height:28px;text-align:center;cursor:pointer;margin-top:10px}._removeBtn_n5kjp_1:hover{background:#2dc7aa;color:#fff}\n";document.head.appendChild(__vite_style__);System.register(['./index-legacy.47cac4e0.js','./index-legacy.0ce1197b.js','./index-legacy.76320f47.js','./icon_vip-legacy.562faf48.js','./vendor-legacy.a91ca8a3.js'],function(exports){'use strict';var ColEmpty,Pagination,request,getUserInfo,iconVip,iconSvip,defineComponent,ElMessageBox,ElMessage,createVNode,createTextVNode,ElSkeleton,ElImage,ElSkeletonItem;return{setters:[function(module){ColEmpty=module.C;},function(module){Pagination=module.P;},function(module){request=module.r;getUserInfo=module.x;},function(module){iconVip=module.i;iconSvip=module.b;},function(module){defineComponent=module.d;ElMessageBox=module.l;ElMessage=module.f;createVNode=module.c;createTextVNode=module.a;ElSkeleton=module.aw;ElImage=module.K;ElSkeletonItem=module.ax;}],execute:function execute(){var removeBtn="_removeBtn_n5kjp_1";var styles={removeBtn:removeBtn};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);});};}var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._removeBtn_n5kjp_1{display:inline-block;width:76px;background:#f2f2f2;border-radius:14px;font-weight:500;font-size:14px;color:#1e2022;line-height:28px;text-align:center;cursor:pointer;margin-top:10px}._removeBtn_n5kjp_1:hover{background:#2dc7aa;color:#fff}\n";document.head.appendChild(__vite_style__);System.register(['./index-legacy.47cac4e0.js','./index-legacy.11c7c189.js','./index-legacy.4068049a.js','./icon_vip-legacy.562faf48.js','./vendor-legacy.a91ca8a3.js'],function(exports){'use strict';var ColEmpty,Pagination,request,getUserInfo,iconVip,iconSvip,defineComponent,ElMessageBox,ElMessage,createVNode,createTextVNode,ElSkeleton,ElImage,ElSkeletonItem;return{setters:[function(module){ColEmpty=module.C;},function(module){Pagination=module.P;},function(module){request=module.r;getUserInfo=module.x;},function(module){iconVip=module.i;iconSvip=module.b;},function(module){defineComponent=module.d;ElMessageBox=module.l;ElMessage=module.f;createVNode=module.c;createTextVNode=module.a;ElSkeleton=module.aw;ElImage=module.K;ElSkeletonItem=module.ax;}],execute:function execute(){var removeBtn="_removeBtn_n5kjp_1";var styles={removeBtn:removeBtn};var index=exports('default',defineComponent({name:'MyFans',data:function data(){return{pageInfo:{// 分页规则
->>>>>>>> iteration-20241129:dist/assets/index-legacy.27ceaa04.js
+;(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);});};}var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._removeBtn_n5kjp_1{display:inline-block;width:76px;background:#f2f2f2;border-radius:14px;font-weight:500;font-size:14px;color:#1e2022;line-height:28px;text-align:center;cursor:pointer;margin-top:10px}._removeBtn_n5kjp_1:hover{background:#2dc7aa;color:#fff}\n";document.head.appendChild(__vite_style__);System.register(['./index-legacy.c5670a5f.js','./index-legacy.9254dc8a.js','./index-legacy.3658b7f2.js','./icon_vip-legacy.562faf48.js','./vendor-legacy.a20fe4b8.js'],function(exports){'use strict';var ColEmpty,Pagination,request,getUserInfo,iconVip,iconSvip,defineComponent,ElMessageBox,ElMessage,createVNode,createTextVNode,ElSkeleton,ElImage,ElSkeletonItem;return{setters:[function(module){ColEmpty=module.C;},function(module){Pagination=module.P;},function(module){request=module.r;getUserInfo=module.k;},function(module){iconVip=module.i;iconSvip=module.b;},function(module){defineComponent=module.d;ElMessageBox=module.l;ElMessage=module.f;createVNode=module.c;createTextVNode=module.a;ElSkeleton=module.au;ElImage=module.K;ElSkeletonItem=module.av;}],execute:function execute(){var removeBtn="_removeBtn_n5kjp_1";var styles={removeBtn:removeBtn};var index=exports('default',defineComponent({name:'MyFans',data:function data(){return{pageInfo:{// 分页规则
 limit:12,// 限制显示条数
 page:1,// 当前页
 total:0,// 总条数

dist/assets/index-legacy.3adcce5a.js → dist/assets/index-legacy.8821af77.js

@@ -1,3 +1,3 @@
-;(function(){System.register(['./vendor-legacy.a91ca8a3.js'],function(exports){'use strict';var defineComponent,createVNode,ElImage,createTextVNode,ElButton;return{setters:[function(module){defineComponent=module.d;createVNode=module.c;ElImage=module.K;createTextVNode=module.a;ElButton=module.p;}],execute:function execute(){var Item=exports('I',defineComponent({name:'item',props:{item:{type:Object,default:function _default(){return{};}},onOffCourse:{type:Function,default:function _default(item){}}},render:function render(){var _this=this;var item=this.item;return createVNode("div",{"class":"border border-[#E0E0E0] box-border rounded-[10px] w-[218px] m-auto overflow-hidden relative transition-all cursor-pointer","onClick":function onClick(){// console.log(item)
+;(function(){System.register(['./vendor-legacy.a20fe4b8.js'],function(exports){'use strict';var defineComponent,createVNode,ElImage,createTextVNode,ElButton;return{setters:[function(module){defineComponent=module.d;createVNode=module.c;ElImage=module.K;createTextVNode=module.a;ElButton=module.p;}],execute:function execute(){var Item=exports('I',defineComponent({name:'item',props:{item:{type:Object,default:function _default(){return{};}},onOffCourse:{type:Function,default:function _default(item){}}},render:function render(){var _this=this;var item=this.item;return createVNode("div",{"class":"border border-[#E0E0E0] box-border rounded-[10px] w-[218px] m-auto overflow-hidden relative transition-all cursor-pointer","onClick":function onClick(){// console.log(item)
 if(item.type==='video'){if(item.shelvesFlag===0&&(item.status==='UNPASS'||item.status==='OUT_SALE')){_this.$router.push({path:'/userInfo/videoOperation',query:{type:'edit',groupId:item.id}});return;}else{_this.$router.push({path:'/videoDetail',query:{id:item.id}});}}if(item.type==='live'&&(item.status==='CANCEL'||item.status==='OUT_SALE')){// 直播课
 _this.$router.push({path:'/userInfo/liveOperation',query:{type:'edit',groupId:item.courseGroupId}});}}},[createVNode("div",{"class":"relative"},[createVNode(ElImage,{"class":"w-full h-[122px] align-middle","fit":"cover","src":item.backgroundPic},null),createVNode("div",{"class":"text-sm text-[#52FFDC] h-7 leading-7 px-3 flex items-center justify-between absolute left-0 right-0 bottom-0 bg-black/60"},[createVNode("div",null,[createVNode("div",{"class":"text-base text-[#FF5F22] leading-none"},[item.courseNum,createTextVNode("\u8BFE\u65F6")])]),createVNode("div",{"class":"flex items-center"},[createVNode("i",{"class":"w-1 h-1 bg-[#52FFDC] rounded-full mr-1.5 inline-block"},null),item.studentCount,item.type==='live'?'人已购买':'人学习'])])]),createVNode("div",{"class":"text-base px-2.5 pt-2 text-[#666666] leading-none font-semibold whitespace-nowrap overflow-hidden text-ellipsis"},[item.courseGroupName]),item.courseStartTime&&createVNode("p",{"class":"text-[#999] text-xs px-2.5 leading-none pt-1.5"},[createTextVNode("\u5F00\u8BFE\u65F6\u95F4\uFF1A"),item.courseStartTime]),createVNode("div",{"class":"mx-2.5 pt-1.5 pb-2 flex items-center justify-between"},[item.payType==='VIP'?createVNode("div",{"class":"text-lg text-[#C76E21] font-semibold leading-none"},[createTextVNode("\u4F1A\u5458")]):createVNode("div",{"class":"text-lg text-[#F90000] font-semibold leading-none"},[createVNode("span",{"class":"text-sm leading-7"},[createTextVNode("\uFFE5")]),item.coursePrice]),item.type==='video'&&item.status==='PASS'&&createVNode("div",null,[createVNode(ElButton,{"type":"primary","round":true,"onClick":function onClick(e){e.stopPropagation();_this.onOffCourse(item);}},{default:function _default(){return[createTextVNode("\u4E0B\u67B6\u8BFE\u7A0B")];}})])])]);}}));}};});})();

dist/assets/index-legacy.0ce1197b.js → dist/assets/index-legacy.9254dc8a.js

@@ -1,6 +1,2 @@
-<<<<<<<< HEAD:dist/assets/index-legacy.0ce1197b.js
-;(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.76320f47.js','./vendor-legacy.a91ca8a3.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.ad;}],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.4068049a.js','./vendor-legacy.a91ca8a3.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.ad;}],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
->>>>>>>> iteration-20241129:dist/assets/index-legacy.11c7c189.js
+;(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.3658b7f2.js','./vendor-legacy.a20fe4b8.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.ad;}],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.5aec1633.js → dist/assets/index-legacy.a17e9bf7.js

@@ -1,8 +1,4 @@
-<<<<<<<< HEAD:dist/assets/index-legacy.5aec1633.js
-;(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.76320f47.js','./item-legacy.2d229e35.js','./index-legacy.47cac4e0.js','./index-legacy.0ce1197b.js','./vendor-legacy.a91ca8a3.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.l;ElMessage=module.f;createVNode=module.c;Fragment=module.F;ElSkeleton=module.aw;ElSkeletonItem=module.ax;ElButton=module.p;createTextVNode=module.a;ElTabs=module.P;ElTabPane=module.S;ElBadge=module.aM;},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.4068049a.js','./item-legacy.2d229e35.js','./index-legacy.47cac4e0.js','./index-legacy.11c7c189.js','./vendor-legacy.a91ca8a3.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.l;ElMessage=module.f;createVNode=module.c;Fragment=module.F;ElSkeleton=module.aw;ElSkeletonItem=module.ax;ElButton=module.p;createTextVNode=module.a;ElTabs=module.P;ElTabPane=module.S;ElBadge=module.aM;},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:{// 分页规则
->>>>>>>> iteration-20241129:dist/assets/index-legacy.91dbf5d5.js
+;(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.3658b7f2.js','./item-legacy.10a2cbe8.js','./index-legacy.c5670a5f.js','./index-legacy.9254dc8a.js','./vendor-legacy.a20fe4b8.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.l;ElMessage=module.f;createVNode=module.c;Fragment=module.F;ElSkeleton=module.au;ElSkeletonItem=module.av;ElButton=module.p;createTextVNode=module.a;ElTabs=module.P;ElTabPane=module.S;ElBadge=module.aK;},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-legacy.47cac4e0.js → dist/assets/index-legacy.c5670a5f.js

@@ -1,2 +1,2 @@
-;(function(){System.register(['./vendor-legacy.a91ca8a3.js'],function(exports){'use strict';var defineComponent,createVNode,ElButton;return{setters:[function(module){defineComponent=module.d;createVNode=module.c;ElButton=module.p;}],execute:function execute(){var empty="./assets/icon_empty.df5db7bf.png";var live="./assets/icon_no_live.fcb0eb56.png";var teacherCert="./assets/icon_teacher_cert.ee709a8f.png";var musicCert="./assets/icon_music_cert.a65c8b91.png";var ColEmpty=exports('C',defineComponent({name:'col-empty',props:{message:{type:String,default:'暂无数据'},buttonText:{type:String,default:'去首页'},buttonVisibility:{type:Boolean,default:false},type:{type:String,default:'empty'// 'empty' | 'live' | 'teacherCert' | 'musicCert'
+;(function(){System.register(['./vendor-legacy.a20fe4b8.js'],function(exports){'use strict';var defineComponent,createVNode,ElButton;return{setters:[function(module){defineComponent=module.d;createVNode=module.c;ElButton=module.p;}],execute:function execute(){var empty="./assets/icon_empty.df5db7bf.png";var live="./assets/icon_no_live.fcb0eb56.png";var teacherCert="./assets/icon_teacher_cert.ee709a8f.png";var musicCert="./assets/icon_music_cert.a65c8b91.png";var ColEmpty=exports('C',defineComponent({name:'col-empty',props:{message:{type:String,default:'暂无数据'},buttonText:{type:String,default:'去首页'},buttonVisibility:{type:Boolean,default:false},type:{type:String,default:'empty'// 'empty' | 'live' | 'teacherCert' | 'musicCert'
 },onDetail:{type:Function,default:function _default(){}}},computed:{icon:function icon(){switch(this.type){case'empty':return empty;case'live':return live;case'teacherCert':return teacherCert;case'musicCert':return musicCert;default:return empty;}}},render:function render(){var _this=this;return createVNode("div",{"class":"w-full h-full text-center flex items-center justify-center flex-col"},[createVNode("img",{"src":this.icon,"class":"w-64 m-auto"},null),createVNode("p",{"class":"text-base text-[#999999] pt-4 pb-6"},[this.message]),this.buttonVisibility&&createVNode(ElButton,{"type":"primary","class":"rounded-sm !px-12","round":true,"style":{height:'48px'},"onClick":function onClick(){_this.onDetail();}},{default:function _default(){return[_this.buttonText];}})]);}}));}};});})();

dist/assets/index.071016cc.js

@@ -0,0 +1 @@
+import{d as a}from"./index.b6c8a497.js";import{d as o,c as i,ad as l}from"./vendor.cbfd3a7d.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/assets/index.21014db0.js

@@ -1,5 +0,0 @@
-<<<<<<<< HEAD:dist/assets/index.af9fb1a7.js
-import{d as a}from"./index.e7df140d.js";import{d as o,c as i,ad as l}from"./vendor.bd44ab8f.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.5d392b57.js";import{d as o,c as i,ad as l}from"./vendor.bd44ab8f.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};
->>>>>>>> iteration-20241129:dist/assets/index.21014db0.js

dist/assets/index.abca541e.js → dist/assets/index.4e44a094.js

@@ -1 +1 @@
-import{h as r}from"./hold.c2fff6ac.js";import{i as u,a as n}from"./lineStart.9340661e.js";import{p as c}from"./player.8b5ee2bb.js";import{d,r as p,a1 as _,g as b,c as t,a as l,F as v}from"./vendor.bd44ab8f.js";const h="_itemWrap_1qjns_1",g="_albumType_1qjns_7",y="_hold_1qjns_24",j="_masker_1qjns_28",B="_showPaly_1qjns_1",f="_startImage_1qjns_83",C="_itemBottom_1qjns_107",q="_itemBottomR_1qjns_116",T="_itemBottomL_1qjns_119";var e={itemWrap:h,albumType:g,hold:y,masker:j,showPaly:B,startImage:f,itemBottom:C,itemBottomR:q,itemBottomL:T},S=d({name:"albumItem",props:{detail:{type:Object,default:{albumCoverUrl:"",albumDesc:"",albumFavoriteCount:0,albumName:"",albumStatus:0,albumTag:"",auditVersion:0,createBy:0,createTime:"",delFlag:null,hotFlag:null,id:0,musicSheetCount:0,musicTagNames:"",sortNumber:0,topFlag:null,updateBy:34,updateTime:"",favorite:0}}},setup(s){const a=p({detail:s.detail});_(()=>s.detail,i=>{a.detail=i});const o=b(),m=()=>{o.push({path:"/albumDetail",query:{id:a.detail.id}})};return()=>t(v,null,[t("div",{class:e.itemWrap,onClick:()=>{m()}},[a.detail.paymentType==="CHARGE"&&t("span",{class:e.albumType},[l("\u4ED8\u8D39")]),t("img",{class:e.startImage,src:a.detail.favorite?u:n,alt:""},null),t("div",{class:e.hold},[t("div",{class:e.masker},[t("img",{src:c,alt:""},null)]),t("img",{src:a.detail.albumCoverUrl?a.detail.albumCoverUrl:r,alt:""},null)]),t("h2",null,[a.detail.albumName]),t("div",{class:e.itemBottom},[t("div",{class:e.itemBottomL},[t("span",null,[a.detail.musicSheetCount,l("\u9996")])]),t("div",{class:e.itemBottomR},[t("span",null,[a.detail.albumFavoriteCount,l("\u6536\u85CF")])])])])])}});export{S as a};
+import{h as r}from"./hold.c2fff6ac.js";import{i as u,a as n}from"./lineStart.9340661e.js";import{p as c}from"./player.8b5ee2bb.js";import{d,r as p,a1 as _,g as b,c as t,a as l,F as v}from"./vendor.cbfd3a7d.js";const h="_itemWrap_1qjns_1",g="_albumType_1qjns_7",y="_hold_1qjns_24",j="_masker_1qjns_28",B="_showPaly_1qjns_1",f="_startImage_1qjns_83",C="_itemBottom_1qjns_107",q="_itemBottomR_1qjns_116",T="_itemBottomL_1qjns_119";var e={itemWrap:h,albumType:g,hold:y,masker:j,showPaly:B,startImage:f,itemBottom:C,itemBottomR:q,itemBottomL:T},S=d({name:"albumItem",props:{detail:{type:Object,default:{albumCoverUrl:"",albumDesc:"",albumFavoriteCount:0,albumName:"",albumStatus:0,albumTag:"",auditVersion:0,createBy:0,createTime:"",delFlag:null,hotFlag:null,id:0,musicSheetCount:0,musicTagNames:"",sortNumber:0,topFlag:null,updateBy:34,updateTime:"",favorite:0}}},setup(s){const a=p({detail:s.detail});_(()=>s.detail,i=>{a.detail=i});const o=b(),m=()=>{o.push({path:"/albumDetail",query:{id:a.detail.id}})};return()=>t(v,null,[t("div",{class:e.itemWrap,onClick:()=>{m()}},[a.detail.paymentType==="CHARGE"&&t("span",{class:e.albumType},[l("\u4ED8\u8D39")]),t("img",{class:e.startImage,src:a.detail.favorite?u:n,alt:""},null),t("div",{class:e.hold},[t("div",{class:e.masker},[t("img",{src:c,alt:""},null)]),t("img",{src:a.detail.albumCoverUrl?a.detail.albumCoverUrl:r,alt:""},null)]),t("h2",null,[a.detail.albumName]),t("div",{class:e.itemBottom},[t("div",{class:e.itemBottomL},[t("span",null,[a.detail.musicSheetCount,l("\u9996")])]),t("div",{class:e.itemBottomR},[t("span",null,[a.detail.albumFavoriteCount,l("\u6536\u85CF")])])])])])}});export{S as a};