From 331afc37df1529e9d5d3300d308b6b84e5a668b4 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Mon, 25 Jan 2021 10:44:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E2=80=9C=E8=AE=B0=E4=BD=8F?= =?UTF-8?q?=E6=92=AD=E6=94=BE=E8=BF=9B=E5=BA=A6=E2=80=9D=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E7=9A=84=E6=8E=A7=E5=88=B6=EF=BC=8C=E4=BC=98=E5=8C=96=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E9=A1=B9=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- publish/changeLog.md | 2 + src/common/defaultSetting.js | 3 +- src/renderer/components/core/Player.vue | 37 +++++++-- src/renderer/lang/en-us/view/setting.json | 31 ++------ src/renderer/lang/zh-cn/view/setting.json | 35 +++------ src/renderer/lang/zh-tw/view/setting.json | 51 ++++++------ src/renderer/views/Setting.vue | 96 +++++++++-------------- 7 files changed, 113 insertions(+), 142 deletions(-) diff --git a/publish/changeLog.md b/publish/changeLog.md index 0e10af2c..e4e1f890 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -2,10 +2,12 @@ - 搜索界面新增搜索状态的提示 - 新增“稍后播放”功能，可在歌曲列表右键菜单使用 +- 新增“记住播放进度”功能的控制，该功能默认不再开启，可到播放设置-记住播放进度开启 ### 优化 - 优化播放歌曲换源匹配 +- 优化设置界面设置项的展示 ### 修复 diff --git a/src/common/defaultSetting.js b/src/common/defaultSetting.js index efc8341a..22e08246 100644 --- a/src/common/defaultSetting.js +++ b/src/common/defaultSetting.js @@ -2,7 +2,7 @@ const path = require('path') const os = require('os') const defaultSetting = { - version: '1.0.38', + version: '1.0.39', player: { togglePlayMethod: 'listLoop', highQuality: false, @@ -12,6 +12,7 @@ const defaultSetting = { mediaDeviceId: 'default', isMediaDeviceRemovedStopPlay: false, isShowLyricTransition: true, + isSavePlayTime: false, }, desktopLyric: { enable: false, diff --git a/src/renderer/components/core/Player.vue b/src/renderer/components/core/Player.vue index 88c3d6c9..ac73b076 100644 --- a/src/renderer/components/core/Player.vue +++ b/src/renderer/components/core/Player.vue @@ -303,14 +303,26 @@ export default { }, nowPlayTime(n, o) { if (Math.abs(n - o) > 2) this.isActiveTransition = true - if (this.playInfo.isTempPlay) return - this.savePlayInfo({ - time: n, - maxTime: this.maxPlayTime, - listId: this.listId, - list: this.listId == null ? this.list : null, - index: this.playIndex, - }) + if (this.setting.player.isSavePlayTime && !this.playInfo.isTempPlay) { + this.savePlayInfo({ + time: n, + maxTime: this.maxPlayTime, + listId: this.listId, + list: this.listId == null ? this.list : null, + index: this.playIndex, + }) + } + }, + maxPlayTime(maxPlayTime) { + if (!this.playInfo.isTempPlay) { + this.savePlayInfo({ + time: this.nowPlayTime, + maxTime: maxPlayTime, + listId: this.listId, + list: this.listId == null ? this.list : null, + index: this.playIndex, + }) + } }, }, methods: { @@ -495,6 +507,15 @@ export default { name: this.musicInfo.name, album: this.musicInfo.album, }) + if (!this.playInfo.isTempPlay) { + this.savePlayInfo({ + time: this.nowPlayTime, + maxTime: this.maxPlayTime, + listId: this.listId, + list: this.listId == null ? this.list : null, + index: this.playIndex, + }) + } }, clearDelayNextTimeout() { // console.log(this.delayNextTimeout) diff --git a/src/renderer/lang/en-us/view/setting.json b/src/renderer/lang/en-us/view/setting.json index 94b0bd17..2eaa537a 100644 --- a/src/renderer/lang/en-us/view/setting.json +++ b/src/renderer/lang/en-us/view/setting.json @@ -2,7 +2,6 @@ "basic": "General", "basic_theme": "Theme", "basic_show_animation": "Show switching animation", - "basic_animation_title": "Animation effect of the pop-up layer", "basic_animation": "Random pop-up animation", "basic_source_title": "Choose a music source", "basic_source_test": "Test API (Available for most software features)", @@ -21,8 +20,7 @@ "basic_window_size_larger": "Larger", "basic_window_size_oversized": "Oversized", "basic_window_size_huge": "Huge", - "basic_to_tray_title": "Minimize it to the system tray without closing the software when closing", - "basic_to_tray": "Minimize to system tray when closing", + "basic_to_tray": "Do not exit the software when closing the software and minimize it to the system tray", "basic_lang_title": "The language displayed in the software", "basic_lang": "Language", "basic_control_btn_position": "Control Button Position", @@ -30,21 +28,13 @@ "basic_control_btn_position_right": "Right", "play": "Play", - "play_toggle_title": "If none selected, it stopped when the music playing is done.", - "play_toggle": "Playback mode", - "play_toggle_list_loop": "Playlist repeat", - "play_toggle_random": "Playlist shuffle", - "play_toggle_list": "Play in order", - "play_toggle_single_loop": "Single repeat", + "play_save_play_time": "Remember playback progress", "play_lyric_transition": "Show lyrics translation", - "play_quality_title": "The 320k quality is preferred for playing", - "play_quality": "Prefer High Quality 320k", - "play_task_bar_title": "Show playing progress on the taskbar", - "play_task_bar": "Taskbar play progress bar", + "play_quality": "Play 320K quality songs first (if supported)", + "play_task_bar": "Show playing progress on the taskbar", "play_mediaDevice_title": "Select a media device for audio output", "play_mediaDevice": "Audio output", - "play_mediaDevice_remove_stop_play": "Whether to pause playback when the audio output device is changed", - "play_mediaDevice_remove_stop_play_title": "Whether to pause the song when the current sound output device is changed", + "play_mediaDevice_remove_stop_play": "Pause the song when the current sound output device is changed", "desktop_lyric": "Desktop Lyric Settings", "desktop_lyric_enable": "Display lyrics", @@ -53,18 +43,13 @@ "desktop_lyric_lock_screen": "It is not allowed to drag the lyrics window out of the main screen", "search": "Search", - "search_hot_title": "Select whether to show popular searches", "search_hot": "Top Searches", - "search_history_title": "Select whether to show search history", "search_history": "Search history", - "search_focus_search_box_title": "Whether the search box is automatically focused on startup", - "search_focus_search_box": "Whether the search box is focused on startup", + "search_focus_search_box": "Automatically focus the search box on startup", "list": "List", - "list_source_title": "Select whether to show music source", - "list_source": "Select whether to show music source (for Your Library only)", - "list_scroll_title": "Select whether to remember the playlist scrollbar position", - "list_scroll": "Remember playlist scrolling position (for Your library only)", + "list_source": "Show song source (only valid for my music category)", + "list_scroll": "Remember the position of the scroll bar of the playlist (only valid for my music classification)", "download": "Download", "download_enable": "Whether to enable download function", diff --git a/src/renderer/lang/zh-cn/view/setting.json b/src/renderer/lang/zh-cn/view/setting.json index 8dc8da08..00e1dcdd 100644 --- a/src/renderer/lang/zh-cn/view/setting.json +++ b/src/renderer/lang/zh-cn/view/setting.json @@ -1,7 +1,6 @@ { "basic": "基本设置", "basic_theme": "主题颜色", - "basic_animation_title": "弹出层的动画效果", "basic_animation": "弹出层随机动画", "basic_show_animation": "显示切换动画", "basic_source_title": "选择音乐来源", @@ -21,8 +20,7 @@ "basic_window_size_larger": "较大", "basic_window_size_oversized": "超大", "basic_window_size_huge": "巨大", - "basic_to_tray_title": "关闭时不退出软件将其最小化到系统托盘", - "basic_to_tray": "关闭时最小化到系统托盘", + "basic_to_tray": "关闭软件时不退出软件将其最小化到系统托盘", "basic_lang_title": "软件显示的语言", "basic_lang": "语言", "basic_control_btn_position": "控制按钮位置", @@ -30,21 +28,13 @@ "basic_control_btn_position_right": "右边", "play": "播放设置", - "play_toggle_title": "都不选时播放完当前歌曲就停止播放", - "play_toggle": "歌曲切换方式", - "play_toggle_list_loop": "列表循环", - "play_toggle_random": "列表随机", - "play_toggle_list": "顺序播放", - "play_toggle_single_loop": "单曲循环", + "play_save_play_time": "记住播放进度", "play_lyric_transition": "显示歌词翻译", - "play_quality_title": "启用时将优先播放320K品质的歌曲", - "play_quality": "优先播放高品质音乐", - "play_task_bar_title": "在任务栏上显示当前歌曲播放进度", - "play_task_bar": "任务栏播放进度条", + "play_quality": "优先播放320K品质的歌曲（如果支持）", + "play_task_bar": "在任务栏上显示当前歌曲播放进度", "play_mediaDevice_title": "选择声音输出的媒体设备", "play_mediaDevice": "音频输出", - "play_mediaDevice_remove_stop_play": "音频输出设备被改变时是否暂停播放", - "play_mediaDevice_remove_stop_play_title": "当前的声音输出设备被改变时是否暂停播放歌曲", + "play_mediaDevice_remove_stop_play": "当前的声音输出设备被改变时暂停播放歌曲", "desktop_lyric": "桌面歌词设置", "desktop_lyric_enable": "显示歌词", @@ -53,18 +43,13 @@ "desktop_lyric_lock_screen": "不允许歌词窗口拖出主屏幕之外", "search": "搜索设置", - "search_hot_title": "是否显示热门搜索", - "search_hot": "热门搜索", - "search_history_title": "是否显示历史搜索记录", - "search_history": "搜索历史", - "search_focus_search_box_title": "启动时是否自动聚焦搜索框", - "search_focus_search_box": "启动时是否聚焦搜索框", + "search_hot": "显示热门搜索", + "search_history": "显示历史搜索记录", + "search_focus_search_box": "启动时自动聚焦搜索框", "list": "列表设置", - "list_source_title": "是否显示歌曲源", - "list_source": "是否显示歌曲源（仅对我的音乐分类有效）", - "list_scroll_title": "是否记住播放列表滚动条位置", - "list_scroll": "记住列表滚动位置（仅对我的音乐分类有效）", + "list_source": "显示歌曲源（仅对我的音乐分类有效）", + "list_scroll": "记住播放列表滚动条位置（仅对我的音乐分类有效）", "download": "下载设置", "download_enable": "是否启用下载功能", diff --git a/src/renderer/lang/zh-tw/view/setting.json b/src/renderer/lang/zh-tw/view/setting.json index 3fc2e3bb..0ba303c2 100644 --- a/src/renderer/lang/zh-tw/view/setting.json +++ b/src/renderer/lang/zh-tw/view/setting.json @@ -1,7 +1,6 @@ { "basic": "基本設置", "basic_theme": "主題顏色", - "basic_animation_title": "彈出層的動畫效果", "basic_animation": "彈出層隨機動畫", "basic_show_animation": "顯示切換動畫", "basic_source_title": "選擇音樂來源", @@ -21,46 +20,37 @@ "basic_window_size_larger": "較大", "basic_window_size_oversized": "超大", "basic_window_size_huge": "巨大", - "basic_to_tray_title": "關閉時不退出軟件將其最小化到系統托盤", - "basic_to_tray": "關閉時最小化到系統托盤", + "basic_to_tray": "關閉軟件時不退出軟件將其最小化到系統托盤", "basic_lang_title": "軟件顯示的語言", "basic_lang": "語言", "basic_control_btn_position": "控制按鈕位置", "basic_control_btn_position_left": "左邊", "basic_control_btn_position_right": "右邊", + "play": "播放設置", - "play_toggle_title": "都不選時播放完當前歌曲就停止播放", - "play_toggle": "歌曲切換方式", - "play_toggle_list_loop": "列表循環", - "play_toggle_random": "列表隨機", - "play_toggle_list": "順序播放", - "play_toggle_single_loop": "單曲循環", + "play_save_play_time": "記住播放進度", "play_lyric_transition": "顯示歌詞翻譯", - "play_quality_title": "啟用時將優先播放320K品質的歌曲", - "play_quality": "優先播放高品質音樂", - "play_task_bar_title": "在任務欄上顯示當前歌曲播放進度", - "play_task_bar": "任務欄播放進度條", + "play_quality": "優先播放320K品質的歌曲（如果支持）", + "play_task_bar": "在任務欄上顯示當前歌曲播放進度", "play_mediaDevice_title": "選擇聲音輸出的媒體設備", "play_mediaDevice": "音頻輸出", - "play_mediaDevice_remove_stop_play": "音頻輸出設備被改變時是否暫停播放", - "play_mediaDevice_remove_stop_play_title": "當前的聲音輸出設備被改變時是否暫停播放歌曲", + "play_mediaDevice_remove_stop_play": "當前的聲音輸出設備被改變時暫停播放歌曲", + "desktop_lyric": "桌面歌詞設置", "desktop_lyric_enable": "顯示歌詞", "desktop_lyric_lock": "鎖定歌詞", "desktop_lyric_always_on_top": "使歌詞總是在其他窗口之上", "desktop_lyric_lock_screen": "不允許歌詞窗口拖出主屏幕之外", + "search": "搜索設置", - "search_hot_title": "是否顯示熱門搜索", - "search_hot": "熱門搜索", - "search_history_title": "是否顯示歷史搜索記錄", - "search_history": "搜索歷史", - "search_focus_search_box_title": "啟動時是否自動聚焦搜索框", - "search_focus_search_box": "啟動時是否聚焦搜索框", + "search_hot": "顯示熱門搜索", + "search_history": "顯示歷史搜索記錄", + "search_focus_search_box": "啟動時自動聚焦搜索框", + "list": "列表設置", - "list_source_title": "是否顯示歌曲源", - "list_source": "是否顯示歌曲源（僅對我的音樂分類有效）", - "list_scroll_title": "是否記住播放列表滾動條位置", - "list_scroll": "記住列表滾動位置（僅對我的音樂分類有效）", + "list_source": "顯示歌曲源（僅對我的音樂分類有效）", + "list_scroll": "記住播放列表滾動條位置（僅對我的音樂分類有效）", + "download": "下載設置", "download_enable": "是否啟用下載功能", "download_path_title": "下載歌曲保存的路徑", @@ -79,6 +69,7 @@ "download_name2": "歌手 - 歌名", "download_name3": "歌名", "download_select_save_path": "選擇歌曲保存路徑", + "hot_key": "快捷鍵設置", "hot_key_local_title": "軟件內快捷鍵", "hot_key_global_title": "全局快捷鍵", @@ -98,15 +89,18 @@ "hot_key_desktop_lyric_toggle_visible": "開/關桌面歌詞", "hot_key_desktop_lyric_toggle_lock": "桌面歌詞鎖定切換", "hot_key_desktop_lyric_toggle_always_top": "桌面歌詞置頂切換", + "network": "網絡設置", "network_proxy_title": "HTTP代理設置（亂設置軟件將無法聯網）", "network_proxy_host": "主機", "network_proxy_port": "端口", "network_proxy_username": "用戶名", "network_proxy_password": "密碼", + "odc": "強迫症設置", "odc_clear_search_input": "離開搜索界面時清空搜索框", "odc_clear_search_list": "離開搜索界面時清空搜索列表", + "backup": "備份與恢復", "backup_part": "部分數據（列表數據包括試聽列表、收藏列表、用戶自定義列表，設置數據不包括快捷鍵設置）", "backup_part_import_list": "導入列表", @@ -121,7 +115,8 @@ "backup_part_import_setting_desc": "選擇配置文件", "backup_part_export_setting_desc": "選擇設置保存位置", "backup_part_import_list_desc": "選擇列表文件", - "backup_part_export_list_desc": "選擇列表保存位置", + "backup_part_export_list_desc": "選擇歌單保存位置", + "other": "其他", "other_tray_theme": "托盤圖標樣式", "other_tray_theme_native": "純色", @@ -130,6 +125,7 @@ "other_cache_label": "軟件已使用緩存大小：", "other_cache_label_title": "當前已用緩存", "other_cache_clear_btn": "清理緩存", + "update": "軟件更新", "update_latest_label": "最新版本：", "update_unknown": "未知", @@ -140,7 +136,10 @@ "update_open_version_modal_btn": "打開更新窗口 🚀", "update_checking": "檢查更新中...", "update_init": "處理更新中...", + "about": "關於洛雪音樂", + + "is_enable": "是否啟用", "is_show": "是否顯示", "click_open": "點擊打開", diff --git a/src/renderer/views/Setting.vue b/src/renderer/views/Setting.vue index 0deda88d..c8830bfb 100644 --- a/src/renderer/views/Setting.vue +++ b/src/renderer/views/Setting.vue @@ -21,14 +21,13 @@ div.scroll(:class="$style.setting" ref="dom_setting") label {{$t('store.state.theme_' + theme.class)}} dd - h3#basic_show_animation {{$t('view.setting.basic_show_animation')}} - div - material-checkbox(id="setting_show_animate" v-model="current_setting.isShowAnimation" :label="$t('view.setting.is_show')") + div(:class="[$style.gapTop, $style.top]") + material-checkbox(id="setting_show_animate" v-model="current_setting.isShowAnimation" :label="$t('view.setting.basic_show_animation')") + div(:class="$style.gapTop") + material-checkbox(id="setting_animate" v-model="current_setting.randomAnimate" :label="$t('view.setting.basic_animation')") + div(:class="$style.gapTop") + material-checkbox(id="setting_to_tray" v-model="current_setting.tray.isShow" @change="handleTrayShowChange" :label="$t('view.setting.basic_to_tray')") - dd(:tips="$t('view.setting.basic_animation_title')") - h3#basic_animation {{$t('view.setting.basic_animation')}} - div - material-checkbox(id="setting_animate" v-model="current_setting.randomAnimate" :label="$t('view.setting.is_enable')") dd(:tips="$t('view.setting.basic_source_title')") h3#basic_source {{$t('view.setting.basic_source')}} @@ -37,11 +36,6 @@ div.scroll(:class="$style.setting" ref="dom_setting") material-checkbox(:id="`setting_api_source_${item.id}`" name="setting_api_source" @change="handleAPISourceChange(item.id)" need v-model="current_setting.apiSource" :disabled="item.disabled" :value="item.id" :label="item.label") - dd(:tips="$t('view.setting.basic_to_tray_title')") - h3#basic_to_tray {{$t('view.setting.basic_to_tray')}} - div - material-checkbox(id="setting_to_tray" v-model="current_setting.tray.isShow" @change="handleTrayShowChange" :label="$t('view.setting.is_enable')") - dd(:tips="$t('view.setting.basic_window_size_title')") h3#basic_window_size {{$t('view.setting.basic_window_size')}} div @@ -68,27 +62,17 @@ div.scroll(:class="$style.setting" ref="dom_setting") name="setting_basic_control_btn_position" need v-model="current_setting.controlBtnPosition" :value="item.id" :label="item.name") dt#play {{$t('view.setting.play')}} - dd(:tips="$t('view.setting.play_toggle_title')") - h3#play_toggle {{$t('view.setting.play_toggle')}} - div - material-checkbox(:id="`setting_player_togglePlay_${item.value}`" :class="$style.gapLeft" :value="item.value" :key="item.value" - v-model="current_setting.player.togglePlayMethod" v-for="item in togglePlayMethods" :label="item.name") dd - h3#play_lyric_transition {{$t('view.setting.play_lyric_transition')}} - div - material-checkbox(id="setting_player_lyric_transition" v-model="current_setting.player.isShowLyricTransition" :label="$t('view.setting.is_show')") - dd(:tips="$t('view.setting.play_quality_title')") - h3#play_quality {{$t('view.setting.play_quality')}} - div - material-checkbox(id="setting_player_highQuality" v-model="current_setting.player.highQuality" :label="$t('view.setting.is_enable')") - dd(:tips="$t('view.setting.play_task_bar_title')") - h3#play_task_bar {{$t('view.setting.play_task_bar')}} - div - material-checkbox(id="setting_player_showTaskProgess" v-model="current_setting.player.isShowTaskProgess" :label="$t('view.setting.is_enable')") - dd(:tips="$t('view.setting.play_mediaDevice_remove_stop_play_title')") - h3#play_mediaDevice_remove_stop_play {{$t('view.setting.play_mediaDevice_remove_stop_play')}} - div - material-checkbox(id="setting_player_isMediaDeviceRemovedStopPlay" v-model="current_setting.player.isMediaDeviceRemovedStopPlay" :label="$t('view.setting.is_enable')") + div(:class="$style.gapTop") + material-checkbox(id="setting_player_save_play_time" v-model="current_setting.player.isSavePlayTime" :label="$t('view.setting.play_save_play_time')") + div(:class="$style.gapTop") + material-checkbox(id="setting_player_lyric_transition" v-model="current_setting.player.isShowLyricTransition" :label="$t('view.setting.play_lyric_transition')") + div(:class="$style.gapTop") + material-checkbox(id="setting_player_highQuality" v-model="current_setting.player.highQuality" :label="$t('view.setting.play_quality')") + div(:class="$style.gapTop") + material-checkbox(id="setting_player_showTaskProgess" v-model="current_setting.player.isShowTaskProgess" :label="$t('view.setting.play_task_bar')") + div(:class="$style.gapTop") + material-checkbox(id="setting_player_isMediaDeviceRemovedStopPlay" v-model="current_setting.player.isMediaDeviceRemovedStopPlay" :label="$t('view.setting.play_mediaDevice_remove_stop_play')") dd(:tips="$t('view.setting.play_mediaDevice_title')") h3#play_mediaDevice {{$t('view.setting.play_mediaDevice')}} div @@ -103,29 +87,22 @@ div.scroll(:class="$style.setting" ref="dom_setting") material-checkbox(id="setting_desktop_lyric_alwaysOnTop" v-model="current_setting.desktopLyric.isAlwaysOnTop" :label="$t('view.setting.desktop_lyric_always_on_top')") div(:class="$style.gapTop") material-checkbox(id="setting_desktop_lyric_lockScreen" v-model="current_setting.desktopLyric.isLockScreen" :label="$t('view.setting.desktop_lyric_lock_screen')") + dt#search {{$t('view.setting.search')}} - dd(:tips="$t('view.setting.search_hot_title')") - h3#search_hot {{$t('view.setting.search_hot')}} - div - material-checkbox(id="setting_search_showHot_enable" v-model="current_setting.search.isShowHotSearch" :label="$t('view.setting.is_show')") - dd(:tips="$t('view.setting.search_history_title')") - h3#search_history {{$t('view.setting.search_history')}} - div - material-checkbox(id="setting_search_showHistory_enable" v-model="current_setting.search.isShowHistorySearch" :label="$t('view.setting.is_show')") - dd(:tips="$t('view.setting.search_focus_search_box_title')") - h3#search_focus_search_box {{$t('view.setting.search_focus_search_box')}} - div - material-checkbox(id="setting_search_focusSearchBox_enable" v-model="current_setting.search.isFocusSearchBox" :label="$t('view.setting.is_enable')") + dd + div(:class="$style.gapTop") + material-checkbox(id="setting_search_showHot_enable" v-model="current_setting.search.isShowHotSearch" :label="$t('view.setting.search_hot')") + div(:class="$style.gapTop") + material-checkbox(id="setting_search_showHistory_enable" v-model="current_setting.search.isShowHistorySearch" :label="$t('view.setting.search_history')") + div(:class="$style.gapTop") + material-checkbox(id="setting_search_focusSearchBox_enable" v-model="current_setting.search.isFocusSearchBox" :label="$t('view.setting.search_focus_search_box')") dt#list {{$t('view.setting.list')}} - dd(:tips="$t('view.setting.list_source_title')") - h3#list_source {{$t('view.setting.list_source')}} - div - material-checkbox(id="setting_list_showSource_enable" v-model="current_setting.list.isShowSource" :label="$t('view.setting.is_show')") - dd(:tips="$t('view.setting.list_scroll_title')") - h3#list_scroll {{$t('view.setting.list_scroll')}} - div - material-checkbox(id="setting_list_scroll_enable" v-model="current_setting.list.isSaveScrollLocation" :label="$t('view.setting.is_enable')") + dd + div(:class="$style.gapTop") + material-checkbox(id="setting_list_showSource_enable" v-model="current_setting.list.isShowSource" :label="$t('view.setting.list_source')") + div(:class="$style.gapTop") + material-checkbox(id="setting_list_scroll_enable" v-model="current_setting.list.isSaveScrollLocation" :label="$t('view.setting.list_scroll')") //- dd(:tips="播放列表是否显示专辑栏") h3 专辑栏 div @@ -195,13 +172,10 @@ div.scroll(:class="$style.setting" ref="dom_setting") material-input(:class="$style.gapLeft" v-model="current_setting.network.proxy.password" @change="handleProxyChange('password')" type="password" :placeholder="$t('view.setting.network_proxy_password')") dt#odc {{$t('view.setting.odc')}} dd - h3#odc_clear_search_input {{$t('view.setting.odc_clear_search_input')}} - div - material-checkbox(id="setting_odc_isAutoClearSearchInput" v-model="current_setting.odc.isAutoClearSearchInput" :label="$t('view.setting.is_enable')") - dd - h3#odc_clear_search_list {{$t('view.setting.odc_clear_search_list')}} - div - material-checkbox(id="setting_odc_isAutoClearSearchList" v-model="current_setting.odc.isAutoClearSearchList" :label="$t('view.setting.is_enable')") + div(:class="$style.gapTop") + material-checkbox(id="setting_odc_isAutoClearSearchInput" v-model="current_setting.odc.isAutoClearSearchInput" :label="$t('view.setting.odc_clear_search_input')") + div(:class="$style.gapTop") + material-checkbox(id="setting_odc_isAutoClearSearchList" v-model="current_setting.odc.isAutoClearSearchList" :label="$t('view.setting.odc_clear_search_list')") dt#backup {{$t('view.setting.backup')}} dd h3#backup_part {{$t('view.setting.backup_part')}} @@ -1202,6 +1176,10 @@ export default { } } .gap-top { + &.top { + margin-top: 25px; + } + + .gap-top { margin-top: 10px; }