diff --git a/src/App.vue b/src/App.vue index 1298b93b..3f2e2e00 100644 --- a/src/App.vue +++ b/src/App.vue @@ -116,10 +116,10 @@ async function writeData () { console.info("开始恢复数据..."); const res = await restoreUiafData(); if (res !== false) { - const { total, completed } = res; + const { total, fin } = res; console.info("开始恢复成就数据..."); const achievementsStore = useAchievementsStore(); - achievementsStore.flushData(total, completed); + achievementsStore.flushData(total, fin); console.info("成就数据恢复完成!"); } else { console.info("未找到成就数据!"); diff --git a/src/assets/index.css b/src/assets/index.css index 65f87cae..5906f5d4 100644 --- a/src/assets/index.css +++ b/src/assets/index.css @@ -2,32 +2,30 @@ @import url("themes/default.css"); @import url("themes/dark.css"); -/** - * @description 隐藏应用最右边的滚动条 - * @since Alpha v0.1.4 +/* + * @description 让滚动条在内侧显示 + * @since Alpha v0.1.0 */ html { - overflow-y: hidden; + overflow: overlay; } - /* * @description 侧边滚动条样式 * @since Alpha v0.1.3 */ ::-webkit-scrollbar { - width: 10px; - height: 10px; - border-radius: 10px; + width: 8px; + border-radius: 5px; } ::-webkit-scrollbar-track { background: var(--scroll-bg); - border-radius: 10px; + border-radius: 5px; } ::-webkit-scrollbar-thumb { - background: #888; - border-radius: 10px; + background: #96979A; + border-radius: 5px; } ::-webkit-scrollbar-thumb:hover { diff --git a/src/assets/themes/dark.css b/src/assets/themes/dark.css index 38d4d7aa..767c899d 100644 --- a/src/assets/themes/dark.css +++ b/src/assets/themes/dark.css @@ -10,7 +10,7 @@ html.dark { --sidebar-bg: #1e1e1e; --sidebar-icon: #e1e1e1; --page-bg:#2a2a2a; - --scroll-bg: #393b40; + --scroll-bg: #ECE5D8; --calendar-btn-bg: #1e1e1e; --back-top-shadow: #000000; --theme-switch-icon: #e1e1e1; diff --git a/src/assets/themes/default.css b/src/assets/themes/default.css index a3b6e340..cf9fa595 100644 --- a/src/assets/themes/default.css +++ b/src/assets/themes/default.css @@ -10,7 +10,7 @@ html.default { --sidebar-bg: #485466; --sidebar-icon: #ece5d8; --page-bg:#ece5d8; - --scroll-bg: #f1f1f1; + --scroll-bg: #2A2A2A; --calendar-btn-bg: #393b40; --back-top-shadow: #546d8b; --theme-switch-icon: #393b40; diff --git a/src/components/t-backTop.vue b/src/components/t-backTop.vue index cf2159ac..8dcabb4e 100644 --- a/src/components/t-backTop.vue +++ b/src/components/t-backTop.vue @@ -51,8 +51,8 @@ onMounted(() => {