Browse Source

Merge branch 'master' into online

skyblued 2 years ago
parent
commit
4b7f5ddb9b
68 changed files with 59 additions and 1 deletions
  1. 1 0
      dist/assets/_commonjsHelpers-legacy.1fc343af.js
  2. 1 0
      dist/assets/_commonjsHelpers-legacy.9cbdcf1f.js
  3. 0 0
      dist/assets/_commonjsHelpers.5bb79380.js
  4. 1 0
      dist/assets/index-legacy.00b86fb4.js
  5. 1 0
      dist/assets/index-legacy.023f035e.js
  6. 0 0
      dist/assets/index-legacy.0ef86a9f.js
  7. 1 0
      dist/assets/index-legacy.13bf50de.js
  8. 0 0
      dist/assets/index-legacy.1ae5ae0b.js
  9. 1 0
      dist/assets/index-legacy.1cdf2cae.js
  10. 1 0
      dist/assets/index-legacy.29146db3.js
  11. 1 0
      dist/assets/index-legacy.2e953e5b.js
  12. 0 0
      dist/assets/index-legacy.31096f2c.js
  13. 0 0
      dist/assets/index-legacy.3209fa1b.js
  14. 0 0
      dist/assets/index-legacy.3c7b7e36.js
  15. 1 0
      dist/assets/index-legacy.3cdfbb15.js
  16. 1 0
      dist/assets/index-legacy.4d0f86b8.js
  17. 0 0
      dist/assets/index-legacy.548193d2.js
  18. 0 0
      dist/assets/index-legacy.58fa68b6.js
  19. 0 0
      dist/assets/index-legacy.5e41b030.js
  20. 0 0
      dist/assets/index-legacy.8500c728.js
  21. 1 0
      dist/assets/index-legacy.951667e1.js
  22. 0 0
      dist/assets/index-legacy.9ddbb359.js
  23. 1 0
      dist/assets/index-legacy.ace28d43.js
  24. 1 0
      dist/assets/index-legacy.b1ff0963.js
  25. 1 0
      dist/assets/index-legacy.b1ff349b.js
  26. 1 0
      dist/assets/index-legacy.b46325e0.js
  27. 0 0
      dist/assets/index-legacy.c3b0c99a.js
  28. 1 0
      dist/assets/index-legacy.ce6fdaf9.js
  29. 0 0
      dist/assets/index-legacy.d2807961.js
  30. 1 0
      dist/assets/index-legacy.de757ec0.js
  31. 1 0
      dist/assets/index-legacy.e5439e86.js
  32. 1 0
      dist/assets/index-legacy.f4ac2a45.js
  33. 0 0
      dist/assets/index-legacy.f5b39329.js
  34. 0 0
      dist/assets/index-legacy.fec50a18.js
  35. 0 0
      dist/assets/index.022c3c05.js
  36. 0 0
      dist/assets/index.157bd6cc.js
  37. 0 0
      dist/assets/index.18142315.js
  38. 0 0
      dist/assets/index.230bcfd9.js
  39. 1 0
      dist/assets/index.25e32344.js
  40. 0 0
      dist/assets/index.28a2c20c.js
  41. 0 0
      dist/assets/index.2ac65aae.js
  42. 0 0
      dist/assets/index.2d008658.js
  43. 0 0
      dist/assets/index.4705ff66.js
  44. 0 0
      dist/assets/index.4cb05778.js
  45. 1 0
      dist/assets/index.544e45fa.js
  46. 5 0
      dist/assets/index.5b3e4165.js
  47. 0 0
      dist/assets/index.6a296607.js
  48. 1 0
      dist/assets/index.7147fe61.js
  49. 0 0
      dist/assets/index.82d9df13.js
  50. 1 0
      dist/assets/index.87d52339.js
  51. 1 0
      dist/assets/index.97e378e2.js
  52. 5 0
      dist/assets/index.a44cb283.js
  53. 0 0
      dist/assets/index.a63a39cc.js
  54. 4 0
      dist/assets/index.a726a336.js
  55. 1 0
      dist/assets/index.cc210914.js
  56. 0 0
      dist/assets/index.ce3b9611.js
  57. 1 0
      dist/assets/index.ee97a227.js
  58. 0 0
      dist/assets/index.f357c296.js
  59. 1 0
      dist/assets/index.f9919356.js
  60. 4 0
      dist/assets/index.fae99573.js
  61. 0 0
      dist/assets/polyfills-legacy.d1a027a1.js
  62. 0 0
      dist/assets/request-legacy.c5f6a972.js
  63. 1 0
      dist/assets/request.41580fd8.js
  64. 1 0
      dist/assets/request.a37dab06.js
  65. 1 0
      dist/assets/use-tab-status-legacy.e649f170.js
  66. 1 0
      dist/assets/use-tab-status.742d6f01.js
  67. 9 0
      dist/index.html
  68. 1 1
      src/views/music/album/index.tsx

