TIANYONG vor 1 Jahr
Ursprung
Commit
3be0cd0370
4 geänderte Dateien mit 28 neuen und 3 gelöschten Zeilen
  1. 1 1
      src/pages/detail/helpers.ts
  2. 0 1
      src/pages/detail/runtime.ts
  3. 26 1
      src/subpages/colexiu/index.tsx
  4. 1 0
      vite.config.js

+ 1 - 1
src/pages/detail/helpers.ts

@@ -381,7 +381,7 @@ export const getAllNodes = (osmd: any) => {
           if (i === 0) {
             fixtime += getFixTime(beatSpeed)
           }
-          // console.log({fixtime, relativeTime})
+          // console.log({fixtime, relativeTime}, 99999999)
           // 酷乐秀计算音符时值方法
           // let noteLength =
           // (numerator === 0 && note.isRestFlag ? vRealValue : (wholeValue + numerator) / denominator) *

+ 0 - 1
src/pages/detail/runtime.ts

@@ -52,7 +52,6 @@ export const getFixtimeRelaVal = () => {
   return 0 //(fixtimeRela as any)[(route.params.id || linkId)] || 0
 }
 
-
 export const getFixTime = (speed: number) => {
   const duration: any = getDuration(state.osmd)
   let numerator = duration.numerator || 0

+ 26 - 1
src/subpages/colexiu/index.tsx

@@ -47,6 +47,7 @@ import UnitTest from './unitTest'
 import { renderError } from './App'
 import { musicInfo } from './state'
 import ToggleMusicSheet from './plugins/toggleMusicSheet'
+import request from '/src/helpers/request'
 
 // json化曲谱的note信息和svg
 export const musicJSON = reactive({
@@ -168,6 +169,24 @@ export default defineComponent({
       })
     }
 
+    // 查询类目信息
+    const queryCategroyInfo = async (id: any) => {
+      return new Promise((resolve) => {
+        let categoryList: any = []
+        request
+          .get(`/musicSheetCategories/queryTree?page=1&rows=999&parentId=${id}`)
+          .then((res) => {
+            if (res?.code == 200) {
+              categoryList = res.data.map((item: any) => item.id)
+              resolve(categoryList)
+            } else {
+              resolve([])
+            }
+          }).catch((err) => {
+            resolve([])
+          })
+      })
+    }
     const productRef = ref()
 
     /** 当渲染完成后的回调 */
@@ -185,6 +204,12 @@ export default defineComponent({
       detailState.baseSpeed = detail.value.playSpeed || bpm || 100
       detailState.code = detail.value?.code || ''
       detailState.activeDetail.originalSpeed = detailState.baseSpeed
+
+      const categoryList: any = await queryCategroyInfo(49)
+      const { musicSheetCategoriesId } = detailState.activeDetail
+      detailState.skipTick = categoryList.includes(musicSheetCategoriesId)
+
+      console.log('😯~', osmd, detailState)
       if (detailState.renderType === 'native') {
         detailState.times = getAllNodes(osmd)
       }
@@ -215,7 +240,7 @@ export default defineComponent({
         // }
       }
       console.timeEnd('获取数据')
-      console.log('🚀 ~ detailState.times', detailState.times)
+      console.log('🚀 ~👀~ detailState.times', detailState.times)
 
       const songEndTime = detailState.times[detailState.times.length - 1 || 0]?.endtime || 0
       if (detailState.isAppPlay) {

+ 1 - 0
vite.config.js

@@ -8,6 +8,7 @@ const legacy = require('@vitejs/plugin-legacy')
 const proxyUrl = 'https://test.lexiaoya.cn/' // test 环境
 // const proxyUrl = 'http://192.168.3.70:8989/' // test 环境
 // const proxyUrl = 'https://online.colexiu.com/' // online 环境
+// const proxyUrl = 'https://online.lexiaoya.cn/' // online 环境
 
 export default defineConfig({
   base: '/orchestra-music-score',