Merge branch 'online' into fine-music-score

dist/assets/index-legacy.8f5d1ae1.js → dist/assets/index-legacy.0770ab95.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.5b15e49d.js','./vendor-legacy.b19481d4.js'],function(exports){'use strict';var scrollAnimation,defineComponent,createVNode,ElPagination;return{setters:[function(module){scrollAnimation=module.u;},function(module){defineComponent=module.d;createVNode=module.c;ElPagination=module.a6;}],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.47c6bd69.js','./vendor-legacy.b19481d4.js'],function(exports){'use strict';var scrollAnimation,defineComponent,createVNode,ElPagination;return{setters:[function(module){scrollAnimation=module.u;},function(module){defineComponent=module.d;createVNode=module.c;ElPagination=module.a6;}],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.32ce0e9e.js → dist/assets/index-legacy.eba4ac96.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.5669f9d5.js','./index-legacy.8f5d1ae1.js','./index-legacy.5b15e49d.js','./icon_vip_default-legacy.d2430bdf.js','./vendor-legacy.b19481d4.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.5669f9d5.js','./index-legacy.0770ab95.js','./index-legacy.47c6bd69.js','./icon_vip_default-legacy.d2430bdf.js','./vendor-legacy.b19481d4.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.d6226f98.js → dist/assets/index.1f0955e1.js

@@ -1 +1 @@
-import{u as a}from"./index.5da693fc.js";import{d as o,c as i,a6 as l}from"./vendor.9f3c6e4d.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{u as a}from"./index.de668cb6.js";import{d as o,c as i,a6 as l}from"./vendor.9f3c6e4d.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.ba9fd73e.js → dist/assets/index.4bf7ba72.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,d as w}from"./index.5da693fc.js";import{d as E,c as e,a as o}from"./vendor.9f3c6e4d.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,d as w}from"./index.de668cb6.js";import{d as E,c as e,a as o}from"./vendor.9f3c6e4d.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/index.html

@@ -43,7 +43,7 @@
         }
       }
     </script>
-    <script type="module" crossorigin src="./assets/index.5da693fc.js"></script>
+    <script type="module" crossorigin src="./assets/index.de668cb6.js"></script>
     <link rel="modulepreload" href="./assets/vendor.9f3c6e4d.js">
     <link rel="stylesheet" href="./assets/index.9afa976a.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>
@@ -53,7 +53,7 @@
     <div id="app"></div>
     
     <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
-    <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.0f82b4c5.js"></script>
-    <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.5b15e49d.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+    <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.86648852.js"></script>
+    <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.47c6bd69.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
   </body>
 </html>

src/components/musicLIstItem/index.module.less

