Merge branch 'master' of http://git.dayaedu.com/lex/h5-colexiu

dist/index.html

@@ -35,11 +35,11 @@
     <meta name="msapplication-tap-highlight" content="no" />
     <title>酷乐秀</title>
     <script src="./flexible.js" charset="UTF-8"></script>
-    <script type="module" crossorigin src="./assets/index.cfe7013e.js"></script>
+    <script type="module" crossorigin src="./assets/index.7dfca8f3.js"></script>
     <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">
+    <link rel="stylesheet" href="./assets/index.8a670858.css">
     <link rel="stylesheet" href="./assets/index.5062a520.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>
   </head>
@@ -49,7 +49,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.4593c789.js"></script>
-    <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.f7f76563.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+    <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.c577a8fb.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>
   </body>
 </html>

dist/teacher.html

@@ -35,11 +35,11 @@
     <meta name="msapplication-tap-highlight" content="no" />
     <title>酷乐秀</title>
     <script src="./flexible.js" charset="UTF-8"></script>
-    <script type="module" crossorigin src="./assets/teacher.00f94326.js"></script>
+    <script type="module" crossorigin src="./assets/teacher.36dc8e0f.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">
+    <link rel="stylesheet" href="./assets/vendor.0f0cf986.css">
     <link rel="stylesheet" href="./assets/index.5062a520.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>
   </head>
@@ -48,7 +48,7 @@
     <div id="app"></div>
     
     <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
-    <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.4593c789.js"></script>
-    <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.a8bedeb5.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+    <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.c577a8fb.js"></script>
+    <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.e59307f7.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
   </body>
 </html>

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

@@ -139,7 +139,9 @@
       line-height: 16px;
     }
   }
-
+  .system-list::-webkit-scrollbar {
+    display: none; /* Chrome Safari */
+  }
   .system-list {
     width: 100%;
     overflow-x: auto;

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/model/student-info/student-confirm.tsx

@@ -39,14 +39,20 @@ export default defineComponent({
     },
     calcTimer() {
       const { addStudents, removeStudents } = this.studentObject
-      const { singleCourseTime } = this.courseInfo
+      const { singleCourseTime, studentCount } = this.courseInfo
       const suffix: number = addStudents.length - removeStudents.length
-      console.log(suffix, singleCourseTime)
+      console.log(suffix, singleCourseTime, this.courseInfo)
       const type = suffix >= 0 ? 'add' : 'remove'
       // n * (n -1) * 分钟数 * 课次数
+      // 总分钟数
+      const allMinutes = (studentCount + 1) * studentCount * singleCourseTime
+      //
+      const reTime = Math.abs(
+        (Math.abs(suffix) + 1) * suffix * singleCourseTime
+      )
       return {
         type,
-        mins: Math.abs((Math.abs(suffix) + 1) * suffix * singleCourseTime)
+        mins: Math.abs(allMinutes - reTime)
       }
     }
   },