Merge branch 'online' into newVersion

dist/assets/index-legacy.7a5f30b0.js → dist/assets/index-legacy.32ce0e9e.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.7dbbbe1d.js','./index-legacy.9cf7d339.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.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:{// 分页规则
 limit:12,// 限制显示条数
 page:1,// 当前页
 total:0,// 总条数

dist/assets/index-legacy.7dbbbe1d.js → dist/assets/index-legacy.8f5d1ae1.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.9cf7d339.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.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
 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.69262091.js → dist/assets/index-legacy.94f45e41.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.9cf7d339.js','./item-legacy.c1d39e43.js','./index-legacy.5669f9d5.js','./index-legacy.7dbbbe1d.js','./vendor-legacy.b19481d4.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.q;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.ay;}],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.5b15e49d.js','./item-legacy.c1d39e43.js','./index-legacy.5669f9d5.js','./index-legacy.8f5d1ae1.js','./vendor-legacy.b19481d4.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.ay;}],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.8775d104.js → dist/assets/index.ba9fd73e.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 c,h as p,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,c as w}from"./index.5e0d16cd.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":c,"../../images/icon_member.png":p,"../../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.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};

dist/assets/index.21db8bd0.js → dist/assets/index.d6226f98.js

@@ -1 +1 @@
-import{u as a}from"./index.5e0d16cd.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.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};

dist/index.html

@@ -43,7 +43,7 @@
         }
       }
     </script>
-    <script type="module" crossorigin src="./assets/index.5e0d16cd.js"></script>
+    <script type="module" crossorigin src="./assets/index.5da693fc.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>
@@ -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.0f82b4c5.js"></script>
-    <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.9cf7d339.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</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>
   </body>
 </html>

src/components/col-header/index.tsx