File diff suppressed because it is too large
+ 1 - 0
dist/assets/_commonjsHelpers-legacy.1fc343af.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/_commonjsHelpers-legacy.9cbdcf1f.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/_commonjsHelpers.5bb79380.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/index-legacy.00b86fb4.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/index-legacy.023f035e.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.0ef86a9f.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/index-legacy.13bf50de.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.1ae5ae0b.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/index-legacy.1cdf2cae.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/index-legacy.29146db3.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/index-legacy.2e953e5b.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.31096f2c.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.3209fa1b.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.3c7b7e36.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/index-legacy.3cdfbb15.js


+ 1 - 0
dist/assets/index-legacy.4d0f86b8.js

@@ -0,0 +1 @@
+!function(){var n=document.createElement("style");n.innerHTML="._indexMusic_16io7_1{padding:.26667rem .42667rem 0}\n",document.head.appendChild(n),System.register(["./index-legacy.023f035e.js","./index-legacy.3cdfbb15.js","./index-legacy.ce6fdaf9.js","./index-legacy.58fa68b6.js","./index-legacy.3209fa1b.js","./_commonjsHelpers-legacy.1fc343af.js","./request-legacy.c5f6a972.js","./index-legacy.fec50a18.js","./index-legacy.1ae5ae0b.js","./index-legacy.d2807961.js","./utils-legacy.2e55ffa8.js"],(function(n){"use strict";var e,c,i,t,u;return{setters:[function(n){e=n.B},function(n){c=n.H},function(n){i=n.H},function(n){t=n.d,u=n.c},function(){},function(){},function(){},function(){},function(){},function(){},function(){}],execute:function(){var a="_indexMusic_16io7_1";n("default",t({name:"indexMusic",setup:function(){return function(){return u("div",{style:{paddingBottom:"100px"}},[u("div",{class:a},[u(e,null,null),u(c,null,null)]),u(i,null,null)])}}}))}}}))}();

File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.548193d2.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.58fa68b6.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.5e41b030.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.8500c728.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/index-legacy.951667e1.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.9ddbb359.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/index-legacy.ace28d43.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/index-legacy.b1ff0963.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/index-legacy.b1ff349b.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/index-legacy.b46325e0.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.c3b0c99a.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/index-legacy.ce6fdaf9.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.d2807961.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/index-legacy.de757ec0.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/index-legacy.e5439e86.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/index-legacy.f4ac2a45.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.f5b39329.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-legacy.fec50a18.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.022c3c05.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.157bd6cc.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.18142315.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.230bcfd9.js


+ 1 - 0
dist/assets/index.25e32344.js

