Merge branch 'ponline' into iteration-oss-up

dist/assets/home-layout-center-legacy.d3fb6f87.js → dist/assets/home-layout-center-legacy.38a0df48.js

@@ -1 +1 @@
-!function(){function e(e,t,n,r,o,s,u){try{var a=e[s](u),c=a.value}catch(i){return void n(i)}a.done?t(c):Promise.resolve(c).then(r,o)}System.register(["./index-legacy.e3dcb6a6.js","./index-legacy.05680d61.js","./auth-legacy.0dc848de.js","./routes-common-legacy.bc0e7260.js"],(function(t){"use strict";var n,r,o,s,u,a,c,i,d,f;return{setters:[function(e){n=e.d,r=e.g,o=e.t,s=e.p,u=e.i,a=e.j,c=e.C,i=e.F},function(e){d=e.a,f=e.b},function(){},function(){}],execute:function(){t("default",n({name:"home-layout-center",data:function(){return{status:!1}},mounted:function(){this.getUserInfo()},methods:{getUserInfo:function(){var t,n=this;return(t=regeneratorRuntime.mark((function e(){var t,a,c;return regeneratorRuntime.wrap((function(e){for(;;)switch(e.prev=e.next){case 0:return e.prev=0,e.next=3,d.post("/api-auth/smsLogin",{requestType:"form",data:{clientId:"student",clientSecret:"student",phone:r.orchestraInfo.phone,token:r.orchestraInfo.token,isSurportRegister:!0}});case 3:return t=e.sent,a=t.data.authentication,o(a.token_type+" "+a.access_token),s({api:"setCache",content:{key:"h5-colexiu-token",value:a.token_type+" "+a.access_token}}),e.next=9,d.get("/api-student/student/queryUserInfo",{initRequest:!0});case 9:c=e.sent,u(c.data),n.$router.push("/home"),e.next=17;break;case 14:e.prev=14,e.t0=e.catch(0),n.status=!0;case 17:case"end":return e.stop()}}),e,null,[[0,14]])})),function(){var n=this,r=arguments;return new Promise((function(o,s){var u=t.apply(n,r);function a(t){e(u,o,s,a,c,"next",t)}function c(t){e(u,o,s,a,c,"throw",t)}a(void 0)}))})()}},render:function(){return a(i,null,[this.status?a("div",{class:f.error},[a(c,{type:"notFond",classImgSize:"CERT",tips:"加载失败，请稍后重试",buttonText:"重新加载",plain:!0,onClick:this.getUserInfo},null)]):a("div",null,null)])}}))}}}))}();
+!function(){function e(e,t,n,r,o,s,u){try{var a=e[s](u),c=a.value}catch(i){return void n(i)}a.done?t(c):Promise.resolve(c).then(r,o)}System.register(["./index-legacy.e3dcb6a6.js","./index-legacy.5636526a.js","./auth-legacy.0dc848de.js","./routes-common-legacy.19c8e2d2.js"],(function(t){"use strict";var n,r,o,s,u,a,c,i,d,f;return{setters:[function(e){n=e.d,r=e.g,o=e.t,s=e.p,u=e.i,a=e.j,c=e.C,i=e.F},function(e){d=e.a,f=e.b},function(){},function(){}],execute:function(){t("default",n({name:"home-layout-center",data:function(){return{status:!1}},mounted:function(){this.getUserInfo()},methods:{getUserInfo:function(){var t,n=this;return(t=regeneratorRuntime.mark((function e(){var t,a,c;return regeneratorRuntime.wrap((function(e){for(;;)switch(e.prev=e.next){case 0:return e.prev=0,e.next=3,d.post("/api-auth/smsLogin",{requestType:"form",data:{clientId:"student",clientSecret:"student",phone:r.orchestraInfo.phone,token:r.orchestraInfo.token,isSurportRegister:!0}});case 3:return t=e.sent,a=t.data.authentication,o(a.token_type+" "+a.access_token),s({api:"setCache",content:{key:"h5-colexiu-token",value:a.token_type+" "+a.access_token}}),e.next=9,d.get("/api-student/student/queryUserInfo",{initRequest:!0});case 9:c=e.sent,u(c.data),n.$router.push("/home"),e.next=17;break;case 14:e.prev=14,e.t0=e.catch(0),n.status=!0;case 17:case"end":return e.stop()}}),e,null,[[0,14]])})),function(){var n=this,r=arguments;return new Promise((function(o,s){var u=t.apply(n,r);function a(t){e(u,o,s,a,c,"next",t)}function c(t){e(u,o,s,a,c,"throw",t)}a(void 0)}))})()}},render:function(){return a(i,null,[this.status?a("div",{class:f.error},[a(c,{type:"notFond",classImgSize:"CERT",tips:"加载失败，请稍后重试",buttonText:"重新加载",plain:!0,onClick:this.getUserInfo},null)]):a("div",null,null)])}}))}}}))}();

dist/assets/home-layout-center.635aa0a1.js → dist/assets/home-layout-center.2fba270c.js

