Merge branch 'feature-tianyong' into klx-online

src/helpers/formateMusic.ts

@@ -660,6 +660,7 @@ export const formatXML = (xml: string, xmlUrl?: string): string => {
 	}
 
 	const measures = Array.from(xmlParse.getElementsByTagName("measure"));
+	state.firstMeasureNumber = measures[0] ? Number(measures[0].getAttribute('number') || 1) : 1;
 	const minutes: any = xmlParse.getElementsByTagName("per-minute");
 	let speeds: any = []
 	for (const minute of minutes) {

src/helpers/metronome.ts

@@ -320,7 +320,7 @@ class Metronome {
 			// console.log("🚀 ~ note?.noteElement?.sourceMeasure", note?.noteElement?.sourceMeasure)
 			// console.log("🚀 ~ measureNumberXML", measureNumberXML, note)
 			// console.log("🚀 ~ measureNumberXML", note)
-			const measureListIndex = measureNumberXML - 1;
+			const measureListIndex = state.firstMeasureNumber == 0 ? measureNumberXML : measureNumberXML - 1;
 			// 当渐快渐慢的时候  不播节拍器
 			if(isWithinRange(state.gradual, measureListIndex)){
 				xmlNumber = measureNumberXML;

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

@@ -163,6 +163,7 @@ export default defineComponent({
       state.isWeb = query.systemType === 'web';
       state.tenantAlbumId = query.albumId;
       state.providerType = query.providerType || state.providerType;
+      state.isWebAudit = query.isWebAudit ? true : false;
       if (state.isPreView) {
         state.zoom = query.zoom  || 0.65
       }

src/state.ts

@@ -608,12 +608,16 @@ const state = reactive({
   hasFollowResult: false,  
   /** 右上角速度图标，根据当前小节的速度是几分音符的动态变化 */
   speedIcon: 'speed3', // 默认取1/4拍的图片
+  /** xml的第一个measure标签的number */
+  firstMeasureNumber: 1,
   /** 曲目点播价格 */
   musicPrice: 0,
   /** 专辑id */
   tenantAlbumId: '',
   /** 平台或者机构 */
   providerType: "PLATFORM" as "PLATFORM" | "TENANT",
+  /** 后台审核 */
+  isWebAudit: false,
 });
 const browserInfo = browser();
 let offset_duration = 0;

src/utils/baseApi.ts

@@ -16,7 +16,12 @@ export const getMusicSheetDetail = (sysMusicScoreId: string, type?: string, musi
     url += state.tenantAlbumId == '1' ? `?providerType=TENANT` : `?tenantAlbumId=${state.tenantAlbumId}`
   }
   if (state.systemType === 'web') {
-    url = `/musicSheet/cbsDetail/${sysMusicScoreId}?providerType=${state.providerType}`
+    if (state.isWebAudit) {
+      url = `/musicSheet/cbsDetailAuth/${sysMusicScoreId}`
+    } else {
+      url = `/musicSheet/cbsDetail/${sysMusicScoreId}?providerType=${state.providerType}`
+    }
+    
   }
   return request.get(url, { noToken: type === 'open' ? true : false });
 };