From 4225570098aeee0e0eaebfe38465c75ffb1d5a76 Mon Sep 17 00:00:00 2001
From: zyronon <zyronon@163.com>
Date: Sun, 24 Aug 2025 00:39:00 +0800
Subject: [PATCH] fix: fix bug

---
 scripts/deploy-oss.js                             | 4 ++--
 src/pages/pc/article/ArticleHomePage.vue          | 2 +-
 src/pages/pc/article/components/TypingArticle.vue | 7 +++----
 src/stores/base.ts                                | 5 +++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/scripts/deploy-oss.js b/scripts/deploy-oss.js
index eef55968..5d65dc02 100644
--- a/scripts/deploy-oss.js
+++ b/scripts/deploy-oss.js
@@ -130,8 +130,8 @@ async function refreshCDN() {
 async function main() {
   const files = getAllFiles('./dist')
   console.log(`📁 共找到 ${files.length} 个文件，开始上传...`)
-  // await uploadFilesWithClean(files, './dist', ['dicts', 'sound', 'libs'])
-  await uploadFilesWithClean(files, './dist', [ 'libs'])
+  await uploadFilesWithClean(files, './dist', ['dicts', 'sound', 'libs'])
+  // await uploadFilesWithClean(files, './dist', ['libs'])
   await refreshCDN()
 }
 
diff --git a/src/pages/pc/article/ArticleHomePage.vue b/src/pages/pc/article/ArticleHomePage.vue
index 3a09fb35..ec4af992 100644
--- a/src/pages/pc/article/ArticleHomePage.vue
+++ b/src/pages/pc/article/ArticleHomePage.vue
@@ -97,7 +97,7 @@ async function goBookDetail(val: DictResource) {
               base.currentBook.name || '请选择书籍开始学习'
             }}</span>
           <BaseIcon @click="router.push('/book-list')">
-            <IconFluentArrowSync16Regular v-if="base.currentBook.name"/>
+            <IconFluentArrowSort20Regular v-if="base.currentBook.name"/>
             <IconFluentAdd16Filled v-else/>
           </BaseIcon>
         </div>
diff --git a/src/pages/pc/article/components/TypingArticle.vue b/src/pages/pc/article/components/TypingArticle.vue
index 36f7fb4c..31284c0e 100644
--- a/src/pages/pc/article/components/TypingArticle.vue
+++ b/src/pages/pc/article/components/TypingArticle.vue
@@ -355,7 +355,6 @@ let showQuestions = $ref(false)
 
 <template>
   <div class="typing-article" ref="typeArticleRef">
-
     <header class="mb-4">
       <div class="title word">{{ props.article.title }}</div>
       <div class="titleTranslate" v-if="settingStore.translate">{{ props.article.titleTranslate }}</div>
@@ -447,7 +446,7 @@ let showQuestions = $ref(false)
     <div class="options flex justify-center" v-if="isEnd">
       <BaseButton
           v-if="store.currentBook.lastLearnIndex < store.currentBook.articles.length - 1"
-          @click="emit('next')">下一章
+          @click="emit('next')">下一篇
       </BaseButton>
     </div>
 
@@ -550,7 +549,7 @@ let showQuestions = $ref(false)
     }
 
     &.tall {
-      line-height: 2.2;
+      line-height: 2.6;
     }
 
     .section {
@@ -590,7 +589,7 @@ let showQuestions = $ref(false)
     height: 100%;
     width: 100%;
     font-size: 1.2rem;
-    line-height: 3.0;
+    line-height: 3.5;
     letter-spacing: .2rem;
     font-family: var(--zh-article-family);
     font-weight: bold;
diff --git a/src/stores/base.ts b/src/stores/base.ts
index d823f5ba..1bccc5f3 100644
--- a/src/stores/base.ts
+++ b/src/stores/base.ts
@@ -109,8 +109,9 @@ export const useBaseStore = defineStore('base', {
       return this.article.bookList[this.article.studyIndex] ?? {}
     },
     currentBookProgress(): number {
-      if (this.currentBook.name) return Number(Number(this.currentBook.lastLearnIndex / this.currentBook.length).toFixed(2))
-      return 0
+      if (!this.sbook.length) return 0
+      if (this.sbook.complete) return 100
+      return _getStudyProgress(this.sbook.lastLearnIndex, this.sbook.length)
     },
   },
   actions: {