Merge branch 'gyt-feature-tianyong' into gyt-test

src/pages/detail/CheckDelayPopup/index.module.less

@@ -3,12 +3,9 @@
     width: 100vw;
     height: 100vh;
     overflow: hidden;
-    // background-image: url('./image/icon_bg.png');
     background-size: 110% 110%;
     background-position: center center;
     background-repeat: no-repeat;
-    //background: darkblue;
-    // perspective: 500px;
     .delayBg {
         position: relative;
         width: 130%;

src/subpages/colexiu/buttons/evaluating.tsx

@@ -303,6 +303,7 @@ const formatTimes = () => {
   let preLyricsContent = ''
   let preTimes = []
   let unitTestIdx = 0
+  let preTime = 0
   if (unitTestData.isSelectMeasureMode) {
     const startIndex = detailState.times.findIndex(
       (n: any) => n.NoteToGraphicalNoteObjectId == detailState.section[0].NoteToGraphicalNoteObjectId
@@ -310,6 +311,9 @@ const formatTimes = () => {
     const endIndex = detailState.times.findIndex(
       (n: any) => n.NoteToGraphicalNoteObjectId == detailState.section[1].NoteToGraphicalNoteObjectId
     )
+    if (startIndex > 1) {
+      preTime = detailState.times[startIndex-1].time * 1000
+    }
     times = detailState.times.filter((n: any, index: number) => {
       return index >= startIndex && index <= endIndex
     })
@@ -339,7 +343,7 @@ const formatTimes = () => {
   }
   let measureIndex = -1
   let recordMeasure = -1
-  let firstNoteTime = unitTestIdx > 0 ? times[0].time * 1000 : 0
+  let firstNoteTime = unitTestIdx > 1 ? preTime : 0
   for (let index = 0; index < times.length; index++) {
     const item = times[index]
     const note = getNoteByMeasuresSlursStart(item)

src/subpages/colexiu/buttons/index.module.less

@@ -483,4 +483,12 @@ body {
       min-width: fit-content;
     }
   }
-}
+}
+
+body {
+  :global {
+    .popup-scale {
+      margin: 0 !important;
+    }
+  }
+}

src/subpages/colexiu/popups/evaluating/index.module.less

@@ -250,7 +250,7 @@
 .headerButton {
   position: absolute;
   right: -60px;
-  top: -26px;
+  top: -6px;
   display: flex;
   justify-content: space-between;
   align-items: center;

src/subpages/colexiu/popups/evaluating/index.tsx

@@ -59,7 +59,7 @@ export default defineComponent({
           },
           body: {
             filePath: res?.content?.filePath,
-            recordId: props.data?.recordId,
+            recordId: props.data?.recordIdStr,
           },
         },
       })
@@ -96,10 +96,10 @@ export default defineComponent({
       if (detailState.isAppPlay || !browserInfo.isStudent) {
         confirmShow.value = true
       } else {
-        if (props.data?.recordId) {
+        if (props.data?.recordIdStr) {
           // 上传云端
           api_openAdjustRecording({
-            recordId: String(props.data?.recordId),
+            recordId: String(props.data?.recordIdStr),
             title: detailState.activeDetail?.musicSheetName || "曲谱演奏",
             coverImg: detailState.activeDetail?.titleImg || '',
           });