@@ -1 +1 @@
-import{d as r,g as s,t as u,p as i,i as c,j as e,C as l,F as p}from"./index.95ce382c.js";import{a,b as h}from"./index.8e69b24d.js";import"./auth.27f1cea0.js";import"./routes-common.4d9e4f8a.js";var g=r({name:"home-layout-center",data(){return{status:!1}},mounted(){this.getUserInfo()},methods:{async getUserInfo(){try{const o=await a.post("/api-auth/smsLogin",{requestType:"form",data:{clientId:"student",clientSecret:"student",phone:s.orchestraInfo.phone,token:s.orchestraInfo.token,isSurportRegister:!0}}),{authentication:t}=o.data;u(t.token_type+" "+t.access_token),i({api:"setCache",content:{key:"h5-colexiu-token",value:t.token_type+" "+t.access_token}});const n=await a.get("/api-student/student/queryUserInfo",{initRequest:!0});c(n.data),this.$router.push("/home")}catch{this.status=!0}}},render(){return e(p,null,[this.status?e("div",{class:h.error},[e(l,{type:"notFond",classImgSize:"CERT",tips:"\u52A0\u8F7D\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5",buttonText:"\u91CD\u65B0\u52A0\u8F7D",plain:!0,onClick:this.getUserInfo},null)]):e("div",null,null)])}});export{g as default};
+import{d as r,g as s,t as u,p as i,i as c,j as e,C as l,F as p}from"./index.95ce382c.js";import{a,b as h}from"./index.2fbbda3d.js";import"./auth.27f1cea0.js";import"./routes-common.d5b4267c.js";var g=r({name:"home-layout-center",data(){return{status:!1}},mounted(){this.getUserInfo()},methods:{async getUserInfo(){try{const o=await a.post("/api-auth/smsLogin",{requestType:"form",data:{clientId:"student",clientSecret:"student",phone:s.orchestraInfo.phone,token:s.orchestraInfo.token,isSurportRegister:!0}}),{authentication:t}=o.data;u(t.token_type+" "+t.access_token),i({api:"setCache",content:{key:"h5-colexiu-token",value:t.token_type+" "+t.access_token}});const n=await a.get("/api-student/student/queryUserInfo",{initRequest:!0});c(n.data),this.$router.push("/home")}catch{this.status=!0}}},render(){return e(p,null,[this.status?e("div",{class:h.error},[e(l,{type:"notFond",classImgSize:"CERT",tips:"\u52A0\u8F7D\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5",buttonText:"\u91CD\u65B0\u52A0\u8F7D",plain:!0,onClick:this.getUserInfo},null)]):e("div",null,null)])}});export{g as default};

dist/assets/icon_student-legacy.45be2fa9.js → dist/assets/icon_student-legacy.49eef9e9.js

@@ -1 +1 @@
-System.register([],(function(e){"use strict";return{execute:function(){e("i","./assets/icon_student.a23e1d48.png")}}}));
+System.register([],(function(e){"use strict";return{execute:function(){e("s","./assets/icon_student.a23e1d48.png")}}}));

dist/assets/icon_student.bbb32387.js

@@ -1 +0,0 @@
-var t="./assets/icon_student.a23e1d48.png";export{t as i};

dist/assets/icon_student.c3c58354.js

@@ -0,0 +1 @@
+var s="./assets/icon_student.a23e1d48.png";export{s};

dist/assets/index-legacy.666416cd.js

@@ -1 +0,0 @@
-!function(){var e=document.createElement("style");e.innerHTML="._bgImg_4odi7_1{position:fixed;top:0;left:0;width:100%;height:5.70667rem;z-index:-1}._sticky_4odi7_9 .van-sticky{background:url(./assets/bg-image.e89554da.png) no-repeat top center;background-size:100% 5.70667rem}\n",document.head.appendChild(e),System.register(["./index-legacy.e3dcb6a6.js","./index-legacy.f0a36895.js","./index-legacy.288ad764.js","./bg-image-legacy.44e2b3db.js","./index-legacy.5d0a0b15.js"],(function(e){"use strict";var n,t,i,c,a;return{setters:[function(e){n=e.d,t=e.j},function(e){i=e.T},function(e){c=e.C},function(e){a=e.b},function(){}],execute:function(){var s={bgImg:"_bgImg_4odi7_1",sticky:"_sticky_4odi7_9"};e("default",n({name:"ranking-list",setup:function(){return function(){return t("div",{class:s.activationCode},[t("div",{class:s.sticky},[t(i,{position:"top"},{default:function(){return[t(c,{background:"transparent",isFixed:!1,border:!1,title:" ",color:"#131415"},null)]}}),t("img",{class:s.bgImg,src:a},null)])])}}}))}}}))}();

dist/assets/index-legacy.bcfecba5.js → dist/assets/index-legacy.7712985e.js

@@ -1 +1 @@
-!function(){var e=document.createElement("style");e.innerHTML="._student_z69gd_1{margin:.26667rem .37333rem;border-radius:.26667rem;width:auto}._student_z69gd_1 ._studentImg_z69gd_6{margin-right:.26667rem;width:1.28rem;height:1.28rem;border-radius:50%;overflow:hidden;-o-object-fit:cover;object-fit:cover}._student_z69gd_1 ._subject_z69gd_14{margin-right:.13333rem;background:#fff1de;border-radius:.10667rem;font-size:.32rem;color:#ff8c00;line-height:.42667rem;padding:0 .10667rem}._student_z69gd_1 ._studentName_z69gd_23{font-size:.4rem;color:#1a1a1a;line-height:.74667rem}\n",document.head.appendChild(e),System.register(["./index-legacy.e3dcb6a6.js","./index-legacy.b11e9a13.js","./icon_student-legacy.45be2fa9.js"],(function(e){"use strict";var t,n,r,d;return{setters:[function(e){t=e.d,n=e.j},function(e){r=e.C},function(e){d=e.i}],execute:function(){var u={student:"_student_z69gd_1",studentImg:"_studentImg_z69gd_6",subject:"_subject_z69gd_14",studentName:"_studentName_z69gd_23"};e("S",t({name:"student",props:{item:{type:Object,default:{}},onClick:{type:Function,default:function(e){}},border:{type:Boolean,default:!0}},render:function(){var e=this;return n(r,{center:!0,class:u.student,border:this.border,onClick:function(){e.onClick(e.item)}},{default:function(){return[e.$slots.default&&e.$slots.default()]},icon:function(){return n("img",{src:e.item.avatar||d,class:u.studentImg},null)},title:function(){return n("div",{class:u.info},[n("p",{class:u.studentName},[e.item.userName]),n("p",null,[e.item.subjectName&&n("span",{class:u.subject},[e.item.subjectName])])])}})}}))}}}))}();
+!function(){var e=document.createElement("style");e.innerHTML="._student_z69gd_1{margin:.26667rem .37333rem;border-radius:.26667rem;width:auto}._student_z69gd_1 ._studentImg_z69gd_6{margin-right:.26667rem;width:1.28rem;height:1.28rem;border-radius:50%;overflow:hidden;-o-object-fit:cover;object-fit:cover}._student_z69gd_1 ._subject_z69gd_14{margin-right:.13333rem;background:#fff1de;border-radius:.10667rem;font-size:.32rem;color:#ff8c00;line-height:.42667rem;padding:0 .10667rem}._student_z69gd_1 ._studentName_z69gd_23{font-size:.4rem;color:#1a1a1a;line-height:.74667rem}\n",document.head.appendChild(e),System.register(["./index-legacy.e3dcb6a6.js","./index-legacy.b11e9a13.js","./icon_student-legacy.49eef9e9.js"],(function(e){"use strict";var t,n,r,d;return{setters:[function(e){t=e.d,n=e.j},function(e){r=e.C},function(e){d=e.s}],execute:function(){var s={student:"_student_z69gd_1",studentImg:"_studentImg_z69gd_6",subject:"_subject_z69gd_14",studentName:"_studentName_z69gd_23"};e("S",t({name:"student",props:{item:{type:Object,default:{}},onClick:{type:Function,default:function(e){}},border:{type:Boolean,default:!0}},render:function(){var e=this;return n(r,{center:!0,class:s.student,border:this.border,onClick:function(){e.onClick(e.item)}},{default:function(){return[e.$slots.default&&e.$slots.default()]},icon:function(){return n("img",{src:e.item.avatar||d,class:s.studentImg},null)},title:function(){return n("div",{class:s.info},[n("p",{class:s.studentName},[e.item.userName]),n("p",null,[e.item.subjectName&&n("span",{class:s.subject},[e.item.subjectName])])])}})}}))}}}))}();

