liushengqiang 2 лет назад
Родитель
Сommit
e8892b6a47

+ 16 - 1
src/page-gym/header-top/index.tsx

@@ -51,6 +51,21 @@ export default defineComponent({
 			};
 		});
 
+		/** 速度按钮 */
+		const speedBtn = computed(() => {
+			// 音频播放中 禁用
+			if (state.playState === "play") return { display: true, disabled: true };
+			// 评测模式 禁用
+			if (state.modeType === "evaluating") return { display: true, disabled: true };
+			// 跟练模式 不显示
+			if (state.modeType === "follow") return { display: false, disabled: true };
+
+			return {
+				disabled: false,
+				display: true,
+			};
+		});
+
 		/** 退出 */
 		const handleBack = () => {
 			handleNoEndExit();
@@ -158,7 +173,7 @@ export default defineComponent({
 							reference: () => (
 								<div
 									id="tips-step-8"
-									class={[styles.btn, disabledList.includes(state.modeType) && styles.disabled]}
+									class={[styles.btn, speedBtn.value.disabled && styles.disabled]}
 									onClick={(e: Event) => {
 										e.stopPropagation();
 										headData.speedShow = !headData.speedShow;

+ 3 - 0
src/page-gym/header-top/settting/index.module.less

@@ -50,6 +50,9 @@
         .van-tabs__line{
             bottom: 0;
         }
+        .van-cell__value{
+            overflow: visible;
+        }
     }
 }
 

+ 21 - 21
src/page-gym/header-top/settting/index.tsx

@@ -1,11 +1,11 @@
 import { defineComponent, onBeforeMount, watch } from "vue";
 import styles from "./index.module.less";
 import iconClose from "../image/close2.svg";
-import { Tab, Tabs } from "vant";
-import { Cell, Switch } from "@varlet/ui";
+import { Cell, Tab, Tabs } from "vant";
 import state from "/src/state";
 import { api_closeCamera, api_openCamera } from "/src/helpers/communication";
-import store from 'store'
+import store from "store";
+import { Switch } from "@varlet/ui";
 
 export default defineComponent({
 	name: "header-settting",
@@ -13,8 +13,8 @@ export default defineComponent({
 	setup(props, { emit }) {
 		// 设置改变触发
 		watch(state.setting, () => {
-			store.set('musicscoresetting', state.setting)
-		})
+			store.set("musicscoresetting", state.setting);
+		});
 		return () => (
 			<div class={styles["header-settting"]}>
 				<div class={styles.closeBtn} onClick={() => emit("close")}>
@@ -23,19 +23,19 @@ export default defineComponent({
 				<div class={styles.content}>
 					<Tabs border animated>
 						<Tab title="设置">
-							<Cell title="护眼模式">
+							<Cell title="护眼模式" center border={false}>
 								{{
-									extra: () => <Switch v-model={state.setting.eyeProtection}></Switch>,
+									value: () => <Switch v-model={state.setting.eyeProtection}></Switch>,
 								}}
 							</Cell>
-							<Cell title="校音提醒">
+							<Cell title="校音提醒" center border={false}>
 								{{
-									extra: () => <Switch v-model={state.setting.soundEffect}></Switch>,
+									value: () => <Switch v-model={state.setting.soundEffect}></Switch>,
 								}}
 							</Cell>
-							<Cell title="摄像头">
+							<Cell title="摄像头" center border={false}>
 								{{
-									extra: () => (
+									value: () => (
 										<Switch
 											v-model={state.setting.camera}
 											onChange={(value) => {
@@ -49,19 +49,19 @@ export default defineComponent({
 									),
 								}}
 							</Cell>
-							<Cell title="循环播放">
+							<Cell title="循环播放" center border={false}>
 								{{
-									extra: () => <Switch v-model={state.setting.repeatAutoPlay}></Switch>,
+									value: () => <Switch v-model={state.setting.repeatAutoPlay}></Switch>,
 								}}
 							</Cell>
-							<Cell title="显示指法">
+							<Cell title="显示指法" center border={false}>
 								{{
-									extra: () => <Switch v-model={state.setting.displayFingering}></Switch>,
+									value: () => <Switch v-model={state.setting.displayFingering}></Switch>,
 								}}
 							</Cell>
-							<Cell title="显示光标">
+							<Cell title="显示光标" center border={false}>
 								{{
-									extra: () => <Switch v-model={state.setting.displayCursor}></Switch>,
+									value: () => <Switch v-model={state.setting.displayCursor}></Switch>,
 								}}
 							</Cell>
 							<Cell title="选择调率"></Cell>
@@ -96,14 +96,14 @@ export default defineComponent({
 									大师级
 								</span>
 							</div>
-							<Cell title="保存到相册">
+							<Cell title="保存到相册" center border={false}>
 								{{
-									extra: () => <Switch v-model={state.setting.saveToAlbum}></Switch>,
+									value: () => <Switch v-model={state.setting.saveToAlbum}></Switch>,
 								}}
 							</Cell>
-							<Cell title="开启伴奏">
+							<Cell title="开启伴奏" center border={false}>
 								{{
-									extra: () => <Switch v-model={state.setting.enableAccompaniment}></Switch>,
+									value: () => <Switch v-model={state.setting.enableAccompaniment}></Switch>,
 								}}
 							</Cell>
 						</Tab>