@@ -0,0 +1 @@
+import{d as w,r as h,P as L,w as v,a1 as C,o as E,K as R,c as r,J as B,g as T}from"./index.ce3b9611.js";import{c as N,b as _,m as y,t as F,f as H,i as I,L as J,w as K}from"./_commonjsHelpers.5bb79380.js";import{u as M}from"./use-tab-status.742d6f01.js";const[U,o,V]=N("list"),j={error:Boolean,offset:_(300),loading:Boolean,finished:Boolean,errorText:String,direction:y("down"),loadingText:String,finishedText:String,immediateCheck:F};var q=w({name:U,props:j,emits:["load","update:error","update:loading"],setup(e,{emit:c,slots:a}){const d=h(!1),f=h(),g=h(),s=M(),m=L(f),n=()=>{B(()=>{if(d.value||e.finished||e.error||(s==null?void 0:s.value)===!1)return;const{offset:t,direction:l}=e,i=T(m);if(!i.height||I(f))return;let u=!1;const x=T(g);l==="up"?u=i.top-x.top<=t:u=x.bottom-i.bottom<=t,u&&(d.value=!0,c("update:loading",!0),c("load"))})},b=()=>{if(e.finished){const t=a.finished?a.finished():e.finishedText;if(t)return r("div",{class:o("finished-text")},[t])}},P=()=>{c("update:error",!1),n()},k=()=>{if(e.error){const t=a.error?a.error():e.errorText;if(t)return r("div",{role:"button",class:o("error-text"),tabindex:0,onClick:P},[t])}},S=()=>{if(d.value&&!e.finished)return r("div",{class:o("loading")},[a.loading?a.loading():r(J,{class:o("loading-icon")},{default:()=>[e.loadingText||V("loading")]})])};return v(()=>[e.loading,e.finished,e.error],n),s&&v(s,t=>{t&&n()}),C(()=>{d.value=e.loading}),E(()=>{e.immediateCheck&&n()}),H({check:n}),R("scroll",n,{target:m}),()=>{var t;const l=(t=a.default)==null?void 0:t.call(a),i=r("div",{ref:g,class:o("placeholder")},null);return r("div",{ref:f,role:"feed",class:o(),"aria-busy":d.value},[e.direction==="down"?l:i,S(),b(),k(),e.direction==="up"?l:i])}}});const G=K(q);export{G as L};

File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.28a2c20c.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.2ac65aae.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.2d008658.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.4705ff66.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.4cb05778.js


+ 1 - 0
dist/assets/index.544e45fa.js

@@ -0,0 +1 @@
+import{T as s}from"./index.6a296607.js";import{d as n,r as u,w as p,c as t,u as c,a as d}from"./index.ce3b9611.js";import"./_commonjsHelpers.5bb79380.js";import{T as f,a}from"./index.18142315.js";import"./index.2d008658.js";import{T as v}from"./index.4705ff66.js";import y from"./index.82d9df13.js";import w from"./index.87d52339.js";import _ from"./index.97e378e2.js";import h from"./index.7147fe61.js";import"./logo-1.1c5bc018.js";import"./index.f357c296.js";import"./utils.e748d7c8.js";import"./use-tab-status.742d6f01.js";import"./icon-search.f54aed7d.js";import"./index.f9919356.js";import"./index.4cb05778.js";import"./index.a63a39cc.js";import"./request.41580fd8.js";import"./index.ee97a227.js";import"./index.5b3e4165.js";import"./index.a44cb283.js";import"./index.28a2c20c.js";import"./index.25e32344.js";const b="_layout_10u7w_1",T="_sticky_10u7w_1",k="_tabs_10u7w_6",l={layout:b,sticky:T,tabs:k},Q=n({name:"indexApp",setup(){const o=c(),i=d(),r=u(o.name);return p(o,()=>[r.value=o.name]),console.log(o.name),()=>t("div",{class:l.layout},[t("div",{class:l.sticky},[t(v,null,null)]),t(f,{class:l.tabs,active:r.value,"onUpdate:active":e=>r.value=e,color:"var(--van-primary-color)","line-width":"26px",swipeable:!0,animated:!0,sticky:!0,"offset-top":"1.46667rem",onChange:e=>{const m=e==="home"?"/":"/"+e;i.replace({path:m})}},{default:()=>[t(a,{title:"\u9996\u9875",name:"home"},{default:()=>[t(w,null,null)]}),t(a,{title:"\u8C31\u5E93",name:"music"},{default:()=>[t(_,null,null)]}),t(a,{title:"\u89C6\u9891",name:"video"},{default:()=>[t(h,null,null)]}),t(a,{title:"\u4E0B\u8F7D",name:"down"},{default:()=>[t(y,null,null)]})]}),t(s,null,null)])}});export{Q as default};

