fix:resolve conflicts
This commit is contained in:
@@ -133,7 +133,7 @@ async function init() {
|
||||
}
|
||||
}
|
||||
const initAudio = () => {
|
||||
nextTick(() => {
|
||||
_nextTick(() => {
|
||||
audioRef.volume = settingStore.articleSoundVolume / 100
|
||||
audioRef.playbackRate = settingStore.articleSoundSpeed
|
||||
})
|
||||
@@ -440,7 +440,7 @@ onUnmounted(() => {
|
||||
|
||||
const { playSentenceAudio } = usePlaySentenceAudio()
|
||||
function play2(e) {
|
||||
nextTick(() => {
|
||||
_nextTick(() => {
|
||||
if (settingStore.articleSound || e.handle) {
|
||||
playSentenceAudio(e.sentence, audioRef)
|
||||
}
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import {defineStore} from "pinia"
|
||||
import {checkAndUpgradeSaveSetting, cloneDeep} from "@/utils";
|
||||
import {DefaultShortcutKeyMap, WordPracticeMode, WordPracticeType} from "@/types/types.ts";
|
||||
import {get} from "idb-keyval";
|
||||
import {CAN_REQUEST, SAVE_SETTING_KEY} from "@/config/env.ts";
|
||||
import {getSetting} from "@/apis";
|
||||
import { defineStore } from "pinia"
|
||||
import { checkAndUpgradeSaveSetting, cloneDeep } from "@/utils";
|
||||
import { DefaultShortcutKeyMap, WordPracticeMode, WordPracticeType } from "@/types/types.ts";
|
||||
import { get } from "idb-keyval";
|
||||
import { AppEnv, SAVE_SETTING_KEY } from "@/config/env.ts";
|
||||
import { getSetting } from "@/apis";
|
||||
|
||||
export interface SettingState {
|
||||
soundType: string,
|
||||
|
||||
Reference in New Issue
Block a user