Merge branch 'feature-tianyong-newVersion' of http://git.dayaedu.com/liushengqiang/music-score into hqyDevNewVersion

src/helpers/formateMusic.ts

@@ -646,6 +646,17 @@ export const formatXML = (xml: string, xmlUrl?: string): string => {
 		// 是否是C调
 		state.isCTone = fifths[0].textContent === '0'
 	}
+
+	const endings = Array.from(xmlParse.getElementsByTagName("ending"));
+	for (const ending of endings) {
+		// if (ending.getAttribute('type') === 'stop') {
+		// 	// @ts-ignore
+		// 	ending.parentNode?.removeChild(ending.parentNode?.getElementsByTagName('bar-style')[0])
+		// }
+		// @ts-ignore
+		// ending.parentNode.parentNode?.removeChild(ending.parentNode)
+	}
+
 	const measures = Array.from(xmlParse.getElementsByTagName("measure"));
 	const minutes: any = xmlParse.getElementsByTagName("per-minute");
 	let speeds: any = []

src/page-instrument/follow-model/index.tsx

@@ -42,17 +42,18 @@ export default defineComponent({
           followData.isBeginMask && <div class={styles.beginMask}></div>
         }        
         <div class={[styles.operatingBtn, state.platform === IPlatform.PC && state.musicScoreBtnDirection === "left" ? styles.operatingLeft : ""]}>
-          {!followData.start && (
+          {(!followData.start && !followData.practiceStart) && (
             <img
               class={[styles.iconBtn, "follow-1"]}
               src={headImg("icon_play.png")}
               onClick={() => {
-                followData.start = true;
+                // followData.start = true;
+                followData.practiceStart = true;
                 handleFollowStart();
               }}
             />
           )}
-          {followData.start && (
+          {(followData.start || followData.practiceStart)&& (
             <>
               <img class={styles.iconBtn} src={headImg("icon_reset.png")} onClick={() => handleFollowEnd()} />
               <img class={styles.iconBtn} src={headImg("submit.png")} onClick={() => handleFollowEnd()} />

src/view/follow-practice/index.tsx

@@ -23,6 +23,7 @@ export const followData = reactive({
 	earphone: false,
 	isBeginMask: false, // 倒计时和系统节拍器时候的遮罩，防止用户点击
 	dontAccredit: true, // 没有开启麦克风权限，不需要调用结束收音的api
+	practiceStart: false,
 });
 
 // 记录跟练时长
@@ -50,6 +51,7 @@ export const toggleFollow = (notCancel = true) => {
 	// 取消跟练
 	if (!notCancel) {
 		followData.start = false;
+		followData.practiceStart = false;
 		// 开启了麦克风授权，才需要调用结束收音
 		if (storeData.isApp && !followData.dontAccredit) {
 			openToggleRecord(false);
@@ -80,6 +82,7 @@ const openToggleRecord = async (open: boolean = true) => {
 		if (!openState && followData.start) {
 			followData.earphone = true;
 			followData.start = false;
+			followData.practiceStart = false;
 		}
 	}
 };
@@ -109,6 +112,7 @@ export const handleFollowStart = async () => {
 	if (res?.content?.reson) {
 		followData.isBeginMask = false
 		followData.start = false;
+		followData.practiceStart = false;
 	} else {
 		followData.dontAccredit = false;
 		// 跟练模式开始前，增加播放系统节拍器
@@ -118,11 +122,13 @@ export const handleFollowStart = async () => {
 		if (!tickend) {
 			followData.isBeginMask = false
 			followData.start = false;
+			followData.practiceStart = false;
 			return false;
 		}
 		onClear();
 		followData.isBeginMask = false
 		followData.start = true;
+		followData.practiceStart = true;
 		followData.index = 0;
 		followData.list = [];
 		initSetPlayRate();
@@ -140,6 +146,7 @@ export const handleFollowStart = async () => {
 export const handleFollowEnd = () => {
 	onClear();
 	followData.start = false;
+	followData.practiceStart = false;
 	openToggleRecord(false);
 	followData.index = 0;
 	console.log("结束");

src/view/selection/index.module.less

@@ -186,7 +186,7 @@
         content: "";
         position: absolute;
         left: 50%;
-        bottom: -9PX;
+        bottom: -8PX;
         transform: translateX(-50%);
         width: 13Px;
         height: 9Px;
@@ -195,6 +195,7 @@
         background-position: center center;
         background-repeat: no-repeat;
         z-index: 2;    
+        opacity: 0.7;
     }
 }
 

vite.config.ts

@@ -76,8 +76,8 @@ export default defineConfig({
         // target: "https://kt.colexiu.com",
         // target: "https://test.lexiaoya.cn",
         // target: "https://kt.colexiu.com",
-        target: "https://test.resource.colexiu.com", // 内容平台开发环境，内容平台开发，需在url链接上加上isCbs=true
-        // target: "https://test.kt.colexiu.com",
+        // target: "https://test.resource.colexiu.com", // 内容平台开发环境，内容平台开发，需在url链接上加上isCbs=true
+        target: "https://test.kt.colexiu.com",
         //target: "https://mec.colexiu.com",
         changeOrigin: true,
         rewrite: (path) => path.replace(/^\/instrument/, ""),