+ 5 - 0
dist/assets/index.5b3e4165.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.fae99573.js
+import{d as n,r as s,o as i,c as r,_ as c}from"./index.40c79699.js";import{a as p,S as l}from"./index.cbd7ab60.js";import{r as u}from"./request.a37dab06.js";import{T as m}from"./index.62d4df56.js";const f="_swiper_5ixx8_1",b={swiper:f};function d(t){return typeof t=="function"||Object.prototype.toString.call(t)==="[object Object]"&&!c(t)}const S=n({name:"banner",setup(){const t=s([]),a=async()=>{try{const{data:e}=await u.get("/api-website/open/banner/list");e&&Array.isArray(e)&&(t.value=e)}catch{}};return i(()=>{a()}),()=>{let e;return r(l,{class:b.swiper,autoplay:3e3},d(e=t.value.map(o=>r(p,null,{default:()=>[r(m,{src:o.coverImage,objectFit:"cover"},null)]})))?e:{default:()=>[e]})}}});export{S as B};
+========
+import{d as n,r as s,o as i,c as r,_ as c}from"./index.ce3b9611.js";import{a as p,S as l}from"./index.2d008658.js";import{r as u}from"./request.41580fd8.js";import{T as m}from"./index.a63a39cc.js";const f="_swiper_5ixx8_1",b={swiper:f};function d(t){return typeof t=="function"||Object.prototype.toString.call(t)==="[object Object]"&&!c(t)}const S=n({name:"banner",setup(){const t=s([]),a=async()=>{try{const{data:e}=await u.get("/api-website/open/banner/list");e&&Array.isArray(e)&&(t.value=e)}catch{}};return i(()=>{a()}),()=>{let e;return r(l,{class:b.swiper,autoplay:3e3},d(e=t.value.map(o=>r(p,null,{default:()=>[r(m,{src:o.coverImage,objectFit:"cover"},null)]})))?e:{default:()=>[e]})}}});export{S as B};
+>>>>>>>> master:dist/assets/index.5b3e4165.js

File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.6a296607.js


+ 1 - 0
dist/assets/index.7147fe61.js

@@ -0,0 +1 @@
+import{T as u,r as p}from"./request.41580fd8.js";import{T as c}from"./index.ee97a227.js";import{B as f}from"./index.5b3e4165.js";import{d as m,e as g,r as n,n as v,c as a,a as h,J as V}from"./index.ce3b9611.js";import"./_commonjsHelpers.5bb79380.js";import{L as x}from"./index.25e32344.js";import"./index.a63a39cc.js";import"./index.f9919356.js";import"./index.2d008658.js";import"./use-tab-status.742d6f01.js";const T="_indexVideo_z9lik_1",w={indexVideo:T},I=m({name:"indexVideo",setup(){const d=h(),[t,s]=g(!1),i=n(!1),r=v({albumStatus:"PASS",page:1,rows:10}),o=n([]),l=async()=>{if(!t.value){s(!0);try{const e=await p.post("/api-website/open/videoLessonGroup/page",{data:r});e.data&&Array.isArray(e.data.rows)&&(o.value=[].concat(o.value,e.data.rows),e.data.rows.length?r.page=e.data.pageNo+1:i.value=!0)}catch{}V(()=>{s(!1)})}};return()=>a("div",{class:w.indexVideo},[a(f,null,null),a(u,{title:"\u7CBE\u54C1\u89C6\u9891\u8BFE",isMore:!1},null),a(x,{loading:t.value,finished:i.value,finishedText:"\u6CA1\u6709\u66F4\u591A\u4E86",onLoad:()=>l()},{default:()=>[a(c,{list:o.value,onGoto:e=>d.push({path:"/videoDetail",query:{id:e.teacherId,groupId:e.id}})},null)]})])}});export{I as default};

