提交

dist/assets/index.ace21d36.js → dist/assets/index.b3323bd6.js

@@ -1 +1 @@
-import{C as n}from"./index.378368e6.js";import{d as o,V as l,a as t,u as s,j as a}from"./vendor.555770a3.js";import{n as m,e as r,c as d}from"./icon_name_active.5266b27b.js";import{C as c,a as p}from"./index.ce5e9834.js";import"./index.2f437b76.js";import"./index.4383bd53.js";/* empty css                *//* empty css               *//* empty css               *//* empty css               *//* empty css               *//* empty css               *//* empty css               *//* empty css                *//* empty css                */import"./icon_tips.ad355da4.js";import"./index.a2a781bf.js";import"./index.5981f895.js";/* empty css                *//* empty css               */import"./index.62b32848.js";import"./icon_student.bbb32387.js";import"./checkbox_default.403c201d.js";/* empty css               *//* empty css                */const v="_classWrap_kvlzi_1",b="_tabs_kvlzi_4",u="_tabItem_kvlzi_11",j="_title_kvlzi_23",x="_tabItemRight_kvlzi_26",_="_tabItemActive_kvlzi_29";var e={classWrap:v,tabs:b,tabItem:u,title:j,tabItemRight:x,tabItemActive:_},M=o({name:"ClassArrangement",setup(){const i=l(1);return()=>t("div",{class:e.classWrap},[t(n,null,null),t("div",{class:e.tabs},[t("div",{class:[e.tabItem,e.tabItemActive]},[t(s,{name:m,size:38},null),t("span",{class:e.title},[a("\u8BFE\u7A0B\u4FE1\u606F")])]),t("div",{class:[e.tabItem,e.tabItemRight,i.value>1?e.tabItemActive:""]},[t(s,{name:i.value>1?r:d,size:38},null),t("span",{class:e.title},[a("\u8BFE\u7A0B\u5B89\u6392")])])]),t("div",{style:{display:i.value===1?"block":"none"}},[t(c,{onSubmit:I=>{i.value=2}},null)]),t("div",{style:{display:i.value===2?"block":"none"}},[t(p,{onBack:()=>i.value=1,active:i.value},null)])])}});export{M as default};
+import{C as n}from"./index.378368e6.js";import{d as o,V as l,a as t,u as s,j as a}from"./vendor.555770a3.js";import{n as m,e as r,c as d}from"./icon_name_active.5266b27b.js";import{C as c,a as p}from"./index.28ccd492.js";import"./index.2f437b76.js";import"./index.4383bd53.js";/* empty css                *//* empty css               *//* empty css               *//* empty css               *//* empty css               *//* empty css               *//* empty css               *//* empty css                *//* empty css                */import"./icon_tips.ad355da4.js";import"./index.a2a781bf.js";import"./index.5981f895.js";/* empty css                *//* empty css               */import"./index.62b32848.js";import"./icon_student.bbb32387.js";import"./checkbox_default.403c201d.js";/* empty css               *//* empty css                */const v="_classWrap_kvlzi_1",b="_tabs_kvlzi_4",u="_tabItem_kvlzi_11",j="_title_kvlzi_23",x="_tabItemRight_kvlzi_26",_="_tabItemActive_kvlzi_29";var e={classWrap:v,tabs:b,tabItem:u,title:j,tabItemRight:x,tabItemActive:_},M=o({name:"ClassArrangement",setup(){const i=l(1);return()=>t("div",{class:e.classWrap},[t(n,null,null),t("div",{class:e.tabs},[t("div",{class:[e.tabItem,e.tabItemActive]},[t(s,{name:m,size:38},null),t("span",{class:e.title},[a("\u8BFE\u7A0B\u4FE1\u606F")])]),t("div",{class:[e.tabItem,e.tabItemRight,i.value>1?e.tabItemActive:""]},[t(s,{name:i.value>1?r:d,size:38},null),t("span",{class:e.title},[a("\u8BFE\u7A0B\u5B89\u6392")])])]),t("div",{style:{display:i.value===1?"block":"none"}},[t(c,{onSubmit:I=>{i.value=2}},null)]),t("div",{style:{display:i.value===2?"block":"none"}},[t(p,{onBack:()=>i.value=1,active:i.value},null)])])}});export{M as default};

dist/index.html

@@ -35,12 +35,16 @@
     <meta name="msapplication-tap-highlight" content="no" />
     <title>酷乐秀</title>
     <script src="./flexible.js" charset="UTF-8"></script>
-    <script type="module" crossorigin src="./assets/index.7dfca8f3.js"></script>
+    <script type="module" crossorigin src="./assets/index.80cec199.js"></script>
     <link rel="modulepreload" href="./assets/vendor.555770a3.js">
     <link rel="modulepreload" href="./assets/index.2f437b76.js">
-    <link rel="stylesheet" href="./assets/vendor.0f0cf986.css">
     <link rel="stylesheet" href="./assets/index.8a670858.css">
+<<<<<<< HEAD
     <link rel="stylesheet" href="./assets/teacher.a6c9550a.css">
+=======
+    <link rel="stylesheet" href="./assets/vendor.0f0cf986.css">
+    <link rel="stylesheet" href="./assets/index.5062a520.css">
+>>>>>>> d6be96191c0025a7f8803a645b0b3597a4389d15
     <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>
   </head>
 
@@ -49,7 +53,12 @@
     
     <!-- <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>
+<<<<<<< HEAD
     <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.6a9e2708.js"></script>
     <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.643ec589.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+    <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.ea467d93.js"></script>
