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

src/page-instrument/header-top/settting/index.module.less

@@ -277,8 +277,8 @@
                     width: 118px;
                     height: 39px;
                     cursor: pointer;
-                    &:first-child{
-                        margin-right: 20px;
+                    & + img{
+                        margin-left: 20px;
                     }
                 }
             }

src/page-instrument/header-top/settting/index.tsx

@@ -253,7 +253,9 @@ export default defineComponent({
 
                         <div class={styles.cellBtnBox}>
                             <img  src={headImg("tpbz.png")} onClick={() => (helperData.screenModelShow = true)} />
-                            <img  src={headImg("yjfk.png")} onClick={() => (helperData.recommendationShow = true)} />
+                            {
+                                !query.isCbs && <img  src={headImg("yjfk.png")} onClick={() => (helperData.recommendationShow = true)} />
+                            }
                         </div>
                     </div>  
                 </div>

src/page-instrument/view-evaluat-report/component/share-top/index.tsx

@@ -501,7 +501,7 @@ export default defineComponent({
                     <span>玫红色音符：演奏偏高</span>
                   </div>
                   <div class={styles.item}>
-                    <Note fill="#4BED98" />
+                    <Note fill="#24E37E" />
                     <span>绿色音符：演奏正确</span>
                   </div>
                   <div class={styles.item}>
@@ -518,7 +518,7 @@ export default defineComponent({
                   </div>
                   <div class={styles.item}>
                     <Note fill="#7AB2FF" />
-                    <span>浅蓝色音符：时值不足</span>
+                    <span>蓝色音符：时值不足</span>
                   </div>
                   <div class={styles.item}>
                     <Note fill="#FF7B00" />
@@ -539,7 +539,7 @@ export default defineComponent({
                     <span>玫红色音符：演奏偏高</span>
                   </div>
                   <div class={styles.itemTone}>
-                    <i style={{ background: bgColors.right }}></i>
+                    <i style={{ background: "#24E37E" }}></i>
                     <span>绿色音符：演奏正确</span>
                   </div>
                   <div class={styles.itemTone}>
@@ -556,7 +556,7 @@ export default defineComponent({
                   </div>
                   <div class={styles.itemTone}>
                     <i style={{ background: bgColors.lack }}></i>
-                    <span>浅蓝色音符：时值不足</span>
+                    <span>蓝色音符：时值不足</span>
                   </div>
                   <div class={styles.itemTone}>
                     <i style={{ background: bgColors.slow }}></i>

src/view/music-score/index.tsx

@@ -72,8 +72,10 @@ export default defineComponent({
 		};
 		const getXML = async () => {
 			// 当有下载的xml的时候直接使用，否则需要下载
-			const xmlStr = downloadXmlStr.value || await fetch(state.xmlUrl).then((response) => response.text());
-			downloadXmlStr.value = "" // 清空内存
+			if(!downloadXmlStr.value){
+				downloadXmlStr.value = await fetch(state.xmlUrl).then((response) => response.text())
+			}
+			const xmlStr = downloadXmlStr.value;
 			const xml = formatXML(xmlStr);
 			musicData.score = state.isCombineRender ? xml : onlyVisible(xml, state.partIndex);
 			if (state.gradualTimes) {