Browse Source

feat: 速度逻辑修改

TIANYONG 7 months ago
parent
commit
e2116938ca

+ 1 - 1
src/page-instrument/header-top/index.tsx

@@ -754,7 +754,7 @@ export default defineComponent({
                   <span style={{ whiteSpace: "nowrap" }}>节拍</span>
                   <div class={styles.speedCon}>
                     <img src={headImg("speed.png")} />
-                    <div>{state.speed}</div>
+                    <div>{Math.floor(state.speed)}</div>
                   </div>
                 </div>
                 {

+ 9 - 5
src/page-instrument/header-top/speed/index.tsx

@@ -3,7 +3,7 @@ import { Switch, Slider } from "vant";
 import styles from "./index.module.less"
 import { headData } from "../index" 
 import { headImg } from "../image";
-import state, { handleSetSpeed } from "../../../state";
+import state, { handleSetSpeed, resetBaseRate } from "../../../state";
 import { metronomeData } from "../../../helpers/metronome"; 
 
 export default defineComponent({
@@ -22,11 +22,15 @@ export default defineComponent({
 			canSpeed = Math.max(canSpeed, 45);
 			speed.value = canSpeed;
 		};
+		// 重置当前小节的速度
+		const resetCurrentSpeed = () => {
+			resetBaseRate(state.activeNoteIndex);
+		};
 		watch(
 			() => speed.value,
 			() => {
 				// handleSetSpeed(speed.value);
-				state.speed = speed.value;
+				state.speed = Math.floor(speed.value);
 			}
 		);
 		watch(
@@ -57,11 +61,11 @@ export default defineComponent({
 						<div class={styles.spendCon}>
 							<img src={headImg("cutImg.png")} class={[styles.btn]} onClick={minusSpeed} />
 							<div class={styles.sliderCon}>
-								<Slider class={styles.slider} max={270} min={45} v-model={speed.value}>
+								<Slider class={styles.slider} max={270} min={speed.value < 45 ? speed.value : 45} v-model={speed.value}>
 									{{
 										button: () => 
 										<div class={styles.customButton}>
-											<div class={styles.speedVal}>{ speed.value }</div>
+											<div class={styles.speedVal}>{ Math.floor(speed.value) }</div>
 											<div class={styles.speedBtn}></div>
 										</div>
 									}}
@@ -70,7 +74,7 @@ export default defineComponent({
 							<img src={headImg("addImg.png")} class={[styles.btn]} onClick={plusSpeed} />	
 						</div>
 						<div class={styles.speedSel}>
-							<div onClick={()=>{ speed.value = state.originSpeed }}>原速</div>
+							<div onClick={resetCurrentSpeed}>原速</div>
 							<div onClick={()=>{ speed.value = 70 }}>70</div>
 							<div onClick={()=>{ speed.value = 80 }}>80</div>
 							<div onClick={()=>{ speed.value = 90 }}>90</div>

+ 3 - 2
src/state.ts

@@ -616,8 +616,9 @@ export const initSetPlayRate = () => {
 }
 
 // 重置播放倍率
-export const resetBaseRate = () => {
-  const currentItem: any = state.times[0];
+export const resetBaseRate = (idx?: number) => {
+  const index = idx ? idx : 0;
+  const currentItem: any = state.times[index];
   const currentSpeed = currentItem?.measureSpeed ? currentItem.measureSpeed : state.originSpeed;
   // console.log('速度2',currentSpeed)
   state.speed = currentSpeed

+ 2 - 2
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://dev.resource.colexiu.com", // 内容平台开发环境,内容平台开发,需在url链接上加上isCbs=true
-        target: "https://dev.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/, ""),