File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.82d9df13.js


+ 1 - 0
dist/assets/index.87d52339.js

@@ -0,0 +1 @@
+import{H as n}from"./index.4cb05778.js";import{T as i,r as u}from"./request.41580fd8.js";import{T as l}from"./index.ee97a227.js";import{d as r,r as m,o as p,c as e,F as d,a as c}from"./index.ce3b9611.js";import{B as h}from"./index.5b3e4165.js";import"./index.a63a39cc.js";import"./_commonjsHelpers.5bb79380.js";import"./index.f9919356.js";import"./index.2d008658.js";const f="_home_p8f2p_1",v={home:f},y=r({name:"BoutiqueClass",setup(){const t=c(),s=m([]),a=async()=>{try{const o=await u.post("/api-website/open/videoLessonGroup/page",{data:{albumStatus:"PASS",page:1,rows:4}});o.data&&Array.isArray(o.data.rows)&&(s.value=o.data.rows)}catch{}};return p(()=>{a()}),()=>e(d,null,[e(i,{title:"\u7CBE\u54C1\u89C6\u9891\u8BFE",onMore:()=>t.push("/video")},null),e(l,{list:s.value,onGoto:o=>t.push({path:"/videoDetail",query:{id:o.teacherId,groupId:o.id}})},null)])}}),G=r({name:"indexHome",setup(){return()=>e("div",{class:v.home},[e(h,null,null),e(n,null,null),e(y,null,null)])}});export{G as default};

+ 1 - 0
dist/assets/index.97e378e2.js

@@ -0,0 +1 @@
+import{B as o}from"./index.5b3e4165.js";import{H as t}from"./index.4cb05778.js";import{H as n}from"./index.a44cb283.js";import{d as s,c as i}from"./index.ce3b9611.js";import"./index.2d008658.js";import"./_commonjsHelpers.5bb79380.js";import"./request.41580fd8.js";import"./index.a63a39cc.js";import"./index.f9919356.js";import"./index.28a2c20c.js";import"./utils.e748d7c8.js";const r="_indexMusic_16io7_1",e={indexMusic:r},B=s({name:"indexMusic",setup(){return()=>i("div",{style:{paddingBottom:"100px"}},[i("div",{class:e.indexMusic},[i(o,null,null),i(t,null,null)]),i(n,null,null)])}});export{B as default};

