icons

src/page-orchestra/detail/index.tsx

@@ -3,7 +3,7 @@ import { computed, defineComponent, nextTick, onBeforeMount, onBeforeUnmount, on
 import { useRoute } from "vue-router";
 import { formateTimes } from "../../helpers/formateMusic";
 import Metronome, { metronomeData } from "../../helpers/metronome";
-import state, { isRhythmicExercises } from "../../state";
+import state, { isRhythmicExercises, musicscoresettingKey } from "../../state";
 import { storeData } from "../../store";
 import { setGlobalData } from "../../utils";
 import AudioList from "../../view/audio-list";
@@ -46,7 +46,7 @@ export default defineComponent({
 		onBeforeMount(() => {
 			getAPPData();
 			api_setStatusBarVisibility();
-			const settting = store.get("musicscoresetting");
+			const settting = store.get(musicscoresettingKey);
 			if (settting) {
 				state.setting = settting;
 				if (state.setting.camera) {
@@ -103,7 +103,7 @@ export default defineComponent({
 
 			// 映射声部ID
 			state.subjectId = mappingVoicePart(state.subjectId as any, "ORCHESTRA");
-			console.log("🚀 ~ state.subjectId:", state.subjectId)
+			console.log("🚀 ~ state.subjectId:", state.subjectId);
 			// 是否打击乐
 			state.isPercussion = state.subjectId == 23 || state.subjectId == 113 || state.subjectId == 121 || isRhythmicExercises();
 
@@ -131,7 +131,7 @@ export default defineComponent({
 			state.osmd = osmd;
 			const saveSpeed = (store.get("speeds") || {})[state.examSongId];
 			const bpm = (osmd as any).bpm || osmd.Sheet.userStartTempoInBPM;
-			// state.originSpeed = 
+			// state.originSpeed =
 			// state.speed = saveSpeed || bpm || 100;
 			state.times = formateTimes(osmd);
 			console.log("🚀 ~ state.times:", state.times);
@@ -144,7 +144,7 @@ export default defineComponent({
 				const beatLengthInMilliseconds = osmd?.Sheet?.SheetPlaybackSetting?.beatLengthInMilliseconds || (60 / bpm) * 1000;
 				handleInitTick(beatLengthInMilliseconds, osmd?.Sheet?.SheetPlaybackSetting?.Rhythm?.Numerator || 4);
 			}
-			api_cloudLoading()
+			api_cloudLoading();
 		};
 		/** 指法配置 */
 		const fingerConfig = computed<any>(() => {
@@ -155,12 +155,12 @@ export default defineComponent({
 							paddingBottom: state.fingeringInfo.height,
 						},
 						fingerBox: {
-							position: 'absolute',
-							width: '100%',
+							position: "absolute",
+							width: "100%",
 							height: state.fingeringInfo.height,
 							left: 0,
-							bottom:0,
-							background: 'var(--container-background)'
+							bottom: 0,
+							background: "var(--container-background)",
 						},
 					};
 				} else {
@@ -206,6 +206,14 @@ export default defineComponent({
 				detailData.headerHide = state.playState === "play" ? true : false;
 			}
 		);
+		// 设置改变触发
+		watch(
+			[() => state.setting],
+			() => {
+				store.set(musicscoresettingKey, state.setting);
+			},
+			{ deep: true }
+		);
 		onMounted(() => {
 			window.addEventListener("resize", resetMusicScore);
 		});
@@ -215,7 +223,7 @@ export default defineComponent({
 		return () => (
 			<div
 				class={[styles.detail, state.setting.eyeProtection && "eyeProtection"]}
-				style={{ paddingLeft: detailData.paddingLeft, opacity:  state.setting.camera ? `${state.setting.cameraOpacity / 100}` : ''}}
+				style={{ paddingLeft: detailData.paddingLeft, opacity: state.setting.camera ? `${state.setting.cameraOpacity / 100}` : "" }}
 				onClick={(e: Event) => {
 					if (state.playState === "play") {
 						detailData.headerHide = !detailData.headerHide;
@@ -230,11 +238,7 @@ export default defineComponent({
 				<div class={[styles.headHeight, detailData.headerHide && styles.headHide]} onClick={(e: Event) => e.stopPropagation()}>
 					<Transition name="van-slide-down">{state.musicRendered && <HeaderTop />}</Transition>
 				</div>
-				<div
-					id="scrollContainer"
-					style={{ ...fingerConfig.value.container }}
-					class={[styles.container, !state.setting.displayCursor && "hideCursor"]}
-				>
+				<div id="scrollContainer" style={{ ...fingerConfig.value.container }} class={[styles.container, !state.setting.displayCursor && "hideCursor"]}>
 					{/* 曲谱渲染 */}
 					{!detailData.isLoading && <MusicScore onRendered={handleRendered} />}
 					{/* 播放 */}

src/page-orchestra/evaluat-model/earphone/index.module.less

@@ -32,6 +32,5 @@
 .btn {
     display: block;
     width: 106px;
-    height: 31px;
     margin: 11px 0 17px 0;
 }

src/page-orchestra/evaluat-model/earphone/index.tsx

@@ -1,6 +1,6 @@
 import { defineComponent } from "vue";
 import styles from "./index.module.less";
-import icons from "../icons/index.json";
+import evaluatIcons from '../evaluatIcons.json'
 
 export default defineComponent({
 	name: "earphone",
@@ -8,11 +8,11 @@ export default defineComponent({
 	setup(props, { emit }) {
 		return () => (
 			<div class={styles.fraction}>
-				<img class={styles.erji} src={icons.erji} />
+				<img class={styles.erji} src={evaluatIcons.earphone} />
 				<div class={styles.content}>
 					<div class={styles.title}>请佩戴耳机</div>
 					<div class={styles.tip}>佩戴耳机以保证测评准确率～</div>
-					<img src={icons.erjibtn} class={styles.btn} onClick={() => emit("close")} />
+					<img src={evaluatIcons.confirm} class={styles.btn} onClick={() => emit("close")} />
 				</div>
 			</div>
 		);

src/page-orchestra/evaluat-model/evaluat-result/img/cadence.svg

@@ -6,8 +6,8 @@
             <g id="编组-10" transform="translate(211.000000, 63.000000)">
                 <g id="编组-4" transform="translate(18.000000, 34.411322)">
                     <g id="编组-5" transform="translate(144.200000, 65.588678)">
-                        <path d="M16.0007214,10.5467681 L15.4185357,10.5467681 L14.7313532,11.6196168 C14.6473534,11.7509497 14.5002017,11.8281126 14.3444036,11.8225241 C14.1886055,11.8169356 14.0473606,11.729428 13.9729864,11.5924143 L13.1708921,10.115849 L11.9394042,13.1368588 C11.7705957,13.5509988 11.1634955,13.479306 11.0956162,13.0372008 L10.396485,8.46539068 L9.78684248,11.6864792 C9.70599748,12.1143475 9.11974411,12.1781592 8.94864762,11.7780018 L8.15367179,9.91805838 L7.75453138,10.3904169 C7.67088986,10.4895664 7.54784275,10.5467681 7.41793145,10.5467681 L6.44474069,10.5467681 C6.24527423,10.8922541 5.8386268,11.060693 5.45328718,10.9574416 C5.06794756,10.8541901 4.8,10.5049941 4.8,10.1060611 C4.8,9.70712821 5.06794756,9.35793214 5.45328718,9.2546807 C5.8386268,9.15142927 6.24527423,9.31986815 6.44474069,9.6653542 L7.21353088,9.6653542 L7.94139011,8.80351599 C8.04003843,8.68670104 8.19219714,8.62938263 8.34339939,8.65207851 C8.49460164,8.67477439 8.62322675,8.77423924 8.68323196,8.91486854 L9.18991147,10.1000867 L10.0092933,5.77004889 C10.1013244,5.28319929 10.802998,5.2954023 10.8777415,5.78530266 L11.7255971,11.3264901 L12.7059063,8.92147851 C12.846241,8.57725168 13.3236841,8.55081181 13.5011363,8.87749679 L14.3914483,10.5162605 L14.8060967,9.86848361 C14.8870846,9.74190553 15.0270019,9.66533439 15.1772718,9.6653542 L15.8886061,9.6653542 C16.0443893,9.29876579 16.4266137,9.08215459 16.8211538,9.1368681 C17.2156939,9.1915816 17.5245501,9.50402956 17.5746985,9.89917587 C17.6248469,10.2943222 17.403831,10.6740167 17.035466,10.8255511 C16.6671011,10.9770856 16.2428849,10.8628205 16.0004671,10.5467681 L16.0007214,10.5467681 Z" id="路径" fill="#2DC7AA" fill-rule="nonzero"></path>
-                        <rect id="矩形" stroke="#2DC7AA" x="3.3" y="3.91132219" width="15" height="11" rx="2"></rect>
+                        <path d="M16.0007214,10.5467681 L15.4185357,10.5467681 L14.7313532,11.6196168 C14.6473534,11.7509497 14.5002017,11.8281126 14.3444036,11.8225241 C14.1886055,11.8169356 14.0473606,11.729428 13.9729864,11.5924143 L13.1708921,10.115849 L11.9394042,13.1368588 C11.7705957,13.5509988 11.1634955,13.479306 11.0956162,13.0372008 L10.396485,8.46539068 L9.78684248,11.6864792 C9.70599748,12.1143475 9.11974411,12.1781592 8.94864762,11.7780018 L8.15367179,9.91805838 L7.75453138,10.3904169 C7.67088986,10.4895664 7.54784275,10.5467681 7.41793145,10.5467681 L6.44474069,10.5467681 C6.24527423,10.8922541 5.8386268,11.060693 5.45328718,10.9574416 C5.06794756,10.8541901 4.8,10.5049941 4.8,10.1060611 C4.8,9.70712821 5.06794756,9.35793214 5.45328718,9.2546807 C5.8386268,9.15142927 6.24527423,9.31986815 6.44474069,9.6653542 L7.21353088,9.6653542 L7.94139011,8.80351599 C8.04003843,8.68670104 8.19219714,8.62938263 8.34339939,8.65207851 C8.49460164,8.67477439 8.62322675,8.77423924 8.68323196,8.91486854 L9.18991147,10.1000867 L10.0092933,5.77004889 C10.1013244,5.28319929 10.802998,5.2954023 10.8777415,5.78530266 L11.7255971,11.3264901 L12.7059063,8.92147851 C12.846241,8.57725168 13.3236841,8.55081181 13.5011363,8.87749679 L14.3914483,10.5162605 L14.8060967,9.86848361 C14.8870846,9.74190553 15.0270019,9.66533439 15.1772718,9.6653542 L15.8886061,9.6653542 C16.0443893,9.29876579 16.4266137,9.08215459 16.8211538,9.1368681 C17.2156939,9.1915816 17.5245501,9.50402956 17.5746985,9.89917587 C17.6248469,10.2943222 17.403831,10.6740167 17.035466,10.8255511 C16.6671011,10.9770856 16.2428849,10.8628205 16.0004671,10.5467681 L16.0007214,10.5467681 Z" id="路径" fill="#FF8057" fill-rule="nonzero"></path>
+                        <rect id="矩形" stroke="#FF8057" x="3.3" y="3.91132219" width="15" height="11" rx="2"></rect>
                     </g>
                 </g>
             </g>

src/page-orchestra/evaluat-model/evaluat-result/img/icon-badge.svg

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="78px" height="87px" viewBox="0 0 78 87" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>徽章</title>
-    <defs>
-        <path d="M3.68074224,3.34475119 L26.209171,3.34475119 L26.209171,20.9920204 C26.209171,23.1071787 24.4944964,24.8218533 22.3793381,24.8218533 C21.7507061,24.8218533 21.1317391,24.6671115 20.5770638,24.3712847 L19.1802507,23.6263177 C16.5331919,22.214553 13.3567213,22.214553 10.7096625,23.6263177 L9.31284943,24.3712847 C7.44653328,25.3666533 5.12667942,24.6606108 4.13131081,22.7942947 C3.835484,22.2396194 3.68074224,21.6206524 3.68074224,20.9920204 L3.68074224,3.34475119 L3.68074224,3.34475119 Z" id="path-1"></path>
-        <path d="M4.41275563,3.95453496 L26.9411844,3.95453496 L26.9411844,21.6018042 C26.9411844,23.7169625 25.2265098,25.431637 23.1113515,25.431637 C22.4827195,25.431637 21.8637525,25.2768953 21.3090772,24.9810685 L19.9122641,24.2361015 C17.2652053,22.8243368 14.0887347,22.8243368 11.4416759,24.2361015 L10.0448628,24.9810685 C8.17854667,25.9764371 5.85869282,25.2703946 4.86332421,23.4040785 C4.5674974,22.8494032 4.41275563,22.2304361 4.41275563,21.6018042 L4.41275563,3.95453496 L4.41275563,3.95453496 Z" id="path-3"></path>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-5">
-            <stop stop-color="#FDB927" offset="0%"></stop>
-            <stop stop-color="#FFBF69" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-6">
-            <stop stop-color="#FFE593" offset="0%"></stop>
-            <stop stop-color="#FFEEB9" offset="100%"></stop>
-        </linearGradient>
-    </defs>
-    <g id="修改" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="评测" transform="translate(-219.000000, -63.000000)">
-            <g id="编组-10" transform="translate(211.000000, 63.000000)">
-                <g id="徽章" transform="translate(47.000000, 43.047686) rotate(-14.000000) translate(-47.000000, -43.047686) translate(16.000000, 6.411322)">
-                    <g id="矩形" transform="translate(4.131729, 41.943117)">
-                        <mask id="mask-2" fill="white">
-                            <use xlink:href="#path-1"></use>
-                        </mask>
-                        <use id="蒙版" fill="#FA753E" transform="translate(14.944957, 15.359913) rotate(22.000000) translate(-14.944957, -15.359913) " xlink:href="#path-1"></use>
-                        <polygon fill="#FFA673" mask="url(#mask-2)" transform="translate(15.929541, 12.922980) rotate(22.000000) translate(-15.929541, -12.922980) " points="12.1748032 1.28329221 19.6842795 1.28329221 19.6842795 24.5626686 12.1748032 24.5626686"></polygon>
-                    </g>
-                    <g id="矩形备份" transform="translate(29.308827, 41.333333)">
-                        <mask id="mask-4" fill="white">
-                            <use xlink:href="#path-3"></use>
-                        </mask>
-                        <use id="蒙版" fill="#FA753E" transform="translate(15.676970, 15.969697) rotate(-29.000000) translate(-15.676970, -15.969697) " xlink:href="#path-3"></use>
-                        <polygon id="矩形" fill="#FFA673" mask="url(#mask-4)" transform="translate(14.402737, 13.670919) rotate(-29.000000) translate(-14.402737, -13.670919) " points="10.6479987 2.03123121 18.1574749 2.03123121 18.1574749 25.3106076 10.6479987 25.3106076"></polygon>
-                    </g>
-                    <g id="编组-7" transform="translate(-0.000000, 0.000000)">
-                        <path d="M29.6849268,58.2640829 L24.274802,58.5609751 C20.088091,58.79073 16.0757964,56.8585107 13.6450543,53.4419584 L10.5040164,49.0270432 C9.9953911,48.3121402 9.44794612,47.6256659 8.86414698,46.970712 L5.25886961,42.9260154 C2.4688684,39.7959627 1.47791348,35.4543055 2.63353872,31.4236893 L4.12685332,26.2152724 C4.36866433,25.3718783 4.56404519,24.5158589 4.71211593,23.6510693 L5.62653338,18.3105229 C6.33416986,14.1776561 9.11076385,10.6959174 12.9825471,9.08637347 L17.9857178,7.006499 C18.7958765,6.6697069 19.5869574,6.28874241 20.3553978,5.86532128 L25.100935,3.2504654 C28.7733445,1.2269176 33.2266555,1.2269176 36.899065,3.2504654 L41.6446022,5.86532128 C42.4130426,6.28874241 43.2041235,6.6697069 44.0142822,7.006499 L49.0174529,9.08637347 C52.8892362,10.6959174 55.6658301,14.1776561 56.3734666,18.3105229 L57.2878841,23.6510693 C57.4359548,24.5158589 57.6313357,25.3718783 57.8731467,26.2152724 L59.3664613,31.4236893 C60.5220865,35.4543055 59.5311316,39.7959627 56.7411304,42.9260154 L53.135853,46.970712 C52.5520539,47.6256659 52.0046089,48.3121402 51.4959836,49.0270432 L48.3549457,53.4419584 C45.9242036,56.8585107 41.911909,58.79073 37.725198,58.5609751 L32.3150732,58.2640829 C31.4390168,58.2160074 30.5609832,58.2160074 29.6849268,58.2640829 Z" id="星形" fill="url(#linearGradient-5)"></path>
-                        <path d="M27.2931075,52.5100945 L25.5367564,52.796914 C22.2564324,53.3326045 18.991192,51.7601475 17.3647631,48.8614894 L16.4939406,47.3094898 C15.2767176,45.1401277 13.7156354,43.1825924 11.8715212,41.5131593 L10.5522098,40.3188178 C8.08814151,38.0881547 7.28169372,34.5548761 8.53389413,31.475999 L9.20434726,29.8275066 C10.1414968,27.5232682 10.6986406,25.0822617 10.8540696,22.5996007 L10.9652662,20.8234617 C11.1729474,17.5061799 13.4325639,14.6727104 16.6204611,13.7320717 L18.327325,13.2284349 C20.7131543,12.5244587 22.9689836,11.4381086 25.0069145,10.0117141 L26.4648858,8.99124657 C29.1879283,7.08532683 32.8120717,7.08532683 35.5351142,8.99124657 L36.9930855,10.0117141 C39.0310164,11.4381086 41.2868457,12.5244587 43.672675,13.2284349 L45.3795389,13.7320717 C48.5674361,14.6727104 50.8270526,17.5061799 51.0347338,20.8234617 L51.1459304,22.5996007 C51.3013594,25.0822617 51.8585032,27.5232682 52.7956527,29.8275066 L53.4661059,31.475999 C54.7183063,34.5548761 53.9118585,38.0881547 51.4477902,40.3188178 L50.1284788,41.5131593 C48.2843646,43.1825924 46.7232824,45.1401277 45.5060594,47.3094898 L44.6352369,48.8614894 C43.008808,51.7601475 39.7435676,53.3326045 36.4632436,52.796914 L34.7068925,52.5100945 C32.2518908,52.1091826 29.7481092,52.1091826 27.2931075,52.5100945 Z" id="星形" fill="url(#linearGradient-6)"></path>
-                        <path d="M30.1394164,18.3657398 C31.0076456,18.1454972 31.9598946,18.256473 32.7903706,18.7508702 C33.2910341,19.0489241 33.7093657,19.4672557 34.0074197,19.9679192 L34.0074197,19.9679192 L36.262776,23.7564102 L40.5627885,24.7306735 C41.5053953,24.944242 42.2721998,25.5196588 42.7499605,26.2773352 C43.2277212,27.0350116 43.4164382,27.9749476 43.2028697,28.9175544 C43.0741171,29.4858174 42.8055316,30.012946 42.4214761,30.4511256 L42.4214761,30.4511256 L39.5153505,33.7668051 L39.917548,38.1574239 C40.0057138,39.1198925 39.6954155,40.0269805 39.1224586,40.7154928 C38.5495017,41.4040052 37.7138862,41.8739418 36.7514176,41.9621076 C36.1711806,42.0152596 35.5868541,41.9227113 35.0514408,41.6928578 L35.0514408,41.6928578 L31,39.9535693 L26.9485592,41.6928578 C26.060442,42.0741276 25.1018625,42.059322 24.269995,41.7271696 C23.4381274,41.3950172 22.7329717,40.745518 22.3517019,39.8574007 C22.1218483,39.3219874 22.0293001,38.7376609 22.082452,38.1574239 L22.082452,38.1574239 L22.4846495,33.7668051 L19.5785239,30.4511256 C18.9414714,29.7242948 18.6593351,28.8080564 18.7181695,27.9142626 C18.777004,27.0204688 19.1768093,26.1491196 19.9036402,25.5120671 C20.3418199,25.1280115 20.8689485,24.8594261 21.4372115,24.7306735 L21.4372115,24.7306735 L25.737224,23.7564102 L27.9925803,19.9679192 C28.4869775,19.1374432 29.2711871,18.5859824 30.1394164,18.3657398 Z" id="星形" stroke="#FFDB86" stroke-width="3" fill="#FF9F21"></path>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

src/page-orchestra/evaluat-model/evaluat-result/img/integrity.svg

@@ -2,7 +2,7 @@
 <svg width="23px" height="21px" viewBox="0 0 23 21" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>编组备份 11</title>
     <g id="修改" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="评测" transform="translate(-482.000000, -163.000000)" fill="#2DC7AA" fill-rule="nonzero">
+        <g id="评测" transform="translate(-482.000000, -163.000000)" fill="#FF8057" fill-rule="nonzero">
             <g id="编组-10" transform="translate(211.000000, 63.000000)">
                 <g id="编组-4" transform="translate(18.000000, 34.411322)">
                     <g id="编组" transform="translate(253.200000, 65.588678)">

src/page-orchestra/evaluat-model/evaluat-result/img/intonation.svg

@@ -2,7 +2,7 @@
 <svg width="23px" height="21px" viewBox="0 0 23 21" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>编组备份</title>
     <g id="修改" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="评测" transform="translate(-261.000000, -163.000000)" fill="#2DC7AA" fill-rule="nonzero">
+        <g id="评测" transform="translate(-261.000000, -163.000000)" fill="#FF8057" fill-rule="nonzero">
             <g id="编组-10" transform="translate(211.000000, 63.000000)">
                 <g id="编组-4" transform="translate(18.000000, 34.411322)">
                     <g id="编组备份" transform="translate(32.200000, 65.588678)">

src/page-orchestra/evaluat-model/evaluat-result/index.tsx

@@ -1,14 +1,10 @@
-import { Popup } from "@varlet/ui";
 import { defineComponent, ref } from "vue";
 import styles from "./index.module.less";
 import state from "/src/state";
-import icon1 from "../icons/1.png";
 import { storeData } from "/src/store";
-import { Progress } from "vant";
 import { evaluatingData } from "/src/view/evaluating";
-import icons from "../icons/index.json";
-import imgs from "./index.json";
-import iconBadge from "./img/icon-badge.svg";
+import imgs from "./img/index.json";
+import iconBack from '../sound-effect/icons/back.png'
 
 export default defineComponent({
 	name: "evaluatResult",
@@ -17,7 +13,7 @@ export default defineComponent({
 		return () => (
 			<div class={styles.evaluatResult}>
 				<div class={styles.closeBtn} onClick={() => emit("close")}>
-					<img src={icons["arrow-left-background"]} />
+					<img src={iconBack} />
 				</div>
 
 				<div class={styles.headerButton}>
@@ -32,7 +28,7 @@ export default defineComponent({
 				<div class={styles.fraction}>
 					<img class={styles.bg} src={imgs.bg} />
 					<div class={styles.top}>
-						{evaluatingData.resultData.score > 79 && <img style={{}} class={styles.badge} src={iconBadge} />}
+						{/* {evaluatingData.resultData.score > 79 && <img style={{}} class={styles.badge} src={iconBadge} />} */}
 						<div class={styles.text}>
 							<div>
 								<span class={styles.num}>{evaluatingData.resultData.score}</span>分
@@ -43,7 +39,7 @@ export default defineComponent({
 					</div>
 					{state.isPercussion ? (
 						<div class={styles.percussion}>
-							<img class={styles.leftIcon} src={evaluatingData.resultData.img || icon1} />
+							<img class={styles.leftIcon} src={evaluatingData.resultData.img} />
 							<div class={styles.scoreDes}>
 								<span class={styles.scoreNum}>{evaluatingData.resultData.score}</span>分
 								<span style={{ marginLeft: "8px" }}>{evaluatingData.resultData.mome}</span>

src/page-orchestra/evaluat-model/icons/arrow-left-background.svg

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="15px" height="24px" viewBox="0 0 15 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>形状</title>
-    <g id="确定版" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g transform="translate(-40.000000, -22.000000)" fill="#494949" fill-rule="nonzero" id="形状" stroke="#494949">
-            <path d="M42.2681508,32.7499394 C42.5890877,32.7499394 42.9114702,32.8699082 43.168798,33.0950183 L53.620931,42.6520856 C53.8607785,42.8704624 53.997204,43.1690827 53.9999596,43.4816468 C54.0026326,43.7942108 53.8714111,44.0948519 53.6353876,44.3168215 C53.138464,44.7783404 52.3366638,44.7837362 51.8326476,44.3289532 L41.379069,34.7718859 C41.1392215,34.5535091 41.002796,34.2548888 41.0000404,33.9423247 C40.9973673,33.6297606 41.1285889,33.3291196 41.3646123,33.1071499 C41.5948722,32.8710256 41.9246144,32.7409471 42.2667051,32.7512873 L42.2681508,32.7499394 Z M52.7106158,23 C53.0356188,23 53.3591643,23.117702 53.6185837,23.3424057 C53.8599334,23.5590403 53.9971822,23.8550613 53.9999596,24.1648752 C54.0026536,24.474689 53.8706502,24.7727125 53.6331578,24.9929083 L43.1980856,34.5695682 C42.6976948,35.027014 41.8904764,35.0329595 41.3821498,34.5829434 C41.1403528,34.3662582 41.0028184,34.0699512 41.0000404,33.7598084 C40.9973456,33.4496656 41.1296337,33.1513535 41.3675757,32.9311033 L51.8026479,23.3544434 C52.0474932,23.117702 52.3856129,23 52.7106158,23 Z"></path>
-        </g>
-    </g>
-</svg>

src/page-orchestra/evaluat-model/icons/close.svg

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 62 (91390) - https://sketch.com -->
-    <title>编组</title>
-    <desc>Created with Sketch.</desc>
-    <g id="智能打分" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="81-100备份" transform="translate(-493.000000, -57.000000)" fill="#DBDBDB" fill-rule="nonzero">
-            <g id="弹窗" transform="translate(143.000000, 40.000000)">
-                <g id="编组" transform="translate(350.000000, 17.000000)">
-                    <path d="M1.05548433,1.07092551 L0.973890205,1.16134969 C0.666012474,1.54828454 0.694001358,2.11481906 1.05785686,2.46909941 L6.537,7.949 L1.05548433,13.4315873 C0.672191496,13.8148801 0.672191496,14.4441272 1.05548433,14.8274201 L1.08636669,14.8583024 L1.17896103,14.9399506 C1.56501142,15.2393273 2.12839072,15.2121112 2.48219949,14.8583024 L7.964,9.376 L13.4470285,14.8583024 C13.8303213,15.2415953 14.4595684,15.2415953 14.8428613,14.8583024 L14.8737436,14.8274201 L14.9553918,14.7348257 C15.2547684,14.3487753 15.2275524,13.785396 14.8737436,13.4315873 L9.391,7.949 L14.8737436,2.46675831 C15.2570364,2.08346548 15.2570364,1.45421835 14.8737436,1.07092551 L14.8428613,1.04004316 L14.7502669,0.958394979 C14.3642165,0.659018325 13.8008372,0.686234384 13.4470285,1.04004316 L7.964,6.53 L2.48231995,1.0401637 C2.09890665,0.65675032 1.46965952,0.65675032 1.08636669,1.04004316 L1.05548433,1.07092551 Z" id="路径"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

src/page-orchestra/evaluat-model/icons/close2.svg

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g transform="translate(-493.000000, -57.000000)" fill="#01C1B5" fill-rule="nonzero">
-            <g transform="translate(143.000000, 40.000000)">
-                <g transform="translate(350.000000, 17.000000)">
-                    <path d="M1.05548433,1.07092551 L0.973890205,1.16134969 C0.666012474,1.54828454 0.694001358,2.11481906 1.05785686,2.46909941 L6.537,7.949 L1.05548433,13.4315873 C0.672191496,13.8148801 0.672191496,14.4441272 1.05548433,14.8274201 L1.08636669,14.8583024 L1.17896103,14.9399506 C1.56501142,15.2393273 2.12839072,15.2121112 2.48219949,14.8583024 L7.964,9.376 L13.4470285,14.8583024 C13.8303213,15.2415953 14.4595684,15.2415953 14.8428613,14.8583024 L14.8737436,14.8274201 L14.9553918,14.7348257 C15.2547684,14.3487753 15.2275524,13.785396 14.8737436,13.4315873 L9.391,7.949 L14.8737436,2.46675831 C15.2570364,2.08346548 15.2570364,1.45421835 14.8737436,1.07092551 L14.8428613,1.04004316 L14.7502669,0.958394979 C14.3642165,0.659018325 13.8008372,0.686234384 13.4470285,1.04004316 L7.964,6.53 L2.48231995,1.0401637 C2.09890665,0.65675032 1.46965952,0.65675032 1.08636669,1.04004316 L1.05548433,1.07092551 Z" id="路径"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

src/page-orchestra/evaluat-model/icons/task-bg.svg

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="208px" height="70px" viewBox="0 0 208 70" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>矩形</title>
-    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="曲谱评测" transform="translate(-582.000000, -215.000000)" fill="#FFE1B8" stroke="#FFFFFF" stroke-width="2">
-            <path d="M591,216.506546 L781,216.506546 C785.418278,216.506546 789,220.088268 789,224.506546 L789,278.353946 C789,281.11537 786.761424,283.353946 784,283.353946 C783.212178,283.353946 782.435504,283.167782 781.733289,282.810629 L768.300488,275.978581 L768.300488,275.978581 L591,275.978581 C586.581722,275.978581 583,272.396859 583,267.978581 L583,224.506546 C583,220.088268 586.581722,216.506546 591,216.506546 Z" id="矩形"></path>
-        </g>
-    </g>
-</svg>

src/page-orchestra/evaluat-model/index.module.less

@@ -63,7 +63,7 @@
             padding: 10px;
             font-size: 11px;
             font-weight: 400;
-            color: #6F4900;
+            color: #fff;
             line-height: 18px;
         }
     }

src/page-orchestra/evaluat-model/index.tsx

@@ -17,7 +17,6 @@ import state from "/src/state";
 import { storeData } from "/src/store";
 import { browser } from "/src/utils";
 import { getNoteByMeasuresSlursStart } from "/src/helpers/formateMusic";
-import { Icon } from "vant";
 import EvaluatResult from "./evaluat-result";
 import EvaluatAudio from "./evaluat-audio";
 import { api_openWebView, api_proxyServiceMessage, api_videoUpdate } from "/src/helpers/communication";
@@ -25,7 +24,6 @@ import EvaluatShare from "./evaluat-share";
 import { Vue3Lottie } from "vue3-lottie";
 import startData from "./data/start.json";
 import startingData from "./data/starting.json";
-import iconTastBg from "./icons/task-bg.svg";
 import iconEvaluat from "./icons/evaluating.json";
 
 // frequency 频率, amplitude 振幅, decibels 分贝
@@ -226,7 +224,7 @@ export default defineComponent({
 
 				<div style={{ display: !evaluatingData.startBegin ? "" : "none" }} class={styles.dialogueBox} key="start">
 					<div class={styles.dialogue}>
-						<img class={styles.dialoguebg} src={iconTastBg} />
+						<img class={styles.dialoguebg} src={iconEvaluat["task-bg"]} />
 						<div>演奏前请调整好乐器，保证最佳演奏状态。</div>
 					</div>
 					<Vue3Lottie class={styles.dialogueIcon} animationData={startData}></Vue3Lottie>

src/page-orchestra/evaluat-model/sound-effect/index.module.less

@@ -56,6 +56,7 @@
   flex: 1;
   display: flex;
   justify-content: center;
+  align-items: center;
   background-image: url('./icons/bg-note.png');
   background-repeat: no-repeat;
   background-size: 76%;
@@ -64,7 +65,7 @@
 
 .heiban {
   position: relative;
-  width: 60%;
+  width: 70%;
   height: 61vh;
   background-image: url('./icons/content-bg.png');
   background-repeat: no-repeat;

src/page-orchestra/evaluat-model/sound-effect/index.tsx

@@ -1,6 +1,6 @@
 import { defineComponent, reactive, ref, watch } from "vue";
 import { Popover, Icon } from "vant";
-import icons from "../icons/index.json";
+import iconBack from "./icons/back.png";
 import iconChild from "./icons/child.png";
 import DotIcon from "./icons/dot.png";
 import DotActiveIcon from "./icons/dot-active.png";
@@ -24,41 +24,41 @@ export default defineComponent({
 		watch(
 			() => evaluatingData.soundEffectFrequency,
 			() => {
-        // console.log('吹奏',evaluatingData.soundEffectFrequency , scoreData.frequency)
+				// console.log('吹奏',evaluatingData.soundEffectFrequency , scoreData.frequency)
 				const trend =
 					Math.abs(evaluatingData.soundEffectFrequency - scoreData.frequency) <= 10 ? 1 : evaluatingData.soundEffectFrequency > scoreData.frequency ? 2 : 0;
 				soundEffectData.step = trend;
 				if (trend !== 1) {
 					soundEffectData.time = Date.now();
 				}
-        // 持续时间达到3秒钟,效音成功
+				// 持续时间达到3秒钟,效音成功
 				if (Date.now() - soundEffectData.time > 3000) {
 					// console.log("效音完成");
-          emit('close')
+					emit("close");
 				}
 			}
 		);
 
 		/** 跳过本次 */
-		const handleSelect = (e: {text: string}) => {
-      if (e.text === '关闭校音'){
-        emit('close', true)
-        return
-      } 
-      emit('close')
+		const handleSelect = (e: { text: string }) => {
+			if (e.text === "关闭校音") {
+				emit("close", true);
+				return;
+			}
+			emit("close");
 		};
 		return () => (
 			<div class={styles["sound-effect"]}>
 				<div class={styles.top}>
-					<div class={styles.back} onClick={() => emit('close')}>
-						<img src={icons["arrow-left-background"]} />
+					<div class={styles.back} onClick={() => emit("close")}>
+						<img src={iconBack} />
 					</div>
 					<Popover trigger="click" class={styles.skibtns} actions={[{ text: "跳过本次" }, { text: "关闭校音" }]} onSelect={handleSelect}>
 						{{
 							reference: () => (
 								<div class={styles.rightSkipBtn}>
 									<span>跳过本次</span>
-									<Icon name="play" color="var(--van-primary-color)" class={styles.tran}/>
+									<Icon name="play" color="var(--van-primary-color)" class={styles.tran} />
 								</div>
 							),
 						}}

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

@@ -14,10 +14,6 @@ export default defineComponent({
 	name: "header-settting",
 	emits: ["close"],
 	setup(props, { emit }) {
-		// 设置改变触发
-		watch(state.setting, () => {
-			store.set("musicscoresetting", state.setting);
-		});
 		return () => (
 			<div class={styles["header-settting"]}>
 				<div class={styles.closeBtn} onClick={() => emit("close")}>

src/state.ts

@@ -12,6 +12,7 @@ import { toggleFollow } from "./view/follow-practice";
 /** 入门 | 进阶 | 大师 */
 export type IDifficulty = "BEGINNER" | "ADVANCED" | "PERFORMER";
 export type IMusicRenderType = 'staff' | 'firstTone' | 'fixedTone'
+export const musicscoresettingKey = "musicscoresetting"
 
 const state = reactive({
 	appName: "" as "GYM" | "COLEXIU",