Merge branch 'hqyDevNewVersion' of http://git.dayaedu.com/liushengqiang/music-score into feature-tianyong-newVersion

src/page-instrument/view-detail/index.tsx

@@ -107,7 +107,7 @@ export default defineComponent({
         const { isSpecialShapedScreen, notchHeight } = screenData.content;
         if (isSpecialShapedScreen) {
           // 安卓取刘海值
-          detailData.paddingLeft = browsInfo.android ? notchHeight : 26 + "px";
+          detailData.paddingLeft = 27 + "px";
         }
       }
     };

src/page-instrument/view-evaluat-report/component/share-top/index.module.less

@@ -6,7 +6,9 @@
     height: 100%;
     flex-shrink: 0;
     padding: 10px 22px;
-    background-color: rgba(6, 34, 87, 0.45);
+    background-color: rgba(6, 34, 87, 0.8);
+    backdrop-filter: blur(3px);
+    -webkit-backdrop-filter: blur(3px);
     position: relative;
 }
 
@@ -231,6 +233,7 @@
             border-radius: 16px;
             width: 100%;
             height: 100%;
+            box-shadow: 4px -3px 6px 0px #B2E8FF;
 
             .plyr__control.plyr__control--overlaid {
                 width: 48px;
@@ -247,6 +250,9 @@
             .plyr__controls {
                 background: initial;
                 padding: 0 20px 13px;
+                opacity: 1 !important;
+                transform: translateY(0) !important;
+                pointer-events: initial !important;
 
                 .plyr__controls__item.plyr__control {
                     padding: 0;
@@ -296,6 +302,7 @@
                         width: 12px;
                         height: 12px;
                         margin-top: -4px;
+                        box-shadow: initial;
                     }
 
                     .plyr__progress__buffer {
@@ -332,6 +339,7 @@
         background-size: 100% 100%;
         position: relative;
         border-radius: 16px;
+        box-shadow: 4px -3px 6px 0px #B2E8FF;
 
         .audioBga {
             width: 100%;
@@ -358,6 +366,7 @@
                 height: initial;
                 left: 0;
                 bottom: 0;
+                box-shadow: initial;
             }
         }
 
@@ -442,7 +451,7 @@
         position: absolute;
         width: 154px;
         left: 50%;
-        top: -6px;
+        top: -5px;
         transform: translateX(-50%);
     }
 }

src/page-instrument/view-evaluat-report/component/share-top/index.tsx

@@ -227,7 +227,7 @@ export default defineComponent({
               {/* <div class={styles.lcName}>{state.examSongName}</div> */}
               <Title class={styles.lcName} text={state.examSongName} rightView={false} />
               <div class={styles.lcScore}>
-                {level[scoreData.value.heardLevel]}｜综合分数：{scoreData.value.score}分
+                {level[scoreData.value.heardLevel]}｜速度：{scoreData.value.speed}｜综合分数：{scoreData.value.score}分
               </div>
             </div>
           </div>

src/page-instrument/view-evaluat-report/index.tsx

@@ -71,6 +71,7 @@ export default defineComponent({
       integrity: 0,
       intonation: 0,
       score: 0,
+      speed: 0,
       heardLevel: "",
       itemType: "intonation",
       musicType: "staff",
@@ -184,6 +185,7 @@ export default defineComponent({
       scoreData.integrity = res.data?.integrity;
       scoreData.intonation = res.data?.intonation;
       scoreData.score = res.data?.score;
+      scoreData.speed = res.data?.speed;
       scoreData.videoFilePath = res.data?.videoFilePath || res.data?.recordFilePath;
       await getMusicDetail(resultData.musicalNotesPlayStats?.examSongId);
       // 从练习记录进入评测报告，默认显示五线谱