Merge branch 'iteration-20240909' into jenkins-test

src/helpers/constant.ts

@@ -36,7 +36,7 @@ export const schoolType = {
  * 场景
  */
 export const audioPlayType = {
-  PLAY: "演奏",
   SING: "演唱",
-  PLAY_SING: "演奏+演唱"
+  PLAY: "演奏",
+  PLAY_SING: "演唱+演奏"
 } as any;

src/views/co-ai/index.module.less

@@ -578,6 +578,7 @@
     // height: calc(100% - 78px);
     display: flex;
     flex-direction: column;
+    height: 100%;
 
     .iframeSection {
       flex: 1 auto;
@@ -586,6 +587,13 @@
         height: 100%;
       }
     }
+
+    .imgSection {
+      flex: 1 auto;
+      overflow-x: hidden;
+      overflow-y: auto;
+      height: 100%;
+    }
   }
 }
 

src/views/co-ai/index.tsx

@@ -970,7 +970,7 @@ export default defineComponent({
                     </>
                   </div>
                 ) : (
-                  <>
+                  <div class={styles.imgSection}>
                     {data.showMusicImg === 'first' ? (
                       <>
                         {data.musics[data.musicIndex]?.musicFirstImg
@@ -1019,7 +1019,7 @@ export default defineComponent({
                           })}
                       </>
                     )}
-                  </>
+                  </div>
                 )}
               </div>
             </div>

src/views/courseware-play/image/icon-start.svg

@@ -1,50 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="121px" height="38px" viewBox="0 0 121 38" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>按钮/小按钮/橙</title>
+<svg width="95px" height="32px" viewBox="0 0 95 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>按钮/小按钮/橙备份</title>
     <defs>
-        <linearGradient x1="15.3622126%" y1="46.5566937%" x2="89.7647319%" y2="53.6358332%" id="linearGradient-1">
-            <stop stop-color="#FF9C63" offset="0%"></stop>
-            <stop stop-color="#FF7144" offset="100%"></stop>
+        <linearGradient x1="2.80023677%" y1="49.0374063%" x2="97.3547855%" y2="51.4481282%" id="linearGradient-1">
+            <stop stop-color="#45CBFE" offset="0%"></stop>
+            <stop stop-color="#239DFD" offset="100%"></stop>
         </linearGradient>
-        <linearGradient x1="-67.2865798%" y1="54.9313571%" x2="100%" y2="50%" id="linearGradient-2">
-            <stop stop-color="#5BECFF" offset="0%"></stop>
-            <stop stop-color="#259CFE" offset="100%"></stop>
-        </linearGradient>
-        <rect id="path-3" x="0" y="0" width="121" height="38" rx="19"></rect>
-        <text id="text-4" font-family="PingFangSC-Medium, PingFang SC" font-size="16" font-weight="400" fill="#FFFFFF">
-            <tspan x="49" y="24">去练习</tspan>
-        </text>
-        <filter x="-4.2%" y="-4.5%" width="108.3%" height="118.2%" filterUnits="objectBoundingBox" id="filter-5">
-            <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="0.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0.108514357   0 0 0 0 0.562412481   0 0 0 0 0.907525104  0 0 0 1 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
-        </filter>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-6">
+        <rect id="path-2" x="0" y="0" width="95" height="32" rx="16"></rect>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
             <stop stop-color="#FCFFFF" offset="0%"></stop>
-            <stop stop-color="#D4F1FF" offset="100%"></stop>
+            <stop stop-color="#FFE4D4" offset="100%"></stop>
         </linearGradient>
