Merge branch 'feature-gytaodi' into ktyq-online-1.8.7

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

@@ -157,7 +157,7 @@ export default defineComponent({
 							</Cell>
 							<Cell class={[state.modeType == "evaluating" && styles.disabled]} title="显示指法" center>
 								{{
-									extra: () => <Switch v-model={state.setting.displayFingering} disabled={!state.fingeringInfo.name}></Switch>,
+									extra: () => <Switch v-model={state.setting.displayFingering} disabled={!state.fingeringInfo.name || !state.isShowFingering}></Switch>,
 								}}
 							</Cell>
 						</Tab>

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

@@ -140,6 +140,10 @@ export default defineComponent({
       // });
       await getMusicDetail(id);
       detailData.isLoading = false;
+      // 如果后台设置了不显示指法，关闭指法开关
+      if (!state.isShowFingering) {
+        state.setting.displayFingering = false
+      }      
       // api_setEventTracking();
     });