dist/assets/index-legacy.4de5d2f7.js → dist/assets/index-legacy.f97121cb.js

@@ -1 +1 @@
-!function(){var e=document.createElement("style");e.innerHTML="._user-detail_1e2p6_1{display:flex;align-items:center;justify-content:space-between;font-size:.42667rem;line-height:.58667rem;color:#1a1a1a}._user-detail_1e2p6_1 ._user-names_1e2p6_9{display:flex;align-items:center}._user-detail_1e2p6_1 ._user-logo_1e2p6_13{width:1.06667rem;height:1.06667rem;border-radius:50%;overflow:hidden;margin-right:.21333rem}._user-detail_1e2p6_1 ._user-time_1e2p6_20{font-size:.37333rem;color:#999;line-height:.53333rem}\n",document.head.appendChild(e),System.register(["./index-legacy.e3dcb6a6.js","./index-legacy.c12a6031.js","./icon_student-legacy.45be2fa9.js"],(function(e){"use strict";var s,t,r,i;return{setters:[function(e){s=e.d,t=e.j},function(e){r=e.I},function(e){i=e.i}],execute:function(){var n="_user-detail_1e2p6_1",a="_user-names_1e2p6_9",u="_user-logo_1e2p6_13",c="_user-time_1e2p6_20";e("U",s({name:"UserDetail",props:{users:{type:Object,default:{}}},render:function(){return t("div",{class:n},[t("div",{class:a},[t(r,{class:u,src:this.users.avatar||i,fit:"cover"},null),this.users.studentName||"游客".concat(this.users.studentId||"")]),t("span",{class:c},[this.users.createTime])])}}))}}}))}();
+!function(){var e=document.createElement("style");e.innerHTML="._user-detail_1e2p6_1{display:flex;align-items:center;justify-content:space-between;font-size:.42667rem;line-height:.58667rem;color:#1a1a1a}._user-detail_1e2p6_1 ._user-names_1e2p6_9{display:flex;align-items:center}._user-detail_1e2p6_1 ._user-logo_1e2p6_13{width:1.06667rem;height:1.06667rem;border-radius:50%;overflow:hidden;margin-right:.21333rem}._user-detail_1e2p6_1 ._user-time_1e2p6_20{font-size:.37333rem;color:#999;line-height:.53333rem}\n",document.head.appendChild(e),System.register(["./index-legacy.e3dcb6a6.js","./index-legacy.c12a6031.js","./icon_student-legacy.49eef9e9.js"],(function(e){"use strict";var s,t,r,i;return{setters:[function(e){s=e.d,t=e.j},function(e){r=e.I},function(e){i=e.s}],execute:function(){var n="_user-detail_1e2p6_1",a="_user-names_1e2p6_9",u="_user-logo_1e2p6_13",c="_user-time_1e2p6_20";e("U",s({name:"UserDetail",props:{users:{type:Object,default:{}}},render:function(){return t("div",{class:n},[t("div",{class:a},[t(r,{class:u,src:this.users.avatar||i,fit:"cover"},null),this.users.studentName||"游客".concat(this.users.studentId||"")]),t("span",{class:c},[this.users.createTime])])}}))}}}))}();

dist/assets/index.4145e62c.css

@@ -1 +0,0 @@
-._bgImg_4odi7_1{position:fixed;top:0;left:0;width:100%;height:5.70667rem;z-index:-1}._sticky_4odi7_9 .van-sticky{background:url(./bg-image.e89554da.png) no-repeat top center;background-size:100% 5.70667rem}

dist/assets/index.9be425eb.js

@@ -1 +0,0 @@
-import{d as o,j as t}from"./index.95ce382c.js";import{T as i}from"./index.18c06bd7.js";import{C as a}from"./index.b8264ae6.js";import{b as e}from"./bg-image.e9966434.js";import"./index.f79257db.js";const r="_bgImg_4odi7_1",m="_sticky_4odi7_9";var s={bgImg:r,sticky:m},p=o({name:"ranking-list",setup(){return()=>t("div",{class:s.activationCode},[t("div",{class:s.sticky},[t(i,{position:"top"},{default:()=>[t(a,{background:"transparent",isFixed:!1,border:!1,title:" ",color:"#131415"},null)]}),t("img",{class:s.bgImg,src:e},null)])])}});export{p as default};

dist/assets/index.a2a05762.js