+    <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.4b7b5834.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> d6be96191c0025a7f8803a645b0b3597a4389d15
   </body>
 </html>

dist/teacher.html

@@ -35,12 +35,20 @@
     <meta name="msapplication-tap-highlight" content="no" />
     <title>酷乐秀</title>
     <script src="./flexible.js" charset="UTF-8"></script>
+<<<<<<< HEAD
     <script type="module" crossorigin src="./assets/teacher.757ddcbb.js"></script>
+=======
+    <script type="module" crossorigin src="./assets/teacher.f24bceb4.js"></script>
+>>>>>>> d6be96191c0025a7f8803a645b0b3597a4389d15
     <link rel="modulepreload" href="./assets/vendor.555770a3.js">
     <link rel="modulepreload" href="./assets/index.2f437b76.js">
-    <link rel="stylesheet" href="./assets/index.8a670858.css">
     <link rel="stylesheet" href="./assets/vendor.0f0cf986.css">
+<<<<<<< HEAD
     <link rel="stylesheet" href="./assets/teacher.a6c9550a.css">
+=======
+    <link rel="stylesheet" href="./assets/index.8a670858.css">
+    <link rel="stylesheet" href="./assets/index.5062a520.css">
+>>>>>>> d6be96191c0025a7f8803a645b0b3597a4389d15
     <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>
   </head>
 
@@ -48,7 +56,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 id="vite-legacy-polyfill" src="./assets/polyfills-legacy.6a9e2708.js"></script>
     <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.a7559fd9.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+    <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.ea467d93.js"></script>
+    <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.5b123c1a.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> d6be96191c0025a7f8803a645b0b3597a4389d15
   </body>
 </html>

src/student/music/list/item.module.less

@@ -2,6 +2,7 @@
   background-color: var(--music-list-item-background-color);
   margin: 10px 14px;
   padding: 10px;
+  padding-bottom: 0;
   border-radius: 9px;
   .header {
     display: flex;
@@ -52,7 +53,7 @@
   }
   .footer {
     display: flex;
-    padding-top: 8px;
+    // padding-top: 8px;
     align-items: center;
     justify-content: space-between;
     .user {
@@ -65,6 +66,9 @@
         height: 20px;
         margin-right: 8px;
       }
+      > p {
+        margin-right: 8px;
+      }
     }
     .favorite {
       font-size: 16px;

src/student/music/personal/album.tsx

@@ -50,7 +50,7 @@ export default defineComponent({
           ? data.value.rows.map(item => <Item data={item} />)
           : !loading.value && (
               <ColResult
-                tips="暂无收藏曲目"
+                tips="暂无收藏专辑"
                 classImgSize="SMALL"
                 btnStatus={false}
               />

src/student/music/personal/collection.tsx

@@ -76,7 +76,7 @@ export default defineComponent({
             ))
           : !loading.value && (
               <ColResult
-                tips="暂无收藏曲目"
+                tips="暂无收藏单曲"
                 classImgSize="SMALL"
                 btnStatus={false}
               />

src/student/music/personal/personal.tsx

@@ -71,7 +71,7 @@ export default defineComponent({
             ))
           : !loading.value && (
               <ColResult
-                tips="暂无收藏曲目"
+                tips="暂无单曲"
                 classImgSize="SMALL"
                 btnStatus={false}
               />

src/student/music/personal/practice.tsx

@@ -10,11 +10,12 @@ export default defineComponent({
   emits: ['favorite'],
   setup(props, { expose, emit }) {
     const { isLoading, state, execute } = useAsyncState(
-      request.get('/api-student/music/sheet/practice', {
-        params: {
-          rows: 3
-        }
-      }),
+      (args): Promise<any> =>
+        request.get('/api-student/music/sheet/practice', {
+          params: {
+            rows: args?.rows || 3
+          }
+        }),
       null
     )
 
@@ -29,9 +30,12 @@ export default defineComponent({
           {list.length > 0 && <Cell title="最近练习" />}
           {list.map(item => (
             <Item
+              key={item.id}
               data={item}
               onClick={() => musicBuy(item)}
-              onFavorite={() => emit('favorite')}
+              onFavorite={() => {
+                emit('favorite')
+              }}
             />
           ))}
         </>

src/teacher/piano-room/class-arrangement/create-class/index.tsx

@@ -35,7 +35,7 @@ export default defineComponent({
     watch(
       () => props.active,
       val => {
-        console.log(val)
+        // console.log(val)
         if (val === 2) {
           getList()
         }
@@ -212,15 +212,18 @@ export default defineComponent({
     return () => {
       return (
         <div class={styles.createClass}>
-          <Calendar
-            maxDays={classInfo.classNum}
-            list={data.calendarList}
-            prevMonth={(date: Date) => getList(date)}
-            nextMonth={(date: Date) => getList(date)}
-            selectDay={onSelectDay}
-            selectList={data.selectList}
-            isSkipHolidays={classInfo.isSkipHolidays}
-          />
+          {props.active === 2 && (
+            <Calendar
+              maxDays={classInfo.classNum}
+              list={data.calendarList}
+              prevMonth={(date: Date) => getList(date)}
+              nextMonth={(date: Date) => getList(date)}
+              selectDay={onSelectDay}
+              selectList={data.selectList}
+              isSkipHolidays={classInfo.isSkipHolidays}
+            />
+          )}
+
           <Cell
             class={[styles.arrangeCell, 'mb12']}
             v-slots={{