@@ -83,11 +83,7 @@ export default defineComponent({
           <div class="flex items-center h-full">
             <div class="logoWrap" onClick={() => this.gotoMain()}>
               {/* this.isdark || */}
-              <img
-                class="w-full"
-                src={ !this.isTop ? logo : whileLogo}
-                alt=""
-              />
+              <img class="w-full" src={!this.isTop ? logo : whileLogo} alt="" />
             </div>
           </div>
           <div class={['rightWrap', 'flex', 'items-center']}>

src/components/searchInput/index.module.less

@@ -22,28 +22,23 @@
   }
   .selectWrap {
     :global {
-      .hasVal {
-        .el-input__wrapper {
-          &:hover {
-            .el-input__suffix-inner {
-              position: relative;
-              .el-select__caret {
-                //箭头样式
-
-                // transform: rotateZ(0deg); //转动图片
-                appearance: none;
-                background: url('@{img}/closeIcon.png') no-repeat; //自定义图片
-                background-size: 16px 16px;
-                // width: 16px;
-                // height: 16px !important;
-                // position: absolute; //图片定位
-                top: -1px;
-                right: -1px;
-              }
-            }
-          }
-        }
-      }
+      // .hasVal {
+      //   .el-input__wrapper {
+      //     &:hover {
+      //       .el-input__suffix-inner {
+      //         position: relative;
+      //         .el-select__caret {
+      //           //箭头样式
+      //           appearance: none;
+      //           background: url('@{img}/closeIcon.png') no-repeat; //自定义图片
+      //           background-size: 16px 16px;
+      //           top: -1px;
+      //           right: -1px;
+      //         }
+      //       }
+      //     }
+      //   }
+      // }
       .el-input__wrapper {
         padding-right: 25px;
         font-size: 16px;

src/components/searchInput/index.tsx

@@ -9,11 +9,13 @@ import {
   ElOption,
   ElIcon
 } from 'element-plus'
+import { state as baseSate } from '@/state'
 
 // import white from './while.module.less'
 import classes from './index.module.less'
 import request from '@/helpers/request'
 import searchIcon from './images/searchIcon.png'
+import { SubjectEnum, useSubjectId } from '@/helpers/hooks'
 export default defineComponent({
   name: 'searchInput',
   props: {
@@ -32,6 +34,10 @@ export default defineComponent({
     holder: {
       type: String,
       default: '搜一搜你想练习的曲目'
+    },
+    type: {
+      type: String,
+      default: 'search'
     }
   },
   emits: ['startSearch'],
@@ -48,8 +54,10 @@ export default defineComponent({
       searchVal => {
         // console.log(searchVal,'searchVal')
         state.search = searchVal.search ? searchVal.search : ''
-        state.subject = Number(props.searchVal.subject || props.searchVal.lessonSubject)
-          ? Number(props.searchVal.subject|| props.searchVal.lessonSubject)
+        state.subject = Number(
+          props.searchVal.subject || props.searchVal.lessonSubject
+        )
+          ? Number(props.searchVal.subject || props.searchVal.lessonSubject)
           : ''
       },
       {
@@ -60,11 +68,47 @@ export default defineComponent({
       console.log('调用')
       try {
         const res = await request.get(
-          '/api-website/open/subject/queryPage',
-          {params:{rows:9999,page:1}}
+          '/api-website/open/subject/subjectSelect',
+          { params: { type: 'MUSIC' } }
+        )
+        const result = res.data || []
+        const tempSubject: any = []
+        result.forEach((item: any) => {
+          if (item.subjects && item.subjects.length > 0) {
+            item.subjects.forEach((subject: any) => {
+              tempSubject.push(subject)
+            })
+          }
+        })
+        const subjects: any = useSubjectId(
+          SubjectEnum[props.type === 'search' ? 'SEARCH' : 'VIDEO']
         )
+        console.log(subjects, 'subjects found')
+        state.subjectList = tempSubject
+        const subjectIds = baseSate.user.data?.subjectId || ''
+        // 判断是否已有数据
+        if (subjects.id) {
+          state.subject = Number(subjects.id)
+        } else {
+          if (subjectIds) {
+            const subjectId = Number(subjectIds.split(',')[0])
+            state.subject = subjectId
 
-        state.subjectList = res.data.rows
+            tempSubject.forEach((subject: any) => {
+              if (subject.id == subjectId) {
+                // 设置默认查询声部
+                useSubjectId(
+                  SubjectEnum[props.type === 'search' ? 'SEARCH' : 'VIDEO'],
+                  JSON.stringify({
+                    id: subjectId,
+                    name: subject.name
+                  }),
+                  'set'
+                )
+              }
+            })
+          }
+        }
       } catch (e) {
         console.log(e)
       }
@@ -75,6 +119,22 @@ export default defineComponent({
         search: state.search,
         subject: state.subject
       })
+      const subjects = {
+        id: state.subject,
+        name: ''
+      }
+      state.subjectList.forEach((subject: any) => {
+        if (subject.id == subjects.id) {
+          subjects.name = subject.name
+        }
+      })
+
+      // 设置声部
+      useSubjectId(
+        SubjectEnum[props.type === 'search' ? 'SEARCH' : 'VIDEO'],
+        JSON.stringify(subjects),
+        'set'
+      )
     }
     onMounted(() => {
       getSubjectList()
@@ -87,11 +147,11 @@ export default defineComponent({
         <div class={[classes.wrap]}>
           <div class={classes.selectWrap} id="selectWrap">
             <ElSelect
-              clearable
+              // clearable
               v-model={state.subject}
               placeholder="请选择声部"
               style="width: 175px"
-              class={["subSelect",state.subject?'hasVal':'']}
+              class={['subSelect', state.subject ? 'hasVal' : '']}
               v-slots={{
                 suffix: () => <div class={classes.san}></div>
               }}
@@ -102,7 +162,7 @@ export default defineComponent({
             </ElSelect>
             <div class={classes.line}></div>
           </div>
-          <div class={classes.searchWrap} >
+          <div class={classes.searchWrap}>
             <img src={searchIcon} alt="" />
           </div>
           <ElInput
@@ -116,8 +176,10 @@ export default defineComponent({
             //   }
             // }}
           ></ElInput>
-            <div class={classes.searchline}></div>
-          <div class={classes.searchBtn} onClick={startSearch}>搜索</div >
+          <div class={classes.searchline}></div>
+          <div class={classes.searchBtn} onClick={startSearch}>
+            搜索
+          </div>
         </div>
       </>
     )

src/helpers/hooks.ts

@@ -0,0 +1,38 @@
+// 搜索关键字
+export const SubjectEnum = {
+  SEARCH: 'music-songbook-subject',
+  // ALBUM: 'music-album-subject',
+  // MUSIC: 'music-subject',
+  // LIVE: 'live-subject',
+  VIDEO: 'video-subject'
+  // ELEGANT: 'elegant-subject'
+}
+/**
+ * 获取声部编号 | 保存声部编号
+ */
+export const useSubjectId = (
+  key: string,
+  value?: any,
+  type = 'get' as 'get' | 'set'
+) => {
+  // 判断是否在关键字
+  // console.log(key, value, type)
+  if (!key) return ''
+  if (type === 'get') {
+    let subject = localStorage.getItem(key)
+    subject = subject ? JSON.parse(subject) : { name: '', id: '' }
+    return subject
+  } else {
+    localStorage.setItem(key, value)
+    return ''
+  }
+}
+
+export const useSubjectClearly = (key?: string) => {
+  if (key) {
+    localStorage.removeItem(key)
+  } else {
+    localStorage.removeItem(SubjectEnum.SEARCH)
+    localStorage.removeItem(SubjectEnum.VIDEO)
+  }
+}

src/views/App.tsx

@@ -13,6 +13,7 @@ import '../style/index.css'
 import 'normalize.css'
 import 'element-plus/dist/index.css'
 import 'vue3-lottie/dist/style.css'
+import { useSubjectClearly } from '@/helpers/hooks'
 
 export default defineComponent({
   components: { silder },
@@ -23,6 +24,8 @@ export default defineComponent({
       if (state.user.data?.userId) {
         // 获取用户信息
         await getUserInfo()
+      } else {
+        // useSubjectClearly()
       }
     } catch {}
     // console.log('user end')

src/views/musicLibrary/index.tsx

@@ -18,6 +18,8 @@ import 'swiper/css/navigation'
 import 'swiper/css/pagination'
 import 'swiper/css/scrollbar'
 import { useRoute, useRouter } from 'vue-router'
+import { state as baseState } from '@/state'
+import { SubjectEnum, useSubjectId } from '@/helpers/hooks'
 export default defineComponent({
   name: 'musicLibrary',
   components: {
@@ -30,6 +32,14 @@ export default defineComponent({
     banner
   },
   setup() {
+    let subjectId = 0
+    const subjectIds = baseState.user.data?.subjectId || ''
+    if (subjectIds) {
+      subjectId = Number(subjectIds.split(',')[0])
+    }
+    // 判断是否在默认的声部
+    const subjects: any = useSubjectId(SubjectEnum.SEARCH)
+    subjectId = subjects.id || subjectId
     const state = reactive({
       albumList: [],
       musicList: []
@@ -41,6 +51,7 @@ export default defineComponent({
           data: {
             albumStatus: 1,
             page: 1,
+            subjectIds: subjectId ? subjectId : null,
             rows: 10
           }
         })
@@ -55,6 +66,7 @@ export default defineComponent({
         const res = await request.post('/api-website/open/music/sheet/list', {
           data: {
             albumStatus: 'PASS',
+            subjectIds: subjectId ? subjectId : null,
             page: 1,
             rows: 5,
             state: 1
@@ -97,6 +109,7 @@ export default defineComponent({
 
               <searchInput
                 isWhile={false}
+                type="search"
                 onStartSearch={(val: any) => gotoSearch(val)}
               ></searchInput>
               <div class={styles.hotSearch}>
@@ -107,45 +120,57 @@ export default defineComponent({
                   type={''}
                 ></hotSearch>
               </div>
-              <div class={[styles.videoNav,styles.mt25]}>
-                <div class={styles.titleWrap}>
-                  <h5 class={styles.hotAlbum}>热门专辑</h5>
-                  <img src={titleDot} class={styles.dotImg} alt="" />
-                </div>
 
-                <div class={styles.wrapRight} onClick={() => gotoAlbum()}>
-                  <span>更多</span>
-                  <img class={styles.arrow} src={arrow} alt="" />
-                </div>
-              </div>
+              {state.albumList && state.albumList.length > 0 && (
+                <>
+                  <div class={[styles.videoNav, styles.mt25]}>
+                    <div class={styles.titleWrap}>
+                      <h5 class={styles.hotAlbum}>热门专辑</h5>
+                      <img src={titleDot} class={styles.dotImg} alt="" />
+                    </div>
 
-              <div class={styles.albumList}>
-                {state.albumList.map(item => {
-                  return <albumItem detail={item}></albumItem>
-                })}
-              </div>
+                    <div class={styles.wrapRight} onClick={() => gotoAlbum()}>
+                      <span>更多</span>
+                      <img class={styles.arrow} src={arrow} alt="" />
+                    </div>
+                  </div>
+
+                  <div class={styles.albumList}>
+                    {state.albumList.map(item => {
+                      return <albumItem detail={item}></albumItem>
+                    })}
+                  </div>
+                </>
+              )}
             </div>
           </div>
         </div>
         <div>
           <div class={styles.w1200}>
-            <div class={[styles.section,styles.pb40]}>
-              <div class={styles.videoNav}>
-                <div class={styles.titleWrap}>
-                  <h5>热门乐谱</h5>
-                  <img src={titleDot} class={styles.dotImg} alt="" />
-                </div>
-                <div class={styles.wrapRight} onClick={() => gotoMusic()}>
-                  <span>更多</span>
-                  <img class={styles.arrow} src={arrow} alt="" />
+            {state.musicList && state.musicList.length > 0 && (
+              <>
+                <div
+                  class={[styles.section, styles.pb40]}
+                  style="padding-top: 0"
+                >
+                  <div class={styles.videoNav}>
+                    <div class={styles.titleWrap}>
+                      <h5>热门乐谱</h5>
+                      <img src={titleDot} class={styles.dotImg} alt="" />
+                    </div>
+                    <div class={styles.wrapRight} onClick={() => gotoMusic()}>
+                      <span>更多</span>
+                      <img class={styles.arrow} src={arrow} alt="" />
+                    </div>
+                  </div>
+                  <div class={styles.musicList}>
+                    {state.musicList.map(item => {
+                      return <musicLIstItem item={item}></musicLIstItem>
+                    })}
+                  </div>
                 </div>
-              </div>
-              <div class={styles.musicList}>
-                {state.musicList.map(item => {
-                  return <musicLIstItem item={item}></musicLIstItem>
-                })}
-              </div>
-            </div>
+              </>
+            )}
 
             {/* <musicLIstItem></musicLIstItem> */}
           </div>

src/views/musicLibrary/searchdetail.tsx

@@ -22,6 +22,8 @@ import 'swiper/css/pagination'
 import 'swiper/css/scrollbar'
 import { ElTabPane, ElTabs } from 'element-plus'
 import { useRoute } from 'vue-router'
+import { SubjectEnum, useSubjectId } from '@/helpers/hooks'
+import { useAsyncState, useLocalStorage } from '@vueuse/core'
 export default defineComponent({
   name: 'searchdetail',
   components: {
@@ -32,6 +34,7 @@ export default defineComponent({
     searchMusic
   },
   setup() {
+    const subjects: any = useSubjectId(SubjectEnum.SEARCH)
     const state = reactive({
       albumList: [],
       musicList: [],
@@ -39,7 +42,7 @@ export default defineComponent({
       searchs: {
         albumTagIds: '',
         search: '',
-        subject: ''
+        subject: subjects.id || ''
       }
     })
     const route = useRoute()
@@ -97,14 +100,12 @@ export default defineComponent({
     watch(
       () => state.chiose,
       chiose => {
-        console.log(chiose)
         nextTick(() => {
           search()
         })
       }
     )
     onMounted(() => {
-      console.log(route.name)
       if (route.params.search) {
         state.searchs.search = route.params.search as string
       }
@@ -140,6 +141,10 @@ export default defineComponent({
               <searchInput
                 isWhile={true}
                 searchVal={{ ...this.searchs }}
+                onUpdate:searchVal={(val: any) => {
+                  console.log(val, '1212')
+                }}
+                type="search"
                 onStartSearch={(val: any) => {
                   this.startSearch(val)
                 }}

src/views/videoDetailList/index.tsx

@@ -9,6 +9,8 @@ import pagination from '@/components/pagination'
 import { useRoute } from 'vue-router'
 import ColEmpty from '@/components/col-empty'
 import banner from '@/components/banner'
+import { state as baseState } from '@/state'
+import { SubjectEnum, useSubjectId } from '@/helpers/hooks'
 import 'swiper/css'
 import 'swiper/css/navigation'
 import 'swiper/css/pagination'
@@ -31,10 +33,18 @@ export default defineComponent({
     ColEmpty
   },
   setup(props, conent) {
+    let subjectId = 0
+    const subjectIds = baseState.user.data?.subjectId || ''
+    if (subjectIds) {
+      subjectId = Number(subjectIds.split(',')[0])
+    }
+    // 判断是否在默认的声部
+    const subjects: any = useSubjectId(SubjectEnum.VIDEO)
+    subjectId = subjects.id || subjectId
     const state = reactive({
       title: props.title,
       videoList: [],
-      searchs: { search: '', lessonSubject: '' },
+      searchs: { search: '', lessonSubject: subjectId },
 
       pageInfo: {
         // 分页规则
@@ -102,6 +112,7 @@ export default defineComponent({
               <searchInput
                 isWhile={true}
                 searchVal={state.searchs}
+                type="video"
                 holder="搜一搜你想看的视频课"
                 onStartSearch={(val: any) => {
                   startSearch(val)