+ 5 - 0
dist/assets/index.a44cb283.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.a726a336.js
+import{T as p}from"./index.7fd457c6.js";import{T as m,r as d}from"./request.a37dab06.js";import{d as h,r as a,o as f,c as s,_ as w,a as _}from"./index.40c79699.js";import{S,a as y}from"./index.cbd7ab60.js";import{c as M}from"./utils.e748d7c8.js";const v="_hotMusic_olatt_1",b="_title_olatt_4",I="_swipeItem_olatt_7",i={hotMusic:v,title:b,swipeItem:I};function g(e){return typeof e=="function"||Object.prototype.toString.call(e)==="[object Object]"&&!w(e)}const N=h({name:"HotMusic",setup(){const e=_(),c=a([]),l=async()=>{try{const{data:t}=await d.post("/api-website/open/music/sheet/list",{data:{albumStatus:"PASS",page:1,rows:12,state:1}});t&&Array.isArray(t.rows)&&(c.value=M(t.rows,4))}catch{}};f(()=>{l(),n()});const r=a(312),o=a(!1),n=()=>{o.value=!1;const t=document.body.clientWidth>750?750:document.body.clientWidth;r.value=t-63,o.value=!0};return()=>{let t;return s("div",{class:i.hotMusic},[s(m,{class:i.title,title:"\u70ED\u95E8\u66F2\u76EE",onMore:()=>e.push("/search")},null),o.value&&s(S,{showIndicators:!1,loop:!1,width:r.value},g(t=c.value.map(u=>s(y,{class:i.swipeItem},{default:()=>[s(p,{list:u},null)]})))?t:{default:()=>[t]})])}}});export{N as H};
+========
+import{T as p}from"./index.28a2c20c.js";import{T as m,r as d}from"./request.41580fd8.js";import{d as h,r as a,o as f,c as s,_ as w,a as _}from"./index.ce3b9611.js";import{S,a as y}from"./index.2d008658.js";import{c as M}from"./utils.e748d7c8.js";const v="_hotMusic_olatt_1",b="_title_olatt_4",I="_swipeItem_olatt_7",i={hotMusic:v,title:b,swipeItem:I};function g(e){return typeof e=="function"||Object.prototype.toString.call(e)==="[object Object]"&&!w(e)}const N=h({name:"HotMusic",setup(){const e=_(),c=a([]),l=async()=>{try{const{data:t}=await d.post("/api-website/open/music/sheet/list",{data:{albumStatus:"PASS",page:1,rows:12,state:1}});t&&Array.isArray(t.rows)&&(c.value=M(t.rows,4))}catch{}};f(()=>{l(),n()});const r=a(312),o=a(!1),n=()=>{o.value=!1;const t=document.body.clientWidth>750?750:document.body.clientWidth;r.value=t-63,o.value=!0};return()=>{let t;return s("div",{class:i.hotMusic},[s(m,{class:i.title,title:"\u70ED\u95E8\u66F2\u76EE",onMore:()=>e.push("/search")},null),o.value&&s(S,{showIndicators:!1,loop:!1,width:r.value},g(t=c.value.map(u=>s(y,{class:i.swipeItem},{default:()=>[s(p,{list:u},null)]})))?t:{default:()=>[t]})])}}});export{N as H};
+>>>>>>>> master:dist/assets/index.a44cb283.js

File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.a63a39cc.js


+ 4 - 0
dist/assets/index.a726a336.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.a726a336.js
 import{T as p}from"./index.7fd457c6.js";import{T as m,r as d}from"./request.a37dab06.js";import{d as h,r as a,o as f,c as s,_ as w,a as _}from"./index.40c79699.js";import{S,a as y}from"./index.cbd7ab60.js";import{c as M}from"./utils.e748d7c8.js";const v="_hotMusic_olatt_1",b="_title_olatt_4",I="_swipeItem_olatt_7",i={hotMusic:v,title:b,swipeItem:I};function g(e){return typeof e=="function"||Object.prototype.toString.call(e)==="[object Object]"&&!w(e)}const N=h({name:"HotMusic",setup(){const e=_(),c=a([]),l=async()=>{try{const{data:t}=await d.post("/api-website/open/music/sheet/list",{data:{albumStatus:"PASS",page:1,rows:12,state:1}});t&&Array.isArray(t.rows)&&(c.value=M(t.rows,4))}catch{}};f(()=>{l(),n()});const r=a(312),o=a(!1),n=()=>{o.value=!1;const t=document.body.clientWidth>750?750:document.body.clientWidth;r.value=t-63,o.value=!0};return()=>{let t;return s("div",{class:i.hotMusic},[s(m,{class:i.title,title:"\u70ED\u95E8\u66F2\u76EE",onMore:()=>e.push("/search")},null),o.value&&s(S,{showIndicators:!1,loop:!1,width:r.value},g(t=c.value.map(u=>s(y,{class:i.swipeItem},{default:()=>[s(p,{list:u},null)]})))?t:{default:()=>[t]})])}}});export{N as H};
