Merge branch 'gyt-feature-tianyong' into online

src/pages/detail/helpers.ts

@@ -707,6 +707,7 @@ export const getAllNoteElements = (osmd: any) => {
 }
 
 export const setStepIndex = (osmd: any, num: number, prev?: number) => {
+  // console.log('进度',num,prev)
   if (osmd.product) {
     if (num || num === 0) {
       // console.log(prev, num)

src/subpages/colexiu/buttons/evaluating.tsx

@@ -369,6 +369,8 @@ const formatTimes = () => {
     }
     preLyricsContent = preLyricsContent ? preLyricsContent : 'Play'
   }
+  // 阶段评测beatLength需要加上预备小节的持续时长
+  actualBeatLength = preTimes.length ? actualBeatLength + preTimes[preTimes.length - 1].duration * 1000 : actualBeatLength
   let measureIndex = -1
   let recordMeasure = -1
   let firstNoteTime = unitTestIdx > 1 ? preTime : 0