diff --git a/src/pages/pc/components/Book.vue b/src/pages/pc/components/Book.vue
index 2f53a1ef..df2eb0bd 100644
--- a/src/pages/pc/components/Book.vue
+++ b/src/pages/pc/components/Book.vue
@@ -15,8 +15,14 @@ defineEmits<{
 }>()
 
 const progress = $computed(() => {
+  if (props.item.complete) return 100
   return Number(((props.item?.lastLearnIndex / props.item?.length) * 100).toFixed())
 })
+
+const studyProgress = $computed(() => {
+  if (props.item.complete) return props.item?.length + '/'
+  return props.item?.lastLearnIndex ? props.item?.lastLearnIndex + '/' : ''
+})
 </script>
 
 <template>
@@ -27,10 +33,10 @@ const progress = $computed(() => {
         <div class="text-sm line-clamp-3" v-opacity="item.name !== item.description">{{ item?.description }}</div>
       </div>
       <div class="absolute bottom-4 right-4">
-        <div>{{ item?.lastLearnIndex ? item?.lastLearnIndex + '/' : '' }}{{ item?.length }}{{ quantifier }}</div>
+        <div>{{ studyProgress }}{{ item?.length }}{{ quantifier }}</div>
       </div>
       <div class="absolute bottom-2 left-4 right-4">
-        <el-progress v-if="item?.lastLearnIndex" class="mt-1"
+        <el-progress v-if="item?.lastLearnIndex || item.complete" class="mt-1"
                      :percentage="progress"
                      :show-text="false"></el-progress>
       </div>
diff --git a/src/pages/pc/word/Statistics.vue b/src/pages/pc/word/Statistics.vue
index ad76e472..88aca9ea 100644
--- a/src/pages/pc/word/Statistics.vue
+++ b/src/pages/pc/word/Statistics.vue
@@ -19,10 +19,7 @@ const settingStore = useSettingStore()
 const statStore = usePracticeStore()
 const model = defineModel({default: false})
 let list = $ref([])
-
-defineProps<{
-  dictIsEnd: boolean;
-}>()
+let dictIsEnd = $ref(false)
 
 function calcWeekList() {
   // 获取本周的起止时间
@@ -62,6 +59,11 @@ watch(model, (newVal) => {
     //这里不知为啥会卡，打开有延迟
     requestIdleCallback(() => {
       store.sdict.lastLearnIndex = store.sdict.lastLearnIndex + statStore.newWordNumber
+      if (store.sdict.lastLearnIndex >= store.sdict.length) {
+        dictIsEnd = true;
+        store.sdict.complete = true
+        store.sdict.lastLearnIndex = 0
+      }
       store.sdict.statistics.push(data as any)
       calcWeekList(); // 新增：计算本周学习记录
     })
diff --git a/src/pages/pc/word/StudyWord.vue b/src/pages/pc/word/StudyWord.vue
index 0c44eb74..90225552 100644
--- a/src/pages/pc/word/StudyWord.vue
+++ b/src/pages/pc/word/StudyWord.vue
@@ -75,7 +75,7 @@ onMounted(() => {
           loading = false
         })
       })
-    }else {
+    } else {
       router.push('/word')
     }
   } else {
@@ -88,20 +88,37 @@ onMounted(() => {
 })
 
 watch(() => studyData, () => {
-  data.words = studyData.new
+  if (studyData.new.length === 0) {
+    if (studyData.review.length) {
+      settingStore.dictation = false
+      statStore.step = 2
+      data.words = studyData.review
+    } else {
+      if (studyData.write.length) {
+        settingStore.dictation = true
+        data.words = studyData.write
+        statStore.step = 4
+      } else {
+        ElMessage.warning('没有可学习的单词！')
+        router.push('/word')
+      }
+    }
+  } else {
+    settingStore.dictation = false
+    data.words = studyData.new
+    statStore.step = 0
+  }
   data.index = 0
   data.wrongWords = []
   allWrongWords = new Set()
 
-  settingStore.dictation = false
-  statStore.step = 0
   statStore.startDate = Date.now()
   statStore.inputWordNumber = 0
   statStore.wrong = 0
-  statStore.total = studyData.review.concat(studyData.new).concat(studyData.write).length
+  statStore.total = studyData.review.length + studyData.new.length + studyData.write.length
   statStore.newWordNumber = studyData.new.length
   statStore.index = 0
-}, {immediate: true, deep: true})
+})
 
 provide('studyData', data)
 
@@ -236,8 +253,14 @@ useOnKeyboardEventListener(onKeyDown, onKeyUp)
 function repeat() {
   console.log('重学一遍')
   settingStore.dictation = false
-  //将学习进度减回去
-  store.sdict.lastLearnIndex = store.sdict.lastLearnIndex - statStore.newWordNumber
+  if (store.sdict.lastLearnIndex === 0 && store.sdict.complete) {
+    //如果是刚刚完成，那么学习进度要从length减回去，因为lastLearnIndex为0了，同时改complete为false
+    store.sdict.lastLearnIndex = store.sdict.length - statStore.newWordNumber
+    store.sdict.complete = false
+  } else {
+    //将学习进度减回去
+    store.sdict.lastLearnIndex = store.sdict.lastLearnIndex - statStore.newWordNumber
+  }
   emitter.emit(EventKey.resetWord)
   let temp = cloneDeep(studyData)
   //排除已掌握单词
diff --git a/src/types.ts b/src/types.ts
index 7f771f42..94f929b1 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -272,7 +272,8 @@ export interface Dict extends DictResource {
   words: Word[],
   articles: Article[],
   statistics: Statistics[],
-  custom: boolean,
+  custom: boolean,//是否是自定义词典
+  complete: boolean,//是否学习完成，学完了设为true，然后lastLearnIndex重置
 }
 
 export interface ArticleItem {