@@ -1 +0,0 @@
-import{d as l,w as n,j as t,z as o,C as r,Z as c}from"./index.95ce382c.js";import{C as m}from"./index.9cf7965d.js";import{I as u}from"./index.c0edf44a.js";import{L as d}from"./index.2df570f4.js";import{i as h}from"./icon_student.bbb32387.js";import{C as p}from"./index.b8264ae6.js";import"./use-tab-status.f0525ffd.js";const f="_piNameSubject_6kbkl_1",g="_subject_6kbkl_6",b="_myFans_6kbkl_18",_="_userName_6kbkl_22",N="_userImg_6kbkl_28";var a={piNameSubject:f,subject:g,myFans:b,userName:_,userImg:N};function S(s){return typeof s=="function"||Object.prototype.toString.call(s)==="[object Object]"&&!c(s)}var C=l({name:"my-fans",data(){return{list:[],dataShow:!0,loading:!1,finished:!1,params:{page:1,rows:20}}},mounted(){},methods:{async getList(){try{const s=this.params,e=await n.post("/api-teacher/teacher/queryMyFans",{data:{...s}});this.loading=!1;const i=e.data||{};if(this.list.length>0&&i.pageNo===1)return;this.list=this.list.concat(i.rows||[]),this.finished=i.pageNo>=i.totalPage,this.params.page=i.pageNo+1,this.dataShow=this.list.length>0}catch{this.dataShow=!1,this.finished=!0}}},render(){let s;return t("div",null,[t(p,null,null),this.dataShow?t(d,{loading:this.loading,"onUpdate:loading":e=>this.loading=e,finished:this.finished,finishedText:" ",class:[a.liveList,"mb12"],onLoad:this.getList},S(s=this.list.map(e=>t(m,{class:a.myFans,titleStyle:{paddingLeft:"8px"}},{icon:()=>t(u,{class:a.userImg,src:e.avatar||h,fit:"cover"},null),title:()=>t("div",{class:a.userInfo},[t("div",{class:a.userName},[o(" "),e.userName,o(" ")]),t("div",{class:a.piNameSubject},[t("span",{class:a.subject},[e.subjectName])])])})))?s:{default:()=>[s]}):t(r,{btnStatus:!1,classImgSize:"SMALL",tips:"\u6682\u65E0\u7C89\u4E1D"},null)])}});export{C as default};

dist/assets/index.b3f8977b.js

@@ -0,0 +1 @@
+import{d as l,w as n,j as s,z as o,C as r,Z as c}from"./index.95ce382c.js";import{C as m}from"./index.9cf7965d.js";import{I as u}from"./index.c0edf44a.js";import{L as d}from"./index.2df570f4.js";import{s as h}from"./icon_student.c3c58354.js";import{C as p}from"./index.b8264ae6.js";import"./use-tab-status.f0525ffd.js";const f="_piNameSubject_6kbkl_1",g="_subject_6kbkl_6",b="_myFans_6kbkl_18",_="_userName_6kbkl_22",N="_userImg_6kbkl_28";var a={piNameSubject:f,subject:g,myFans:b,userName:_,userImg:N};function S(t){return typeof t=="function"||Object.prototype.toString.call(t)==="[object Object]"&&!c(t)}var C=l({name:"my-fans",data(){return{list:[],dataShow:!0,loading:!1,finished:!1,params:{page:1,rows:20}}},mounted(){},methods:{async getList(){try{const t=this.params,e=await n.post("/api-teacher/teacher/queryMyFans",{data:{...t}});this.loading=!1;const i=e.data||{};if(this.list.length>0&&i.pageNo===1)return;this.list=this.list.concat(i.rows||[]),this.finished=i.pageNo>=i.totalPage,this.params.page=i.pageNo+1,this.dataShow=this.list.length>0}catch{this.dataShow=!1,this.finished=!0}}},render(){let t;return s("div",null,[s(p,null,null),this.dataShow?s(d,{loading:this.loading,"onUpdate:loading":e=>this.loading=e,finished:this.finished,finishedText:" ",class:[a.liveList,"mb12"],onLoad:this.getList},S(t=this.list.map(e=>s(m,{class:a.myFans,titleStyle:{paddingLeft:"8px"}},{icon:()=>s(u,{class:a.userImg,src:e.avatar||h,fit:"cover"},null),title:()=>s("div",{class:a.userInfo},[s("div",{class:a.userName},[o(" "),e.userName,o(" ")]),s("div",{class:a.piNameSubject},[s("span",{class:a.subject},[e.subjectName])])])})))?t:{default:()=>[t]}):s(r,{btnStatus:!1,classImgSize:"SMALL",tips:"\u6682\u65E0\u7C89\u4E1D"},null)])}});export{C as default};

dist/assets/index.dea9c3fc.js → dist/assets/index.d107946a.js

@@ -1 +1 @@
-import{d as s,j as t}from"./index.95ce382c.js";import{C as n}from"./index.9cf7965d.js";import{i as u}from"./icon_student.bbb32387.js";const d="_student_z69gd_1",a="_studentImg_z69gd_6",i="_subject_z69gd_14",o="_studentName_z69gd_23";var e={student:d,studentImg:a,subject:i,studentName:o},p=s({name:"student",props:{item:{type:Object,default:{}},onClick:{type:Function,default:m=>{}},border:{type:Boolean,default:!0}},render(){return t(n,{center:!0,class:e.student,border:this.border,onClick:()=>{this.onClick(this.item)}},{default:()=>[this.$slots.default&&this.$slots.default()],icon:()=>t("img",{src:this.item.avatar||u,class:e.studentImg},null),title:()=>t("div",{class:e.info},[t("p",{class:e.studentName},[this.item.userName]),t("p",null,[this.item.subjectName&&t("span",{class:e.subject},[this.item.subjectName])])])})}});export{p as S};
+import{d as s,j as t}from"./index.95ce382c.js";import{C as n}from"./index.9cf7965d.js";import{s as u}from"./icon_student.c3c58354.js";const d="_student_z69gd_1",a="_studentImg_z69gd_6",o="_subject_z69gd_14",i="_studentName_z69gd_23";var e={student:d,studentImg:a,subject:o,studentName:i},p=s({name:"student",props:{item:{type:Object,default:{}},onClick:{type:Function,default:m=>{}},border:{type:Boolean,default:!0}},render(){return t(n,{center:!0,class:e.student,border:this.border,onClick:()=>{this.onClick(this.item)}},{default:()=>[this.$slots.default&&this.$slots.default()],icon:()=>t("img",{src:this.item.avatar||u,class:e.studentImg},null),title:()=>t("div",{class:e.info},[t("p",{class:e.studentName},[this.item.userName]),t("p",null,[this.item.subjectName&&t("span",{class:e.subject},[this.item.subjectName])])])})}});export{p as S};