+========
+import{T as p}from"./index.28a2c20c.js";import{T as m,r as d}from"./request.41580fd8.js";import{d as h,r as a,o as f,c as s,_ as w,a as _}from"./index.ce3b9611.js";import{S,a as y}from"./index.2d008658.js";import{c as M}from"./utils.e748d7c8.js";const v="_hotMusic_olatt_1",b="_title_olatt_4",I="_swipeItem_olatt_7",i={hotMusic:v,title:b,swipeItem:I};function g(e){return typeof e=="function"||Object.prototype.toString.call(e)==="[object Object]"&&!w(e)}const N=h({name:"HotMusic",setup(){const e=_(),c=a([]),l=async()=>{try{const{data:t}=await d.post("/api-website/open/music/sheet/list",{data:{albumStatus:"PASS",page:1,rows:12,state:1}});t&&Array.isArray(t.rows)&&(c.value=M(t.rows,4))}catch{}};f(()=>{l(),n()});const r=a(312),o=a(!1),n=()=>{o.value=!1;const t=document.body.clientWidth>750?750:document.body.clientWidth;r.value=t-63,o.value=!0};return()=>{let t;return s("div",{class:i.hotMusic},[s(m,{class:i.title,title:"\u70ED\u95E8\u66F2\u76EE",onMore:()=>e.push("/search")},null),o.value&&s(S,{showIndicators:!1,loop:!1,width:r.value},g(t=c.value.map(u=>s(y,{class:i.swipeItem},{default:()=>[s(p,{list:u},null)]})))?t:{default:()=>[t]})])}}});export{N as H};
+>>>>>>>> master:dist/assets/index.a44cb283.js

File diff suppressed because it is too large
+ 1 - 0
dist/assets/index.cc210914.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.ce3b9611.js


+ 1 - 0
dist/assets/index.ee97a227.js

@@ -0,0 +1 @@
+import{d as m,c as s,b as l,_ as r}from"./index.ce3b9611.js";import{G as d,a as u}from"./index.a63a39cc.js";import{L as n}from"./_commonjsHelpers.5bb79380.js";import{I as p}from"./index.f9919356.js";const _="_theMusicGrid_pbxg4_1",g="_item_pbxg4_12",b="_title_pbxg4_19",f="_des_pbxg4_28",x="_imgWrap_pbxg4_35",N="_model_pbxg4_39",h="_classNum_pbxg4_53",v="_num_pbxg4_56",G="_itemContent_pbxg4_59",t={theMusicGrid:_,item:g,title:b,des:f,imgWrap:x,model:N,classNum:h,num:v,itemContent:G};function C(o){return typeof o=="function"||Object.prototype.toString.call(o)==="[object Object]"&&!r(o)}const M=m({name:"TheVideoGrid",props:{list:{type:Array,default:()=>[]}},emits:["goto"],setup(o,{emit:a}){const c={loading:()=>s(n,{size:20},null),error:()=>s(n,{size:20},null)};return()=>{let i;return s("div",{class:t.theMusicGrid},[s(d,{border:!1,columnNum:2},C(i=o.list.map(e=>s(u,null,{default:()=>[s("div",{class:t.item,onClick:()=>a("goto",e)},[s("div",{class:t.imgWrap},[s(p,{width:"100%",height:"100%",src:e.lessonCoverUrl},c),s("div",{class:t.model},[s("span",{class:t.classNum},[e.lessonCount,l("\u8BFE\u65F6")]),s("div",{class:t.num},[s("span",{class:t.dot},null),e.countStudent,l("\u4EBA\u5728\u5B66")])])]),s("div",{class:t.itemContent},[s("div",{class:t.title},[e.lessonName,l(" "),e.lessonDesc]),s("div",{class:t.des},[s("span",null,[e.username]),s("span",null,[e.lessonSubjectName])])])])]})))?i:{default:()=>[i]})])}}});export{M as T};

File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.f357c296.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/index.f9919356.js