@@ -163,8 +163,8 @@
       }
     }
     .touchButtonO {
-      &:hover {
-      }
+      margin-bottom: 65px;
+      display: flex;
       .touchButton {
         background: #fff;
         border-radius: 12px;
@@ -175,7 +175,8 @@
         border-radius: 10px;
         border: 1px solid #4ca751;
         display: flex;
-        margin-bottom: 65px;
+        margin-left: 10px;
+        
         .touchButtonWrap {
           width: 54px;
           height: 100%;

src/components/musicLIstItem/index.tsx

@@ -115,21 +115,26 @@ export default defineComponent({
                   <p>查看详情</p>
                 </div>
               ) : (
-                <div
-                  class={[
-                    classes.touchButton,
-                    classes[state.item.chargeType?.toLocaleLowerCase()]
-                  ]}
-                >
-                  <div class={classes.touchButtonWrap}>
-                    <img src={chargeImg[state.item.chargeType]} alt="" />
-                  </div>
-                  <div class={classes.touchButtonText}>
-                    {chargeTypes[state.item.chargeType]
-                      ? chargeTypes[state.item.chargeType]
-                      : '点播'}
-                  </div>
-                </div>
+                <>
+                  {state.item.paymentType && state.item.paymentType.map((tag: string) => (
+                    <div
+                      class={[
+                        classes.touchButton,
+                        classes[tag?.toLocaleLowerCase()]
+                      ]}
+                    >
+                      <div class={classes.touchButtonWrap}>
+                        <img src={chargeImg[tag]} alt="" />
+                      </div>
+                      <div class={classes.touchButtonText}>
+                        {chargeTypes[tag]
+                          ? chargeTypes[tag]
+                          : '点播'}
+                      </div>
+                    </div>
+                  ))}
+                  
+                </>
               )}
             </div>
             {/* <img class={classes.arrow} src={arrow} alt="" /> */}

src/router/routes-admin.ts

@@ -174,14 +174,14 @@ export default [
         path: '/userInfo/musicClass',
         name: 'userInfoMusicClass',
         component: () => import('@/views/user-info/music-class'),
-        meta: { title: '我的曲谱', index: 5, isdark: true }
+        meta: { title: '上传曲谱', index: 5, isdark: true }
       },
       {
         path: '/userInfo/musicOperation',
         name: 'userInfoMusicOperation',
         component: () => import('@/views/user-info/music-operation'),
         meta: {
-          title: '我的曲谱',
+          title: '上传曲谱',
           index: 4,
           hidden: true,
           activeMenu: 'userInfoMusicClass',
@@ -189,6 +189,18 @@ export default [
         }
       },
       {
+        path: '/userInfo/myCollect',
+        name: 'userInfoMyCollect',
+        component: () => import('@/views/student-info/my-score'),
+        meta: {
+          title: '我的曲谱',
+          index: 5,
+          hidden: false,
+          activeMenu: 'userInfoMyCollect',
+          isdark: true
+        }
+      },
+      {
         path: '/userInfo/myFans',
         name: 'userInfoMyFans',
         component: () => import('@/views/user-info/my-fans'),

src/views/albumDetail/index.tsx

@@ -63,7 +63,11 @@ export default defineComponent({
           data: {
             id: state.id,
             page: state.pageInfo.page,
-            rows: state.pageInfo.limit
+            rows: state.pageInfo.limit,
+            clientType: getUserType()
+          },
+          params: {
+            clientType: getUserType()
           }
         })
         state.details = res.data
@@ -73,7 +77,10 @@ export default defineComponent({
         } else {
           state.isshowData = false
         }
-        state.musicList = res.data.musicSheetList.rows
+        state.musicList = Array.isArray(res.data.musicSheetList.rows) && res.data.musicSheetList.rows.map(n => {
+          if (typeof n.paymentType === "string") n.paymentType = n.paymentType.split(',')
+          return n
+        }) || []
         state.hotList = res.data.hotMusicAlbum
         state.hotTagList = res.data.musicTagNames.split(',') || []
         state.relatedMusicAlbum = res.data.relatedMusicAlbum
@@ -91,7 +98,11 @@ export default defineComponent({
       try {
         const res = await request.post(
           `/api-website/music/album/favorite/${state.id}`,
-          {}
+          {
+            params: {
+              clientType: getUserType()
+            }
+          }
         )
         getList()
       } catch (e) {

src/views/albumDetail/modals/musicLIstItem/index.module.less

@@ -177,9 +177,8 @@
       right: 0;
       top: 38px;
       position: absolute;
-      &:hover {
-
-      }
+      margin-bottom: 65px;
+      display: flex;
       .touchButton {
         background: #fff;
         border-radius: 12px;
@@ -190,7 +189,8 @@
         border-radius: 10px;
         border: 1px solid #4ca751;
         display: flex;
-        margin-bottom: 65px;
+        margin-left: 10px;
+        
         .touchButtonWrap {
           width: 54px;
           height: 100%;

src/views/albumDetail/modals/musicLIstItem/index.tsx

@@ -102,21 +102,22 @@ export default defineComponent({
                       <p>查看</p>
                     </div>
                   ) : (
-                    <div
-                      class={[
-                        classes.touchButton,
-                        classes[state.item.chargeType?.toLocaleLowerCase()]
-                      ]}
-                    >
-                      {/* <div class={classes.touchButtonWrap}>
-                    <img src={chargeImg[state.item.chargeType]} alt="" />
-                  </div> */}
-                      <div class={classes.touchButtonText}>
-                        {chargeTypes[state.item.chargeType]
-                          ? chargeTypes[state.item.chargeType]
-                          : '点播'}
-                      </div>
-                    </div>
+                    <>
+                      {state.item.paymentType && state.item.paymentType.map((tag: string) => (
+                        <div
+                          class={[
+                            classes.touchButton,
+                            classes[tag?.toLocaleLowerCase()]
+                          ]}
+                        >
+                          <div class={classes.touchButtonText}>
+                            {chargeTypes[tag]
+                              ? chargeTypes[tag]
+                              : '点播'}
+                          </div>
+                        </div>
+                      ))}
+                    </>
                   )}
                 </div>
               </div>

src/views/home/index.tsx

@@ -18,6 +18,7 @@ import 'swiper/css/pagination'
 import 'swiper/css/scrollbar'
 import { useRouter } from 'vue-router'
 import { ElInput } from 'element-plus'
+import { getUserType } from '@/helpers/utils'
 export default defineComponent({
   name: 'home',
   components: {
@@ -42,7 +43,10 @@ export default defineComponent({
           data: {
             albumStatus: 1,
             page: 1,
-            rows: 8
+            rows: 8,
+          },
+          params:{
+            clientType: getUserType()
           }
         })
 

src/views/muiscDetial/index.module.less

@@ -275,7 +275,7 @@
         border-radius: 10px;
         overflow: hidden;
         cursor: pointer;
-
+        flex-shrink: 0;
         // background: #000000;
         // opacity: 0.2;
       }

src/views/muiscDetial/index.tsx

@@ -155,8 +155,13 @@ export default defineComponent({
       try {
         const res = await request.get(
           `/api-website/open/music/sheet/detail/${state.id}`,
-          {}
+          {
+            params: {
+              clientType: getUserType()
+            }
+          }
         )
+        res.data.paymentType = res.data.paymentType.split(',')
         state.musicDetail = res.data
         state.musicList = res.data.teacher.musicSheetList
         state.subjectList = res.data.background
@@ -395,7 +400,12 @@ export default defineComponent({
       ).then(async () => {
         try {
           const res = await request.post(
-            `/api-website/music/sheet/favorite/${state.id}`
+            `/api-website/music/sheet/favorite/${state.id}`,
+            {
+              params: {
+                clientType: getUserType()
+              }
+            }
           )
           getMusicList()
           // state.otherVideoList = res.data
@@ -524,14 +534,17 @@ export default defineComponent({
                 <div class={classes.right}>
                   <div class={classes.musicInfo}>
                     <h2>
-                      <span
-                        class={[
-                          classes.musicTag,
-                          classes[chargeClass[state.musicDetail.chargeType]]
-                        ]}
-                      >
-                        {chargeTypes[state.musicDetail.chargeType]}
-                      </span>
+                      {state.musicDetail.paymentType && state.musicDetail.paymentType.map((tag: string) => (
+                        <span
+                          class={[
+                            classes.musicTag,
+                            classes[chargeClass[tag]]
+                          ]}
+                        >
+                          {chargeTypes[tag]}
+                        </span>
+                      ))}
+                      
                       {state.musicDetail.musicSheetName}
                     </h2>
                     <div class={classes.collectWrap}>