Merge branch 'iteration-20241126'

src/teacher/my-sheetMusic/index.tsx

@@ -42,6 +42,7 @@ export default defineComponent({
             v-model:active={activeTab.value}
             onChange={val => (activeTab.value = val)}
             sticky
+            swipeThreshold={4}
             offsetTop={height.value}
           >
             <Tab title="购买单曲" name="personal">
@@ -59,7 +60,7 @@ export default defineComponent({
                 <AlbumMy />
               </div>
             </Tab>
-            <Tab title="收藏单曲" name="collection">
+            <Tab title="收藏平台单曲" name="collection">
               <div class={styles.container}>
                 <Collection
                   ref={collection}

src/teacher/statistics/exercise-detail/exercise-detail.tsx

@@ -71,6 +71,7 @@ export default defineComponent({
           {
             params: {
               ...params,
+              studentId: this.$route.query.studentId || '',
               startTime: dayjs(this.currentDate).format('YYYY-MM')
             }
           }

src/teacher/statistics/home-statistics/index.tsx

@@ -230,7 +230,7 @@ export default defineComponent({
       const template = {
         MONTH: '本月',
         THREE_MONTH: '近三个月',
-        HALF_YEAR: '近年半',
+        HALF_YEAR: '近半年',
         YEAR: '近一年'
       }
       return template[currentType.value]

src/teacher/statistics/practice-statistics-detail/index.tsx

@@ -325,7 +325,7 @@ export default defineComponent({
               <img src={searchStatus.value ? iconArrow11 : iconArrow1} />
             </div>
             <div class={styles.title}>
-              <span>练习详情</span>
+              <span>总练习时长</span>
             </div>
 
             <div class={styles.leaveTime}>
@@ -402,7 +402,7 @@ export default defineComponent({
 
           <div class={styles.section}>
             <div class={styles.title}>
-              <span>学员练习时长</span>
+              <span>学员练习详情</span>
               <div class={styles.download} onClick={onExport}>
                 <div>导出</div>
                 <img src={iconDownload} />
@@ -540,7 +540,7 @@ export default defineComponent({
             <div class={styles.popupSearchList}>
               <div class={styles.popupSection}>
                 <div class={styles.title}>
-                  <span>学员练习时长</span>
+                  <span>时间</span>
                 </div>
 
                 <div class={styles.timeCount}>

src/views/music/list/index.module.less

@@ -11,6 +11,11 @@
   }
 }
 
+.musicList {
+  background: #fff;
+  min-height: 100vh;
+}
+
 .listContainer {
   padding-top: 2px;
   height: 42px;

src/views/music/list/index.tsx

@@ -344,7 +344,7 @@ export default defineComponent({
     return () => {
       const tagList = ((state.value && state.value.data) as any) || []
       return (
-        <>
+        <div class={onlySearch ? '' : styles.musicList}>
           {!hideSearch && (
             <>
               <TheSticky class={styles.sticky}>
@@ -663,7 +663,7 @@ export default defineComponent({
               </div>
             </div>
           </Popup>
-        </>
+        </div>
       )
     }
   }

src/views/music/personal/collection.tsx

@@ -102,7 +102,7 @@ export default defineComponent({
         ) : (
           !loading.value && (
             <ColResult
-              tips={props.type === 'TENANT' ? '暂无收藏机构单曲' : '暂无收藏单曲'}
+              tips={props.type === 'TENANT' ? '暂无收藏机构单曲' : '暂无收藏平台单曲'}
               classImgSize="SMALL"
               btnStatus={false}
             />