dist/assets/index.c1534f52.js → dist/assets/index.d78f83ca.js

@@ -1 +1 @@
-import{d as r,j as e}from"./index.95ce382c.js";import{I as t}from"./index.c0edf44a.js";import{i as a}from"./icon_student.bbb32387.js";var s={"user-detail":"_user-detail_1e2p6_1","user-names":"_user-names_1e2p6_9","user-logo":"_user-logo_1e2p6_13","user-time":"_user-time_1e2p6_20"},m=r({name:"UserDetail",props:{users:{type:Object,default:{}}},render(){return e("div",{class:s["user-detail"]},[e("div",{class:s["user-names"]},[e(t,{class:s["user-logo"],src:this.users.avatar||a,fit:"cover"},null),this.users.studentName||`\u6E38\u5BA2${this.users.studentId||""}`]),e("span",{class:s["user-time"]},[this.users.createTime])])}});export{m as U};
+import{d as r,j as e}from"./index.95ce382c.js";import{I as t}from"./index.c0edf44a.js";import{s as a}from"./icon_student.c3c58354.js";var s={"user-detail":"_user-detail_1e2p6_1","user-names":"_user-names_1e2p6_9","user-logo":"_user-logo_1e2p6_13","user-time":"_user-time_1e2p6_20"},m=r({name:"UserDetail",props:{users:{type:Object,default:{}}},render(){return e("div",{class:s["user-detail"]},[e("div",{class:s["user-names"]},[e(t,{class:s["user-logo"],src:this.users.avatar||a,fit:"cover"},null),this.users.studentName||`\u6E38\u5BA2${this.users.studentId||""}`]),e("span",{class:s["user-time"]},[this.users.createTime])])}});export{m as U};

dist/assets/index.d5505b6d.js → dist/assets/index.e40d28e0.js

@@ -1 +1 @@
-import{d as o,S as l,j as t,M as i,z as s}from"./index.95ce382c.js";import{C as m}from"./index.b8264ae6.js";import{n as r,e as p,c as n}from"./icon_name_active.3e9031ca.js";import{C as c,a as v}from"./index.aeccfd4c.js";import"./index.7648667c.js";import"./index.1257baa6.js";import"./index.fa50f5b2.js";import"./use-refs.ae31104c.js";import"./utils.4d158610.js";import"./index.c0edf44a.js";import"./index.97cb3e52.js";import"./index.848730be.js";import"./index.9cf7965d.js";import"./index.f791e438.js";import"./use-id.72e813a4.js";import"./index.45e31107.js";import"./index.447940cd.js";import"./index.dd4976b7.js";import"./icon_tips.75e86958.js";import"./index.213cd648.js";import"./index.9dbf9f66.js";import"./index.4a8d0759.js";import"./index.2c4f1a3e.js";import"./index.dea9c3fc.js";import"./icon_student.bbb32387.js";import"./checkbox_default.944f238b.js";import"./index.91520c0e.js";import"./index.0e546b7a.js";const u="_classWrap_kvlzi_1",b="_tabs_kvlzi_4",_="_tabItem_kvlzi_11",d="_title_kvlzi_23",I="_tabItemRight_kvlzi_26",A="_tabItemActive_kvlzi_29";var a={classWrap:u,tabs:b,tabItem:_,title:d,tabItemRight:I,tabItemActive:A},Q=o({name:"ClassArrangement",setup(){const e=l(1);return()=>t("div",{class:a.classWrap},[t(m,null,null),t("div",{class:a.tabs},[t("div",{class:[a.tabItem,a.tabItemActive]},[t(i,{name:r,size:38},null),t("span",{class:a.title},[s("\u8BFE\u7A0B\u4FE1\u606F")])]),t("div",{class:[a.tabItem,a.tabItemRight,e.value>1?a.tabItemActive:""]},[t(i,{name:e.value>1?p:n,size:38},null),t("span",{class:a.title},[s("\u8BFE\u7A0B\u5B89\u6392")])])]),t("div",{style:{display:e.value===1?"block":"none"}},[t(c,{onSubmit:k=>{e.value=2}},null)]),t("div",{style:{display:e.value===2?"block":"none"}},[t(v,{onBack:()=>e.value=1,active:e.value},null)])])}});export{Q as default};
+import{d as o,S as l,j as t,M as i,z as s}from"./index.95ce382c.js";import{C as m}from"./index.b8264ae6.js";import{n as r,e as p,c as n}from"./icon_name_active.3e9031ca.js";import{C as c,a as v}from"./index.7f0eb268.js";import"./index.7648667c.js";import"./index.1257baa6.js";import"./index.fa50f5b2.js";import"./use-refs.ae31104c.js";import"./utils.4d158610.js";import"./index.c0edf44a.js";import"./index.97cb3e52.js";import"./index.848730be.js";import"./index.9cf7965d.js";import"./index.f791e438.js";import"./use-id.72e813a4.js";import"./index.45e31107.js";import"./index.447940cd.js";import"./index.dd4976b7.js";import"./icon_tips.75e86958.js";import"./index.213cd648.js";import"./index.9dbf9f66.js";import"./index.4a8d0759.js";import"./index.2c4f1a3e.js";import"./index.d107946a.js";import"./icon_student.c3c58354.js";import"./checkbox_default.944f238b.js";import"./index.91520c0e.js";import"./index.0e546b7a.js";const u="_classWrap_kvlzi_1",b="_tabs_kvlzi_4",_="_tabItem_kvlzi_11",d="_title_kvlzi_23",I="_tabItemRight_kvlzi_26",A="_tabItemActive_kvlzi_29";var a={classWrap:u,tabs:b,tabItem:_,title:d,tabItemRight:I,tabItemActive:A},Q=o({name:"ClassArrangement",setup(){const e=l(1);return()=>t("div",{class:a.classWrap},[t(m,null,null),t("div",{class:a.tabs},[t("div",{class:[a.tabItem,a.tabItemActive]},[t(i,{name:r,size:38},null),t("span",{class:a.title},[s("\u8BFE\u7A0B\u4FE1\u606F")])]),t("div",{class:[a.tabItem,a.tabItemRight,e.value>1?a.tabItemActive:""]},[t(i,{name:e.value>1?p:n,size:38},null),t("span",{class:a.title},[s("\u8BFE\u7A0B\u5B89\u6392")])])]),t("div",{style:{display:e.value===1?"block":"none"}},[t(c,{onSubmit:k=>{e.value=2}},null)]),t("div",{style:{display:e.value===2?"block":"none"}},[t(v,{onBack:()=>e.value=1,active:e.value},null)])])}});export{Q as default};