+ 4 - 0
dist/assets/index.fae99573.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.fae99573.js
 import{d as n,r as s,o as i,c as r,_ as c}from"./index.40c79699.js";import{a as p,S as l}from"./index.cbd7ab60.js";import{r as u}from"./request.a37dab06.js";import{T as m}from"./index.62d4df56.js";const f="_swiper_5ixx8_1",b={swiper:f};function d(t){return typeof t=="function"||Object.prototype.toString.call(t)==="[object Object]"&&!c(t)}const S=n({name:"banner",setup(){const t=s([]),a=async()=>{try{const{data:e}=await u.get("/api-website/open/banner/list");e&&Array.isArray(e)&&(t.value=e)}catch{}};return i(()=>{a()}),()=>{let e;return r(l,{class:b.swiper,autoplay:3e3},d(e=t.value.map(o=>r(p,null,{default:()=>[r(m,{src:o.coverImage,objectFit:"cover"},null)]})))?e:{default:()=>[e]})}}});export{S as B};
+========
+import{d as n,r as s,o as i,c as r,_ as c}from"./index.ce3b9611.js";import{a as p,S as l}from"./index.2d008658.js";import{r as u}from"./request.41580fd8.js";import{T as m}from"./index.a63a39cc.js";const f="_swiper_5ixx8_1",b={swiper:f};function d(t){return typeof t=="function"||Object.prototype.toString.call(t)==="[object Object]"&&!c(t)}const S=n({name:"banner",setup(){const t=s([]),a=async()=>{try{const{data:e}=await u.get("/api-website/open/banner/list");e&&Array.isArray(e)&&(t.value=e)}catch{}};return i(()=>{a()}),()=>{let e;return r(l,{class:b.swiper,autoplay:3e3},d(e=t.value.map(o=>r(p,null,{default:()=>[r(m,{src:o.coverImage,objectFit:"cover"},null)]})))?e:{default:()=>[e]})}}});export{S as B};
+>>>>>>>> master:dist/assets/index.5b3e4165.js

File diff suppressed because it is too large
+ 0 - 0
dist/assets/polyfills-legacy.d1a027a1.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/request-legacy.c5f6a972.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/request.41580fd8.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/request.a37dab06.js


+ 1 - 0
dist/assets/use-tab-status-legacy.e649f170.js

@@ -0,0 +1 @@
+System.register(["./index-legacy.58fa68b6.js"],(function(e){"use strict";var t;return{setters:[function(e){t=e.A}],execute:function(){var n=e("T",Symbol());e("u",(function(){return t(n,null)}))}}}));

+ 1 - 0
dist/assets/use-tab-status.742d6f01.js

@@ -0,0 +1 @@
+import{A as s}from"./index.ce3b9611.js";const t=Symbol(),a=()=>s(t,null);export{t as T,a as u};

+ 9 - 0
dist/index.html

@@ -36,7 +36,11 @@
     <meta name="msapplication-tap-highlight" content="no" />
     <title>酷乐秀</title>
     <!-- <script src="/flexible.js" charset="UTF-8"></script> -->
+<<<<<<< HEAD
     <script type="module" crossorigin src="./assets/index.40c79699.js"></script>
+=======
+    <script type="module" crossorigin src="./assets/index.ce3b9611.js"></script>
+>>>>>>> master
     <link rel="stylesheet" href="./assets/index.171c82f0.css">
     <script type="module">try{import.meta.url;import("_").catch(()=>1);}catch(e){}window.__vite_is_modern_browser=true;</script>
     <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy build because dynamic import or import.meta.url 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>
@@ -45,7 +49,12 @@
     <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>
+<<<<<<< HEAD
     <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy.893e7c75.js"></script>
     <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy.2693cd05.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+    <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy.d1a027a1.js"></script>
+    <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy.58fa68b6.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> master
   </body>
 </html>

+ 1 - 1
src/views/music/album/index.tsx

@@ -35,7 +35,7 @@ export default defineComponent({
             data: {
               id: route.query.id,
               page: 1,
-              rows: 4,
+              relatedNum: 6,
             },
           }
         );

Some files were not shown because too many files changed in this diff