-        <path d="M10,0 C15.5228475,0 20,4.4771525 20,10 C20,15.5228475 15.5228475,20 10,20 C4.4771525,20 0,15.5228475 0,10 C0,4.4771525 4.4771525,0 10,0 Z M15.8740909,4.13727273 C15.7362351,3.65455394 15.2331964,3.37495234 14.7504546,3.51272728 L10.205,4.81181817 C9.89624241,4.89978885 9.65677854,5.14409039 9.57499999,5.45454546 L9.54545455,5.45454546 L9.54590909,11.0254545 C8.4211929,10.2420678 6.92120134,10.2669785 5.82311793,11.0872797 C4.72503453,11.907581 4.27567032,13.3388975 4.70785225,14.6396281 C5.14003419,15.9403587 6.35662277,16.8181818 7.72727272,16.8181818 L7.83636363,16.8163636 C9.5501842,16.7575695 10.9091192,15.3511924 10.9090909,13.6363636 L10.9090909,8.24636364 L15.25,7.00636364 C15.6400039,6.89481163 15.9089107,6.53837105 15.9090909,6.13272727 L15.9090909,4.38727272 C15.9090909,4.30271722 15.8973272,4.21857285 15.8740909,4.13727273 Z" id="path-7"></path>
-        <filter x="-10.0%" y="-5.0%" width="120.0%" height="120.0%" filterUnits="objectBoundingBox" id="filter-8">
-            <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="0.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0.108514357   0 0 0 0 0.562412481   0 0 0 0 0.907525104  0 0 0 1 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
-        </filter>
+        <path d="M10,0 C15.5228475,0 20,4.4771525 20,10 C20,15.5228475 15.5228475,20 10,20 C4.4771525,20 0,15.5228475 0,10 C0,4.4771525 4.4771525,0 10,0 Z M15.8740909,4.13727273 C15.7362351,3.65455394 15.2331964,3.37495234 14.7504546,3.51272728 L10.205,4.81181817 C9.89624241,4.89978885 9.65677854,5.14409039 9.57499999,5.45454546 L9.54545455,5.45454546 L9.54590909,11.0254545 C8.4211929,10.2420678 6.92120134,10.2669785 5.82311793,11.0872797 C4.72503453,11.907581 4.27567032,13.3388975 4.70785225,14.6396281 C5.14003419,15.9403587 6.35662277,16.8181818 7.72727272,16.8181818 L7.83636363,16.8163636 C9.5501842,16.7575695 10.9091192,15.3511924 10.9090909,13.6363636 L10.9090909,8.24636364 L15.25,7.00636364 C15.6400039,6.89481163 15.9089107,6.53837105 15.9090909,6.13272727 L15.9090909,4.38727272 C15.9090909,4.30271722 15.8973272,4.21857285 15.8740909,4.13727273 Z" id="path-4"></path>
     </defs>
     <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="课件列表" transform="translate(-350.000000, -321.000000)">
-            <g id="编组-2" transform="translate(350.000000, 321.000000)">
+        <g id="数字课堂课件页面-小酷AI-去练习" transform="translate(-103.000000, -261.000000)">
+            <g id="编组-2" transform="translate(103.000000, 261.000000)">
                 <g id="button-normal">
-                    <use fill="url(#linearGradient-1)" xlink:href="#path-3"></use>
-                    <use fill="url(#linearGradient-2)" xlink:href="#path-3"></use>
-                </g>
-                <g id="确定" fill-rule="nonzero" fill="#FFFFFF" fill-opacity="1">
-                    <use filter="url(#filter-5)" xlink:href="#text-4"></use>
-                    <use xlink:href="#text-4"></use>
+                    <use fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+                    <use fill="#FFC121" xlink:href="#path-2"></use>
                 </g>
-                <g id="编组" transform="translate(24.000000, 9.000000)" fill-rule="nonzero">
+                <g id="编组-20" transform="translate(14.000000, 6.000000)" fill-rule="nonzero">
+                    <text id="确定" font-family="PingFangSC-Medium, PingFang SC" font-size="14" font-weight="400" fill="#7D4D00">
+                        <tspan x="25" y="15">去练习</tspan>
+                    </text>
                     <g id="形状结合">
-                        <use fill="black" fill-opacity="1" filter="url(#filter-8)" xlink:href="#path-7"></use>
-                        <use fill="url(#linearGradient-6)" xlink:href="#path-7"></use>
+                        <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
+                        <use fill="#7D4D00" xlink:href="#path-4"></use>
                     </g>
                 </g>
             </g>

src/views/hot-music-more/index.module.less

@@ -88,6 +88,10 @@
   height: calc(100vh - var(--header-height));
 }
 
+.musicListSection {
+  overflow: hidden;
+}
+
 .musicList {
   margin: 8px 13px 13px;
   background: #FFFFFF;
@@ -156,7 +160,7 @@
       padding: 2px 3px 1px;
       background: #FFF8F7;
       border-radius: 3px;
-      border: 1px solid #FFC5C5;
+      border: 0.6px solid #FFC5C5;
       line-height: 1;
       margin-right: 2px;
       transform: scale(0.85);
@@ -166,6 +170,7 @@
         width: 8px;
         height: 10px;
         margin-right: 3px;
+        transform: scale(0.9);
       }
     }
 

src/views/hot-music-more/index.tsx

@@ -432,7 +432,8 @@ export default defineComponent({
           onLoad={getMusicList}
           immediateCheck={false}>
           {state.musics.length > 0 && (
-            <div class={styles.musicList}>
+            <div class={styles.musicListSection}>
+              <div class={styles.musicList}>
               {state.musics.map((item: any) => (
                 <Cell
                   class={styles.musicItem}
@@ -483,6 +484,7 @@ export default defineComponent({
                 </Cell>
               ))}
             </div>
+            </div>
           )}
         </List>