Merge branch 'feature-pc-choose' of http://git.dayaedu.com/liushengqiang/orchestra-music-score into gyt-test

src/pages/detail/runtime.ts

@@ -402,7 +402,7 @@ export const initSetPlayRate = () => {
 const dynamicShowPlaySpeed = (index: number) => {
   const item: any = detailState.times[index];
 
-  if (item && modelType.value === "practice" && state.playState === "play" && item.measureSpeed ) {
+  if (item && state.playState === "play" && item.measureSpeed ) {
     state.playIngSpeed = Math.floor(state.basePlayRate * item.measureSpeed)
   }
 }

src/subpages/colexiu/buttons/evaluating.tsx

@@ -344,7 +344,14 @@ const formatTimes = () => {
       (n: any) => n.NoteToGraphicalNoteObjectId == detailState.section[1].NoteToGraphicalNoteObjectId
     )
     if (startIndex > 1) {
-      preTime = detailState.times[startIndex-1].time * 1000
+      // 预备小节的小节数
+      const preMeasureNum = detailState.times[startIndex-1].measureNumberPrinted;
+      // 预备小节的第一个音符的索引
+      let preNoteNum = startIndex-1;
+      while (preMeasureNum === detailState.times[preNoteNum].measureNumberPrinted && preNoteNum >= 1 && preMeasureNum === detailState.times[preNoteNum-1].measureNumberPrinted) {
+        preNoteNum -= 1;
+      }
+      preTime = detailState.times[preNoteNum].time * 1000
     }
     times = detailState.times.filter((n: any, index: number) => {
       return index >= startIndex && index <= endIndex

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

@@ -136,6 +136,7 @@ export default defineComponent({
           isHideTitle: true, // 此处兼容安卓，意思为隐藏全部头部
           statusBarTextColor: false,
           isOpenLight: true,
+          c_orientation: 0,
         },
       })
     }

vite.config.js

@@ -5,7 +5,7 @@ import glsl from 'vite-plugin-glsl'
 const vueJsx = require('@vitejs/plugin-vue-jsx')
 const legacy = require('@vitejs/plugin-legacy')
 
-const proxyUrl = 'https://dev.lexiaoya.cn/' // test 环境
+const proxyUrl = 'https://test.lexiaoya.cn/' // test 环境
 // const proxyUrl = 'http://192.168.3.70:8989/' // test 环境
 // const proxyUrl = 'https://online.colexiu.com/' // online 环境