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

package.json

@@ -54,7 +54,8 @@
     "vue-echarts": "^6.2.3",
     "vue-router": "^4.0.12",
     "vue3-lottie": "^2.3.0",
-    "vuex": "^4.0.2"
+    "vuex": "^4.0.2",
+    "yet-another-abortcontroller-polyfill": "^0.0.4"
   },
   "devDependencies": {
     "@babel/core": "^7.16.5",

src/components/col-result/index.module.less

@@ -29,8 +29,12 @@
   .SMALL {
     :global {
       .van-empty__image {
-        width: 162px;
-        height: 143px;
+        width: 220px;
+        height: 195px;
+      }
+      .van-empty__description {
+        margin-top: -15px;
+        padding: 0 30px;
       }
     }
   }

src/components/col-search/index.module.less

@@ -1,7 +1,7 @@
 :global {
   .van-search {
-    padding-left: 14px;
-    padding-right: 14px;
+    padding-left: 13px;
+    padding-right: 13px;
 
     input {
       -webkit-user-select: text !important;
@@ -112,6 +112,7 @@
     height: 28px;
     padding: 0;
     font-size: 14px;
+    font-weight: 500;
     --van-button-mini-height: 28px;
     --van-font-size-xs: 14px;
     line-height: 1;

src/helpers/request.ts

@@ -4,6 +4,7 @@ import { browser, openLoading, closeLoading } from '@/helpers/utils'
 import { setLogout, setLoginError } from '@/state'
 import { postMessage } from './native-message'
 import { Toast } from 'vant'
+import 'yet-another-abortcontroller-polyfill'
 
 export interface SearchInitParams {
   rows?: string | number

src/router/routes-student.ts

@@ -93,7 +93,7 @@ export default [
         name: 'memberRecord',
         component: () => import('@/student/member-center/member-record'),
         meta: {
-          title: '训练统计'
+          title: '练习统计'
         }
       },
       {

src/router/routes-tenant.ts

@@ -274,7 +274,7 @@ export default [
         name: 'memberRecord',
         component: () => import('@/tenant/exercise-record/exercis-detail'),
         meta: {
-          title: '训练统计'
+          title: '练习统计'
         }
       },
       {

src/tenant/exercise-record/exercis-detail.module.less

@@ -1,19 +1,31 @@
 .exercisContainer {
   :global {
-
     .van-calendar__day--end,
     .van-calendar__day--start,
     .van-calendar__day--start-end,
     .van-calendar__day--multiple-middle,
     .van-calendar__day--multiple-selected {
-      background: #FF5074;
+      background: #ff5074;
     }
 
     .van-overlay,
     .van-popup {
       z-index: 99999999 !important;
+      .van-calendar__header-title,
+      .van-calendar__header-subtitle {
+        color: #131415;
+      }
+      .van-calendar__weekday {
+        color: #333;
+      }
+      .van-calendar__day--middle,
+      .van-calendar__day--end {
+        font-weight: 500;
+      }
+      .van-popup__close-icon {
+        color: rgba(0, 0, 0, 0.4);
+      }
     }
-
   }
 
   .bgImg {
@@ -41,7 +53,6 @@
     }
   }
 
-
   .level {
     margin-top: -4px;
     width: 44px;
@@ -104,14 +115,13 @@
   .subjectTag {
     font-size: 12px;
     font-weight: 500;
-    color: #FE2451;
-    padding: 1px 7px;
+    color: #fe2451;
+    padding: 2px 7px;
     background: rgba(255, 255, 255, 0.3);
     border-radius: 20px;
-    border: 1px solid #FFFFFF;
+    border: 1px solid #ffffff;
     display: inline-flex;
     align-items: center;
-    line-height: 1;
 
     .iconSubject {
       width: 13px;
@@ -195,7 +205,7 @@
         top: 12px;
         width: 1px;
         height: 35px;
-        background-color: #E0E5E8;
+        background-color: #e0e5e8;
       }
     }
 
@@ -234,7 +244,6 @@
       }
     }
   }
-
 }
 
 .trainWeek {
@@ -265,19 +274,19 @@
       margin-right: 20px;
 
       .DataTopRightDot {
-        background-color: #FF7AA7;
+        background-color: #ff7aa7;
       }
     }
 
     &:last-child {
       .DataTopRightDot {
-        background-color: #3583FA;
+        background-color: #3583fa;
       }
     }
 
     &.DataTopRightItemDis {
       .DataTopRightDot {
-        background-color: #e8e8e8 !important
+        background-color: #e8e8e8 !important;
       }
     }
 
@@ -307,8 +316,6 @@
       font-size: 14px;
       color: rgba(19, 20, 21, 0.6);
 
-
-
       .iconArrow {
         display: inline-block;
         width: 9px;
@@ -322,11 +329,11 @@
 }
 
 .fullRefresh {
-  min-height: calc(100vh - var(--header-height) - 275px)
+  min-height: calc(100vh - var(--header-height) - 275px);
 }
 
 .emptyContainer {
   height: calc(100vh - var(--header-height) - 275px);
   display: flex;
   align-items: center;
-}
+}

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

@@ -267,10 +267,10 @@ export default defineComponent({
                 title: () => (
                   <div class={styles.userInfo}>
                     <span class={styles.name}>{userInfo.value.username}</span>
-                    <Image
+                    {/* <Image
                       class={styles.level}
                       src={userInfo.value.isVip ? iconLogoActive : iconLogo}
-                    />
+                    /> */}
                   </div>
                 ),
                 label: () => (

src/tenant/music/component/song/index.module.less

@@ -96,6 +96,7 @@
       }
 
       .tags {
+        margin-right: 6px;
 
         &>span {
           display: inline-block;
@@ -161,7 +162,7 @@
 .collection {
   width: 15px;
   height: 16px;
-  margin-right: 4px;
+  margin-right: 6px;
 }
 
 .musicInfo {

src/tenant/music/component/song/index.tsx

@@ -73,7 +73,7 @@ export default defineComponent({
       return (
         <div class={styles.theSong}>
           {props.list.map((n: any, index: number) => (
-            <div class={styles.item} onClick={() => emit('detail', n)}>
+            <div class={[styles.item,'songItem']} onClick={() => emit('detail', n)}>
               {props.showNumber && <div class={styles.num}>{index + 1}</div>}
               {props.showTitleImg && (
                 <div class={styles.cover}>
@@ -108,14 +108,14 @@ export default defineComponent({
                   )}
 
                   <div class={styles.tags}>
-                    {n.subjectNames &&
-                      n.subjectNames
-                        ?.split(',')
-                        .map((name: any) => <span>{name}</span>)}
-                    {n.musicSubjectName &&
-                      n.musicSubjectName
-                        ?.split(',')
-                        .map((name: any) => <span>{name}</span>)}
+                    {n.subjectNames
+                      ? n.subjectNames
+                          ?.split(',')
+                          .map((name: any) => <span>{name}</span>)
+                      : n.musicSubjectName &&
+                        n.musicSubjectName
+                          ?.split(',')
+                          .map((name: any) => <span>{name}</span>)}
                     {n.musicSheetType === 'CONCERT' && <span>合奏</span>}
                   </div>
 

src/tenant/music/courseList/index.module.less

@@ -1,7 +1,7 @@
 .courseList {
   min-height: 100vh;
   background-image: url('../../images/bg.png');
-  background-size: 100% 214px;
+  background-size: 100% 346px;
   background-repeat: no-repeat;
   box-sizing: border-box;
 }
@@ -17,12 +17,9 @@
     margin-right: 30px;
     border-radius: 2px;
     overflow: hidden;
-    box-shadow: 0px 2px 6px 0px rgba(221, 168, 133, 0.67);
     overflow: hidden;
-    background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFoAAABaCAMAAAAPdrEwAAABOFBMVEUAAAC0tLTT09PU1NTt7e3////T09P////T09P////T09P////X19f////U1NTU1NTT09PT09PU1NTU1NTV1dXT09PU1NTU1NTV1dXZ2dn+/v7R0dH////////KysrIyMjT09O0tLTU1NS0tLTU1NS0tLTT09PT09PT09PU1NTU1NTU1NTT09O2trbU1NTV1dXV1dXW1tbV1dXW1tbV1dXJycm4uLj///+0tLT///+0tLT////p6em0tLT4+Pj///+2trb///+1tbX///+0tLT////T09P5+fn+/v63t7e8vLz8/Pzl5eXW1tbBwcH39/fw8PDs7Ozb29v7+/vg4ODOzs65ubny8vLJycnp6enGxsbFxcW+vr62trb09PTY2NjLy8vCwsLn5+fi4uLS0tLu7u7Q0NDd3d02Mu/gAAAARHRSTlMAnPwvBfv07ODdw5AbGezmyrirl5B4aT0kDZyclTwsIPj48+Ta1tPS0LGhiIaEcGJgV05FNhMS7++8vKyslZRzc1ZWJRSpe/cAAALfSURBVFjD7djXcuIwGAVg1pTQAiT0Ekiy6b1v7whsA6b3EGAJu+//BstaiWNiCYGlXGTG55KBDzH6j2xjMmJET5ZdDivQFavDtTxLXlsCFFlam7HmiUxl49ftApRxYWkHLe3A0lZa2oqlAXUMGk/fHG9vpCnSk/pZNJ18m6aOWELRN1CmtbMI+jjNJH0Evc2GlhD0Bhu6h6DTjPIq6Pqonb8XXoCWmjKSHTCnpccp5ges6bHCZAW2dBc8JcOWLqjoPFu6oqLLr2bVQxX9h/GElBWmKDCmxSKAyXWYt1GE677rLtLGejsLcuOCQMI7lVFlsMjxJJUeW3bP+OSTskBJqcuSFppAFT4vsqMrYDrVAitazMHV8kBJs8WGzsPmNoRCFSj5fcuA7vJKvcQ8UJKrCNT0WH0mdEpASbFOSdfhyClvzagGsSzR0D14LHTSSho1/mkQaw39dB9u2vThCU8KQj1JtFiVt+z5ONSLmnoSaeszuia/+lfzAaGS09STQDum6SH/cOXX5rY9Xz0Rj6Sqy0YmjUzrbp56ah6kIT2AH8Pe4M5TT83jP6ThsnALmq+eiD8tlIt/G8POWU8FVNMNuXc8rnH4epJpOHg1jIivJ5mWcvLg4ZqMryeZhnOLm1hyPfF0C95R9PAcvp4jcSYNL7UDHEWuJ56GO46FyPXE0+/+/7Lhgs+ffU093yPoDwCAEcki1/Mjgv4BQFUkSeR6/jQh8gn0SQy5np9NqFi+CgSDWE9rwmJCJ/X9yxt9iSdisVji2y+TESNGXjiW6LU7FYkkzQ9JRiIp93XUoodyX12cBg/9qyvOHbvXxmUw4Wxe+45zZdV/GDy9uHJbZqPhk7jTjrTI4ezO+EkY8wUBW4Y6tgCSPvNxtDLnOzOhEw2HAvt7Hj2oZ28/EApHyRtpvjwPBY/8B5Ot9O1u2b2eTds6x8nr4tZtmx6vfWvXN9nCA/9RMHR+aZ5sohEji+YfnN0/51L6d+cAAAAASUVORK5CYII=');
-    background-repeat: no-repeat;
-    background-position: center;
-    background-size: 50%;
+    background: url('./image/bg.png') no-repeat;
+    background-size: 100% 100%;
     flex-shrink: 0;
 
     & > img {
@@ -157,14 +154,29 @@
   height: 20px;
 }
 .circleProgress {
-  width: 20px;
-  height: 20px;
+  width: 24px;
+  height: 24px;
+  position: relative;
   :global {
     .van-circle {
+      position: absolute;
+      left: 50%;
+      top: 50%;
+      transform: translate(-50%, -50%);
       width: 20px;
       height: 20px;
     }
   }
+  .tips {
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+    width: 6.5px;
+    height: 6.5px;
+    background: #b3b3b3;
+    border-radius: 1px;
+  }
 }
 .periodItem {
   width: 36px;
@@ -285,6 +297,7 @@
     align-items: center;
 
     & > button {
+      height: 40px;
       flex: 1;
       font-weight: 400;
       font-size: 16px !important;
@@ -300,7 +313,8 @@
   border-color: #dbdbdb;
 }
 .btnRight {
-  background: #FE2451;
+  background: #fe2451;
+  border-color: #fe2451;
 }
 .finch {
   width: 150px;

src/tenant/music/courseList/index.tsx

@@ -2,7 +2,7 @@ import request from '@/helpers/request'
 import { state } from '@/state'
 import { Button, Cell, CellGroup, Popup, Dialog, Toast, Circle } from 'vant'
 import { Vue3Lottie } from 'vue3-lottie'
-import AstronautJSON from '../music-detail/animate/bigLoad.json'
+import AstronautJSON from '../music-detail/animate/refresh_anim.json'
 import {
   defineComponent,
   onMounted,
@@ -445,11 +445,11 @@ export default defineComponent({
                                 ) : (
                                   ''
                                 )}
-                                {/* {item.downloadStatus == 1 && (
+                                {item.downloadStatus == 1 && (
                                   <div class={styles.downloading}>{`${
                                     item.progress || 0
                                   }%`}</div>
-                                )} */}
+                                )}
                               </div>
                             </div>
                           ),
@@ -462,6 +462,7 @@ export default defineComponent({
                                     <img class={styles.basePlay} src={play} />
                                   ) : (
                                     <div class={styles.circleProgress}>
+                                      <div class={styles.tips}></div>
                                       <Circle
                                         v-model:current-rate={item.progress}
                                         rate={item.progress}
@@ -493,7 +494,7 @@ export default defineComponent({
               animationData={AstronautJSON}
               class={styles.finch}
             ></Vue3Lottie>
-            <p class={styles.finchLoad}>加载中...</p>
+            {/* <p class={styles.finchLoad}>加载中...</p> */}
           </div>
         )}
         {!data.loading && !data.list.length && (
@@ -506,7 +507,7 @@ export default defineComponent({
                 round
                 block
                 type="primary"
-                color="linear-gradient(270deg, #FF3C81 0%, #FF76A6 100%)"
+                color="linear-gradient(270deg, #FF204B 0%, #FE5B71 100%)"
                 onClick={() => {
                   if (!browser().isApp) {
                     onDownloadApp()

src/tenant/music/coursewarePlay/component/video-play.tsx

@@ -437,7 +437,7 @@ export default defineComponent({
               }}
             ></i>
             <Slider
-              min={0.6}
+              min={0.5}
               max={1.5}
               step={0.1}
               v-model={data.defaultSpeed}
@@ -462,7 +462,7 @@ export default defineComponent({
             <i
               class={[styles.iconCut]}
               onClick={() => {
-                if (data.defaultSpeed <= 0.6) {
+                if (data.defaultSpeed <= 0.5) {
                   return
                 }
                 if (videoItem.value) {

src/tenant/music/lessonCourseware/component/CourseItem/index.module.less

@@ -2,7 +2,7 @@
   position: relative;
   background: rgba(255, 255, 255, 0.6);
   border-radius: 10px;
-  border: 2px solid #FFFFFF;
+  border: 2px solid #ffffff;
   min-height: 200px;
   display: flex;
   flex-wrap: wrap;
@@ -93,26 +93,25 @@
 
   .coverImg {
     width: 100%;
-    background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFoAAABaCAMAAAAPdrEwAAABOFBMVEUAAAC0tLTT09PU1NTt7e3////T09P////T09P////T09P////X19f////U1NTU1NTT09PT09PU1NTU1NTV1dXT09PU1NTU1NTV1dXZ2dn+/v7R0dH////////KysrIyMjT09O0tLTU1NS0tLTU1NS0tLTT09PT09PT09PU1NTU1NTU1NTT09O2trbU1NTV1dXV1dXW1tbV1dXW1tbV1dXJycm4uLj///+0tLT///+0tLT////p6em0tLT4+Pj///+2trb///+1tbX///+0tLT////T09P5+fn+/v63t7e8vLz8/Pzl5eXW1tbBwcH39/fw8PDs7Ozb29v7+/vg4ODOzs65ubny8vLJycnp6enGxsbFxcW+vr62trb09PTY2NjLy8vCwsLn5+fi4uLS0tLu7u7Q0NDd3d02Mu/gAAAARHRSTlMAnPwvBfv07ODdw5AbGezmyrirl5B4aT0kDZyclTwsIPj48+Ta1tPS0LGhiIaEcGJgV05FNhMS7++8vKyslZRzc1ZWJRSpe/cAAALfSURBVFjD7djXcuIwGAVg1pTQAiT0Ekiy6b1v7whsA6b3EGAJu+//BstaiWNiCYGlXGTG55KBDzH6j2xjMmJET5ZdDivQFavDtTxLXlsCFFlam7HmiUxl49ftApRxYWkHLe3A0lZa2oqlAXUMGk/fHG9vpCnSk/pZNJ18m6aOWELRN1CmtbMI+jjNJH0Evc2GlhD0Bhu6h6DTjPIq6Pqonb8XXoCWmjKSHTCnpccp5ges6bHCZAW2dBc8JcOWLqjoPFu6oqLLr2bVQxX9h/GElBWmKDCmxSKAyXWYt1GE677rLtLGejsLcuOCQMI7lVFlsMjxJJUeW3bP+OSTskBJqcuSFppAFT4vsqMrYDrVAitazMHV8kBJs8WGzsPmNoRCFSj5fcuA7vJKvcQ8UJKrCNT0WH0mdEpASbFOSdfhyClvzagGsSzR0D14LHTSSho1/mkQaw39dB9u2vThCU8KQj1JtFiVt+z5ONSLmnoSaeszuia/+lfzAaGS09STQDum6SH/cOXX5rY9Xz0Rj6Sqy0YmjUzrbp56ah6kIT2AH8Pe4M5TT83jP6ThsnALmq+eiD8tlIt/G8POWU8FVNMNuXc8rnH4epJpOHg1jIivJ5mWcvLg4ZqMryeZhnOLm1hyPfF0C95R9PAcvp4jcSYNL7UDHEWuJ56GO46FyPXE0+/+/7Lhgs+ffU093yPoDwCAEcki1/Mjgv4BQFUkSeR6/jQh8gn0SQy5np9NqFi+CgSDWE9rwmJCJ/X9yxt9iSdisVji2y+TESNGXjiW6LU7FYkkzQ9JRiIp93XUoodyX12cBg/9qyvOHbvXxmUw4Wxe+45zZdV/GDy9uHJbZqPhk7jTjrTI4ezO+EkY8wUBW4Y6tgCSPvNxtDLnOzOhEw2HAvt7Hj2oZ28/EApHyRtpvjwPBY/8B5Ot9O1u2b2eTds6x8nr4tZtmx6vfWvXN9nCA/9RMHR+aZ5sohEji+YfnN0/51L6d+cAAAAASUVORK5CYII=');
-    background-repeat: no-repeat;
-    background-position: center;
-    background-size: 50%;
+    background: url('./image/bg.png') no-repeat;
+    background-size: 100% 100%;
     border-radius: 2px;
     overflow: hidden;
 
-    &>img {
+    & > img {
       display: block;
       width: 100%;
       height: 120px;
       opacity: 0;
-      transition: opacity .3s;
+      transition: opacity 0.3s;
     }
 
     :global {
       .van-image__loading {
         position: relative;
         height: 120px;
-        animation: van-skeleton-blink var(--van-skeleton-duration) ease-in-out infinite;
+        animation: van-skeleton-blink var(--van-skeleton-duration) ease-in-out
+          infinite;
       }
     }
 
@@ -122,14 +121,18 @@
       left: 5px;
       width: 5px;
       height: 100%;
-      background: linear-gradient(270deg, rgba(0, 0, 0, 0.25) 0%, rgba(0, 0, 0, 0.03) 100%);
+      background: linear-gradient(
+        270deg,
+        rgba(0, 0, 0, 0.25) 0%,
+        rgba(0, 0, 0, 0.03) 100%
+      );
       box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.2);
       z-index: 1;
     }
   }
 
   .name {
-    width: 109%;
+    width: 100%;
     line-height: 18px;
     font-weight: 400;
     font-size: 13px;

src/tenant/music/lessonCourseware/index.module.less

@@ -5,8 +5,8 @@
 
   :global {
     .van-sticky {
-      // background: url('../../images/bg.png') no-repeat top center;
-      // background-size: 100% 214px;
+      background: url('../../images/bg.png') no-repeat top center;
+      background-size: 100% 346px;
     }
 
     .van-search__content {
@@ -101,7 +101,8 @@
 .search {
   :global {
     .van-search {
-      height: calc(var(--van-dropdown-menu-height) + 20px);
+      padding-top: 4px;
+      height: calc(var(--van-dropdown-menu-height) + 14px);
     }
   }
 }
@@ -110,7 +111,7 @@
   top: 0;
   left: 0;
   width: 100%;
-  height: 214px;
+  height: 346px;
   // object-fit: cover;
   z-index: -1;
 }
@@ -122,20 +123,20 @@
       display: none;
     }
   }
-}
-.courseItem.courseItem1 {
-  background: initial;
-  border: initial;
-  padding: 0 4px 20px;
-  :global {
-    .courseItem:nth-child(1) {
-      margin-top: 10px;
-    }
-    .courseItem:nth-child(2) {
-      margin-top: 10px;
-    }
-    .courseItem:nth-child(3) {
-      margin-top: 10px;
+  .courseItem {
+    background: initial;
+    border: initial;
+    padding: 0 4px 20px;
+    :global {
+      .courseItem:nth-child(1) {
+        margin-top: 6px !important;
+      }
+      .courseItem:nth-child(2) {
+        margin-top: 6px !important;
+      }
+      .courseItem:nth-child(3) {
+        margin-top: 6px !important;
+      }
     }
   }
 }

src/tenant/music/lessonCourseware/index.tsx

@@ -181,7 +181,7 @@ export default defineComponent({
             >
               {params.subjectList.length ? (
                 <CourseItem
-                  class={[styles.courseItem, styles.courseItem1]}
+                  class={[styles.courseItem]}
                   list={params.subjectList.map(item => {
                     return {
                       name: item.musicSheetName,
@@ -203,7 +203,7 @@ export default defineComponent({
                 !loading.value && (
                   <ColResult
                     tips="暂无教程"
-                    classImgSize="SMALL"
+                    classImgSize="CERT"
                     btnStatus={false}
                   />
                 )

src/tenant/music/music-detail/new-index.tsx

@@ -42,7 +42,7 @@ import { getRandomKey, musicBuy } from '../music'
 import { getOssUploadUrl, state } from '@/state'
 import { browser, moneyFormat } from '@/helpers/utils'
 import { orderStatus } from '@/views/order-detail/orderStatus'
-import AstronautJSON from './animate/bigLoad.json'
+import AstronautJSON from './animate/refresh_anim.json'
 import ColShare from '@/components/col-share'
 import iconListen from './images/icon_listen.png'
 import iconTeacher from '@common/images/icon_teacher.png'
@@ -1030,7 +1030,7 @@ export default defineComponent({
                     animationData={AstronautJSON}
                     class={styles.finch}
                   ></Vue3Lottie>
-                  <p class={styles.finchLoad}>加载中...</p>
+                  {/* <p class={styles.finchLoad}>加载中...</p> */}
                 </div>
               )}
               <iframe
@@ -1053,7 +1053,7 @@ export default defineComponent({
                     animationData={AstronautJSON}
                     class={styles.finch}
                   ></Vue3Lottie>
-                  <p class={styles.finchLoad}>加载中...</p>
+                  {/* <p class={styles.finchLoad}>加载中...</p> */}
                 </>
               ) : (
                 <div class={styles.empty}>

src/tenant/music/personal/index.module.less

@@ -20,9 +20,14 @@
     }
 
     .van-tabs__line {
+      display: none;
       width: 24px;
       height: 4px;
-      background: linear-gradient(90deg, #FF3C81 0%, rgba(255, 118, 166, 0.5) 100%) !important;
+      background: linear-gradient(
+        90deg,
+        #ff3c81 0%,
+        rgba(255, 118, 166, 0.5) 100%
+      ) !important;
       border-radius: 36px 36px 0px 0px;
     }
 
@@ -31,8 +36,6 @@
     }
   }
 
-
-
   :global {
     .van-sticky {
       background: url('../../images/bg-image-1.png') no-repeat top center;
@@ -54,7 +57,6 @@
         color: rgba(0, 0, 0, 0.4) !important;
       }
     }
-
   }
 
   .bgImg {
@@ -81,7 +83,9 @@
   background-color: #fff;
   margin: 0 14px 14px;
 }
-
+.practice {
+  margin-bottom: 0;
+}
 .personalSong {
   margin: 14px;
 }
@@ -102,7 +106,7 @@
 
     .van-cell__right-icon {
       font-size: 16px;
-      color: #DADADA;
+      color: #dadada;
     }
   }
 
@@ -114,10 +118,10 @@
   }
 
   .tenantCoverImg {
-    width: 98px;
-    height: 98px;
+    width: 88px;
+    height: 88px;
     border-radius: 12px;
-    margin-right: 16px;
+    margin-right: 12px;
     overflow: hidden;
   }
 
@@ -129,6 +133,11 @@
       font-weight: 500;
       color: #131415;
       line-height: 24px;
+      display: -webkit-box;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      -webkit-line-clamp: 2;
+      -webkit-box-orient: vertical;
     }
 
     p {
@@ -136,6 +145,11 @@
       font-size: 13px;
       color: #777777;
       line-height: 24px;
+      display: -webkit-box;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      -webkit-line-clamp: 1;
+      -webkit-box-orient: vertical;
     }
   }
-}
+}

src/tenant/music/personal/tenant-album.tsx

@@ -91,7 +91,7 @@ export default defineComponent({
                       title: () => (
                         <div class={styles.tenantContent}>
                           <h2>{item.name}</h2>
-                          <p class="van-multi-ellipsis--l2">{item.describe}</p>
+                          <p>{item.describe}</p>
                         </div>
                       )
                     }}

src/tenant/music/train-list/index.module.less

@@ -5,8 +5,8 @@
 
   :global {
     .van-sticky {
-      // background: url('../../images/bg.png') no-repeat top center;
-      // background-size: 100% 214px;
+      background: url('../../images/bg.png') no-repeat top center;
+      background-size: 100% 346px;
     }
 
     .van-search__content {
@@ -54,14 +54,15 @@
     }
   }
 
-  .titleActive {
-    color: #fe2451;
-  }
+  // .titleActive {
+  //   color: #fe2451;
+  // }
 }
 .search {
   :global {
     .van-search {
-      height: calc(var(--van-dropdown-menu-height) + 20px);
+      padding-top: 4px;
+      height: calc(var(--van-dropdown-menu-height) + 14px);
     }
   }
 }
@@ -199,7 +200,7 @@
   top: 0;
   left: 0;
   width: 100%;
-  height: 214px;
+  height: 346px;
   // object-fit: cover;
   z-index: -1;
 }
@@ -266,7 +267,7 @@
 }
 
 .searchResult {
-  padding: 16px 16px 12px;
+  padding: 16px 13px 12px;
   overflow: hidden;
   margin-bottom: 20px;
   border-bottom: 1px solid #f2f2f2;
@@ -281,8 +282,8 @@
 
 .radio-group {
   display: flex;
-  margin-top: 10px;
-  margin-bottom: 20px;
+  margin-top: 12px;
+  margin-bottom: 7px;
   flex-wrap: wrap;
 
   .radio:first-child {

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

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

src/tenant/music/train-tool/index.module.less

@@ -1,3 +1,13 @@
+.trainTool {
+  .theSticky {
+    :global {
+      .van-sticky {
+        background: url('./images/music-bg.png') no-repeat top center;
+        background-size: 100% 365px;
+      }
+    }
+  }
+}
 .musicContent {
   position: absolute;
   top: 0;
@@ -289,6 +299,9 @@
   --van-cell-icon-size: 10px;
 
   :global {
+    .van-tabs {
+      padding-bottom: 16px;
+    }
     .van-tabs__nav {
       padding-left: 5px;
       padding-right: 5px;
@@ -331,7 +344,26 @@
   .alumnList {
     padding: 0 15px;
     &.alumnListCourseware {
-      padding: 3px;
+      padding: 0 3px 3px;
+    }
+    :global {
+      .van-empty {
+        margin-top: -24px;
+      }
+      .songItem {
+        &:first-child {
+          padding-top: 0;
+        }
+      }
+      .courseItem:nth-child(1) {
+        margin-top: 0 !important;
+      }
+      .courseItem:nth-child(2) {
+        margin-top: 0 !important;
+      }
+      .courseItem:nth-child(3) {
+        margin-top: 0 !important;
+      }
     }
   }
 }

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

@@ -171,11 +171,10 @@ export default defineComponent({
     watch(
       () => state.details,
       () => {
-        state.ensembleCounts = state.details?.ensembleCounts <= 0 ? false : true
-        state.subjectCounts = state.details?.subjectCounts <= 0 ? false : true
-        state.musicCounts = state.details?.musicCounts <= 0 ? false : true
-        state.coursewareCounts =
-          state.details?.coursewareCounts <= 0 ? false : true
+        state.ensembleCounts = state.details?.ensembleCounts ? true : false
+        state.subjectCounts = state.details?.subjectCounts ? true : false
+        state.musicCounts = state.details?.musicCounts ? true : false
+        state.coursewareCounts = state.details?.coursewareCounts ? true : false
         if (state.details.buyTimesFlag) {
           if (state.details.buyedTimes >= state.details.buyTimes) {
             state.hasBuyStatus = false
@@ -187,7 +186,11 @@ export default defineComponent({
         }
       }
     )
+    let listController
     const FetchList = async (hideLoading = false) => {
+      if (listController) {
+        listController.abort()
+      }
       state.loading = true
       state.isError = false
       const tempParams = {
@@ -197,11 +200,14 @@ export default defineComponent({
       }
 
       try {
+        listController = new AbortController()
+        const { signal } = listController
         const { data } = await request.post(
           `${apiSuffix.value}/tenantAlbumMusic/page`,
           {
             hideLoading,
-            data: tempParams
+            data: tempParams,
+            signal
           }
         )
         if (state.list.length > 0 && data.pageNo === 1) {
@@ -220,14 +226,14 @@ export default defineComponent({
     }
 
     onMounted(async () => {
-      useEventListener(document, 'scroll', evt => {
-        const { y } = useWindowScroll()
-        if (y.value > 20) {
-          background.value = `rgba(255, 255, 255)`
-        } else {
-          background.value = 'transparent'
-        }
-      })
+      // useEventListener(document, 'scroll', evt => {
+      //   const { y } = useWindowScroll()
+      //   if (y.value > 20) {
+      //     background.value = `rgba(255, 255, 255)`
+      //   } else {
+      //     background.value = 'transparent'
+      //   }
+      // })
 
       state.loading = true
       state.loadingAlbum = true
@@ -336,6 +342,7 @@ export default defineComponent({
         {!state.loading && !state.details.id && state.buy != '1' ? (
           <>
             <TheSticky
+              class={styles.theSticky}
               position="top"
               onBarHeight={(height: any) => {
                 console.log(height, 'height', height)
@@ -364,6 +371,7 @@ export default defineComponent({
           !state.loadingAlbum && (
             <>
               <TheSticky
+                class={styles.theSticky}
                 position="top"
                 onBarHeight={(height: any) => {
                   state.heightV = height

src/tenant/trade/index.module.less

@@ -17,14 +17,13 @@
       }
 
       .van-field__clear {
-        color: #C1BDC1 !important;
+        color: #c1bdc1 !important;
       }
     }
 
     .van-search {
       padding-bottom: 0;
     }
-
   }
 }
 
@@ -34,7 +33,6 @@
   color: #131415;
 
   :global {
-
     .van-list__loading,
     .van-list__finished-text,
     .van-list__error-text {
@@ -47,7 +45,6 @@
   }
 }
 
-
 .bgImg {
   position: fixed;
   top: 0;
@@ -84,7 +81,11 @@
     .van-tabs__line {
       width: 24px;
       height: 4px;
-      background: linear-gradient(90deg, #FF3C81 0%, rgba(255, 118, 166, 0.5) 100%) !important;
+      background: linear-gradient(
+        90deg,
+        #ff3c5e 0%,
+        rgba(255, 118, 155, 0.5) 100%
+      ) !important;
       border-radius: 36px 36px 0px 0px;
     }
 
@@ -133,7 +134,6 @@
   // }
 }
 
-
 .tradeList {
   padding-top: 16px;
 
@@ -179,7 +179,6 @@
     color: #131415;
     line-height: 24px;
 
-
     .name {
       max-width: 160px;
     }
@@ -202,7 +201,6 @@
     .d {
       max-width: 160px;
     }
-
   }
 
   .paymentPrice {
@@ -218,7 +216,7 @@
     span {
       font-family: DINAlternate-Bold, DINAlternate;
       font-weight: bold;
-      color: #FE2451;
+      color: #fe2451;
       font-size: 20px;
       padding-left: 4px;
 
@@ -233,11 +231,11 @@
 
   .songLength {
     border-radius: 4px;
-    border: 1px solid #FE2451;
+    border: 1px solid #fe2451;
     font-size: 12px;
     font-family: PingFangSC-Regular, PingFang SC;
     font-weight: 400;
-    color: #FE2451;
+    color: #fe2451;
     line-height: 16px;
     padding: 1px 6px;
   }
@@ -257,21 +255,20 @@
       padding: 7px 16px;
     }
 
-    .van-button+.van-button {
+    .van-button + .van-button {
       margin-left: 10px;
     }
   }
 }
 
-
 .orderDetailGroup {
   margin: 0 12px 12px;
-  background: #FFFFFF;
+  background: #ffffff;
   border-radius: 10px;
 }
 
 .optionGroup {
-  background: #FFFFFF;
+  background: #ffffff;
   border-radius: 10px;
   margin: 12px;
   padding-top: 15px;
@@ -320,4 +317,4 @@
       /* CSS 3 (and 2.1 as well, actually) */
     }
   }
-}
+}

yarn.lock

@@ -5541,6 +5541,11 @@ yargs@^15.3.1:
     y18n "^4.0.0"
     yargs-parser "^18.1.2"
 
+yet-another-abortcontroller-polyfill@^0.0.4:
+  version "0.0.4"
+  resolved "https://registry.npmmirror.com/yet-another-abortcontroller-polyfill/-/yet-another-abortcontroller-polyfill-0.0.4.tgz#ce2270e564a4f2d07351812f599e10143526f98b"
+  integrity sha512-6do/P+mjm7FDUD+q8FrZ0ClMIbjGuKyWuWm3Vz2O7QmVf73HVLYIDV6toS7T0qoH1yeI2HPb8VgJp7w+zcVWvA==
+
 yorkie@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmmirror.com/yorkie/-/yorkie-2.0.0.tgz"