dist/assets/isBetween-legacy.b66503ae.js

@@ -0,0 +1 @@
+System.register(["./index-legacy.e3dcb6a6.js"],(function(e){"use strict";return{setters:[function(e){e.bb}],execute:function(){var t={exports:{}};e("i",t.exports=function(e,t,i){t.prototype.isBetween=function(e,t,s,r){var n=i(e),f=i(t),o="("===(r=r||"()")[0],c=")"===r[1];return(o?this.isAfter(n,s):!this.isBefore(n,s))&&(c?this.isBefore(f,s):!this.isAfter(f,s))||(o?this.isBefore(n,s):!this.isAfter(n,s))&&(c?this.isAfter(f,s):!this.isBefore(f,s))}})}}}));

dist/assets/isBetween.4aa465bc.js

@@ -0,0 +1 @@
+import{bb as c}from"./index.95ce382c.js";var h={exports:{}};(function(p,x){(function(u,r){p.exports=r()})(c,function(){return function(u,r,s){r.prototype.isBetween=function(B,a,e,o){var t=s(B),i=s(a),n=(o=o||"()")[0]==="(",f=o[1]===")";return(n?this.isAfter(t,e):!this.isBefore(t,e))&&(f?this.isBefore(i,e):!this.isAfter(i,e))||(n?this.isBefore(t,e):!this.isAfter(t,e))&&(f?this.isAfter(i,e):!this.isBefore(i,e))}}})})(h);var A=h.exports;export{A as i};

dist/index.html

@@ -36,10 +36,26 @@
   <meta name="msapplication-tap-highlight" content="no" />
   <title>酷乐秀</title>
   <script src="./flexible.js" charset="UTF-8"></script>
-  <script type="module" crossorigin src="./assets/index.8e69b24d.js"></script>
+  <script>
+    !(function (t) {
+      function e() {
+        var e = this || self;
+        (e.globalThis = e), delete t.prototype._T_;
+      }
+      "object" != typeof globalThis &&
+        (this
+          ? e()
+          : (t.defineProperty(t.prototype, "_T_", {
+            configurable: !0,
+            get: e,
+          }),
+            _T_));
+    })(Object);
+  </script>
+  <script type="module" crossorigin src="./assets/index.2fbbda3d.js"></script>
   <link rel="modulepreload" href="./assets/index.95ce382c.js">
   <link rel="modulepreload" href="./assets/auth.27f1cea0.js">
-  <link rel="modulepreload" href="./assets/routes-common.4d9e4f8a.js">
+  <link rel="modulepreload" href="./assets/routes-common.d5b4267c.js">
   <link rel="stylesheet" href="./assets/index.90dd4d0d.css">
   <link rel="stylesheet" href="./assets/auth.f09b6d78.css">
   <link rel="stylesheet" href="./assets/index.820e7d12.css">
@@ -52,7 +68,7 @@
   <!-- <script type="module" src="/src/teacher/main.ts"></script> -->
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.efb7d450.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.05680d61.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.5636526a.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

dist/teacher.html

@@ -36,9 +36,25 @@
   <meta name="msapplication-tap-highlight" content="no" />
   <title>酷乐秀</title>
   <script src="./flexible.js" charset="UTF-8"></script>
-  <script type="module" crossorigin src="./assets/teacher.858046e7.js"></script>
+  <script>
+    !(function (t) {
+      function e() {
+        var e = this || self;
+        (e.globalThis = e), delete t.prototype._T_;
+      }
+      "object" != typeof globalThis &&
+        (this
+          ? e()
+          : (t.defineProperty(t.prototype, "_T_", {
+            configurable: !0,
+            get: e,
+          }),
+            _T_));
+    })(Object);
+  </script>
+  <script type="module" crossorigin src="./assets/teacher.f7b0a23b.js"></script>
   <link rel="modulepreload" href="./assets/index.95ce382c.js">
-  <link rel="modulepreload" href="./assets/routes-common.4d9e4f8a.js">
+  <link rel="modulepreload" href="./assets/routes-common.d5b4267c.js">
   <link rel="stylesheet" href="./assets/index.90dd4d0d.css">
   <link rel="stylesheet" href="./assets/teacher.ded4b243.css">
   <script type="module">!function(){try{new Function("m","return import(m)")}catch(o){console.warn("vite: loading legacy build because dynamic import is unsupported, syntax error above should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}}();</script>
@@ -49,7 +65,7 @@
   
   <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.efb7d450.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.bb5ec546.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.5b9a2ba3.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

dist/tenant.html

@@ -36,7 +36,23 @@
   <meta name="msapplication-tap-highlight" content="no" />
   <title>酷乐秀</title>
   <script src="./flexible.js" charset="UTF-8"></script>
-  <script type="module" crossorigin src="./assets/tenant.e0bbdc76.js"></script>
+  <script>
+    !(function (t) {
+      function e() {
+        var e = this || self;
+        (e.globalThis = e), delete t.prototype._T_;
+      }
+      "object" != typeof globalThis &&
+        (this
+          ? e()
+          : (t.defineProperty(t.prototype, "_T_", {
+            configurable: !0,
+            get: e,
+          }),
+            _T_));
+    })(Object);
+  </script>
+  <script type="module" crossorigin src="./assets/tenant.d6b1a4da.js"></script>
   <link rel="modulepreload" href="./assets/index.95ce382c.js">
   <link rel="modulepreload" href="./assets/auth.27f1cea0.js">
   <link rel="stylesheet" href="./assets/index.90dd4d0d.css">
@@ -51,7 +67,7 @@
   <!-- <script type="module" src="/src/teacher/main.ts"></script> -->
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.efb7d450.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.645ba345.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.8fce27db.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
-</html>
+</html>

index.html

@@ -36,6 +36,22 @@
   <meta name="msapplication-tap-highlight" content="no" />
   <title>酷乐秀</title>
   <script src="/flexible.js" charset="UTF-8"></script>
+  <script>
+    !(function (t) {
+      function e() {
+        var e = this || self;
+        (e.globalThis = e), delete t.prototype._T_;
+      }
+      "object" != typeof globalThis &&
+        (this
+          ? e()
+          : (t.defineProperty(t.prototype, "_T_", {
+            configurable: !0,
+            get: e,
+          }),
+            _T_));
+    })(Object);
+  </script>
 </head>
 
 <body>

src/tenant/exercise-record/exercis-detail.tsx

@@ -125,12 +125,40 @@ export default defineComponent({
         membershipEndTime: users?.membershipEndTime
       }
     })
+
+    // 初始化周一
+    const formatWeekDays = (time?: any) => {
+      const week = dayjs(time).day()
+      let startTime = ''
+      let endTime = ''
+      if (week === 0) {
+        // 星期天
+        startTime = dayjs(time).subtract(6, 'day').format('YYYY-MM-DD')
+        endTime = dayjs(time).format('YYYY-MM-DD')
+      } else if (week === 1) {
+        // 星期一
+        startTime = dayjs(time).format('YYYY-MM-DD')
+        endTime = dayjs(time).add(6, 'day').format('YYYY-MM-DD')
+      } else {
+        startTime = dayjs(time)
+          .subtract(week - 1, 'day')
+          .format('YYYY-MM-DD')
+        endTime = dayjs(time)
+          .add(7 - week, 'day')
+          .format('YYYY-MM-DD')
+      }
+      return {
+        startTime,
+        endTime
+      }
+    }
+
     const forms = reactive({
-      startTime: dayjs().day(1).format('YYYY-MM-DD'),
-      endTime: dayjs().day(7).format('YYYY-MM-DD'),
+      ...formatWeekDays(),
       page: 1,
       rows: 20
     })
+
     const refreshing = ref(false)
     const loading = ref(false)
     const finished = ref(false)
@@ -400,27 +428,29 @@ export default defineComponent({
                 dayjs(forms.endTime)
               )
             ) {
-              const week = dayjs(item[0]).day()
-              if (week === 0) {
-                // 星期天
-                forms.startTime = dayjs(item[0])
-                  .subtract(6, 'day')
-                  .format('YYYY-MM-DD')
-                forms.endTime = dayjs(item[0]).format('YYYY-MM-DD')
-              } else if (week === 1) {
-                // 星期一
-                forms.startTime = dayjs(item[0]).format('YYYY-MM-DD')
-                forms.endTime = dayjs(item[0])
-                  .add(6, 'day')
-                  .format('YYYY-MM-DD')
-              } else {
-                forms.startTime = dayjs(item[0])
-                  .subtract(week - 1, 'day')
-                  .format('YYYY-MM-DD')
-                forms.endTime = dayjs(item[0])
-                  .add(7 - week, 'day')
-                  .format('YYYY-MM-DD')
-              }
+              const times = formatWeekDays(item[0])
+              forms.startTime = times.startTime
+              forms.endTime = times.endTime
+              // if (week === 0) {
+              //   // 星期天
+              //   forms.startTime = dayjs(item[0])
+              //     .subtract(6, 'day')
+              //     .format('YYYY-MM-DD')
+              //   forms.endTime = dayjs(item[0]).format('YYYY-MM-DD')
+              // } else if (week === 1) {
+              //   // 星期一
+              //   forms.startTime = dayjs(item[0]).format('YYYY-MM-DD')
+              //   forms.endTime = dayjs(item[0])
+              //     .add(6, 'day')
+              //     .format('YYYY-MM-DD')
+              // } else {
+              //   forms.startTime = dayjs(item[0])
+              //     .subtract(week - 1, 'day')
+              //     .format('YYYY-MM-DD')
+              //   forms.endTime = dayjs(item[0])
+              //     .add(7 - week, 'day')
+              //     .format('YYYY-MM-DD')
+              // }
             }
             state.showPopoverTime = false
             refreshing.value = true

src/tenant/member-center/index.module.less

@@ -149,6 +149,7 @@
     padding-left: 26px;
     font-size: 13px;
     color: #742626;
+    position: relative;
 
     &::after {
       content: ' ';

src/tenant/member-center/index.tsx

@@ -280,8 +280,10 @@ export default defineComponent({
                 </span>
                 天
               </div>
+            ) : !this.userInfo.isVip && this.userInfo.membershipEndTime ? (
+              <div>您的会员已过期，续费后会员权益可继续使用</div>
             ) : (
-              <div>亲，您还不是平台会员哦</div>
+              <div>亲，您还不是会员哦~</div>
             )}
           </div>
         </div>
@@ -321,10 +323,7 @@ export default defineComponent({
         </div>
         {this.memberList.length > 0 && (
           <TheSticky position="bottom">
-            <div
-              class={styles.bottom_function}
-              style={{ visibility: 'hidden' }}
-            >
+            <div class={styles.bottom_function}>
               <div class={styles.memberMeal}>
                 <div class={styles.titleMeal}>
                   <span>会员套餐</span>
@@ -370,15 +369,25 @@ export default defineComponent({
               </div>
               <div class={styles.btnGroup}>
                 <Button round block class={styles.btn} onClick={this.onSubmit}>
-                  <span class={styles.unit}>¥</span>
-                  {(this as any).$filters.moneyFormat(
-                    this.calcSalePrice(this.selectMember) || 0
+                  {this.userInfo.isVip ? (
+                    <div>立即续费</div>
+                  ) : !this.userInfo.isVip &&
+                    this.userInfo.membershipEndTime ? (
+                    <div>立即续费</div>
+                  ) : (
+                    <>
+                      <span class={styles.unit}>¥</span>
+                      {(this as any).$filters.moneyFormat(
+                        this.calcSalePrice(this.selectMember) || 0
+                      )}
+                      元立即开通
+                    </>
                   )}
-                  元立即开通
                 </Button>
               </div>
             </div>
-            <div
+
+            {/* <div
               class={styles.bottom_function}
               style={{ position: 'absolute', bottom: 0, left: 0, right: 0 }}
             >
@@ -416,9 +425,6 @@ export default defineComponent({
                         this.selectMember = item
                       }}
                     >
-                      {/* <div class={styles.discountItem}>
-                        {item.discount == 1 && <img src={iconDiscount} />}
-                      </div> */}
                       <p class={styles.title}>{item.title}</p>
                       <p class={styles.price}>
                         <span>￥</span>
@@ -432,22 +438,6 @@ export default defineComponent({
                 </div>
               </div>
               <div class={styles.btnGroup}>
-                {/* <div class={styles.priceSection}>
-                  支付金额：
-                  <div class={styles.price}>
-                    <span class={styles.priceUnit}>￥</span>
-                    <span class={styles.priceNum}>
-                      {(this as any).$filters.moneyFormat(
-                        this.calcSalePrice(this.selectMember) || 0
-                      )}
-                    </span>
-                  </div>
-                  {this.selectMember?.discount == 1 && (
-                    <div class={[styles.discountItem, styles.discountBuy]}>
-                      <img src={iconDiscount} />
-                    </div>
-                  )}
-                </div> */}
                 <Button round block class={styles.btn} onClick={this.onSubmit}>
                   <span class={styles.unit}>¥</span>
                   {(this as any).$filters.moneyFormat(
@@ -456,7 +446,7 @@ export default defineComponent({
                   元立即开通
                 </Button>
               </div>
-            </div>
+            </div> */}
           </TheSticky>
         )}
 

src/tenant/music/music-detail/formatSvgToImg.ts

@@ -2,6 +2,7 @@ import { Canvg, presets } from 'canvg'
 
 // https://gist.githubusercontent.com/n1ru4l/9c7eff52fe084d67ff15ae6b0af5f171/raw/da9fe36d72171d4e36b92aced587b48dc5182792/offscreen-canvas-polyfill.js
 if (!window.OffscreenCanvas) {
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
   window.OffscreenCanvas = class OffscreenCanvas {
     canvas: HTMLCanvasElement
@@ -10,6 +11,7 @@ if (!window.OffscreenCanvas) {
       this.canvas.width = width
       this.canvas.height = height
 
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore
       this.canvas.convertToBlob = () => {
         return new Promise(resolve => {
@@ -17,6 +19,7 @@ if (!window.OffscreenCanvas) {
         })
       }
 
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore
       return this.canvas
     }

src/tenant/music/music-detail/new-index.module.less

@@ -358,6 +358,7 @@
 
   .musicImg {
     width: 100%;
+    min-height: 50vh;
   }
 
   .finch {

src/tenant/music/train-list/index.tsx

@@ -189,8 +189,8 @@ export default defineComponent({
                                 </div>
                               </>
                             )}
-                          {searchObj.value.levels &&
-                            searchObj.value.levels.length > 0 && (
+                          {searchObj.value.levelList &&
+                            searchObj.value.levelList.length > 0 && (
                               <>
                                 <div class={styles.searchTitle}>级别</div>
                                 <div
@@ -200,9 +200,10 @@ export default defineComponent({
                                     styles['organ-radio']
                                   ]}
                                 >
-                                  {searchObj.value.levels.map(
+                                  {searchObj.value.levelList.map(
                                     (subject: any) => {
-                                      const isActive = subject === params.level
+                                      const isActive =
+                                        subject.id === params.level
                                       const type = isActive
                                         ? 'primary'
                                         : 'default'
@@ -213,10 +214,10 @@ export default defineComponent({
                                           type={type}
                                           round
                                           onClick={() => {
-                                            params.level = subject
+                                            params.level = subject.id
                                           }}
                                         >
-                                          {subject}
+                                          {subject.value}
                                         </Tag>
                                       )
                                     }
@@ -224,8 +225,8 @@ export default defineComponent({
                                 </div>
                               </>
                             )}
-                          {searchObj.value.types &&
-                            searchObj.value.types.length > 0 && (
+                          {searchObj.value.typeList &&
+                            searchObj.value.typeList.length > 0 && (
                               <>
                                 <div class={styles.searchTitle}>类型</div>
                                 <div
@@ -235,25 +236,28 @@ export default defineComponent({
                                     styles['organ-radio']
                                   ]}
                                 >
-                                  {searchObj.value.types.map((subject: any) => {
-                                    const isActive = subject === params.type
-                                    const type = isActive
-                                      ? 'primary'
-                                      : 'default'
-                                    return (
-                                      <Tag
-                                        size="large"
-                                        plain={isActive}
-                                        type={type}
-                                        round
-                                        onClick={() => {
-                                          params.type = subject
-                                        }}
-                                      >
-                                        {subject}
-                                      </Tag>
-                                    )
-                                  })}
+                                  {searchObj.value.typeList.map(
+                                    (subject: any) => {
+                                      const isActive =
+                                        subject.id === params.type
+                                      const type = isActive
+                                        ? 'primary'
+                                        : 'default'
+                                      return (
+                                        <Tag
+                                          size="large"
+                                          plain={isActive}
+                                          type={type}
+                                          round
+                                          onClick={() => {
+                                            params.type = subject.id
+                                          }}
+                                        >
+                                          {subject.value}
+                                        </Tag>
+                                      )
+                                    }
+                                  )}
                                 </div>
                               </>
                             )}