diff --git a/components.d.ts b/components.d.ts
index e1b06d51..9f29831d 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -26,6 +26,8 @@ declare module 'vue' {
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElSlider: typeof import('element-plus/es')['ElSlider']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
+    ElTable: typeof import('element-plus/es')['ElTable']
+    ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     Empty: typeof import('./src/components/Empty.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
diff --git a/src/pages/pc/dict2/index.vue b/src/pages/pc/dict2/index.vue
index 08c4566c..cc6cfb91 100644
--- a/src/pages/pc/dict2/index.vue
+++ b/src/pages/pc/dict2/index.vue
@@ -1,8 +1,6 @@
 <script setup lang="ts">
 import {useBaseStore} from "@/stores/base.ts";
 import DictListPanel2 from "./DictListPanel2.vue";
-import {Icon} from '@iconify/vue'
-import "vue-activity-calendar/style.css";
 import {useRouter} from "vue-router";
 import BasePage from "@/pages/pc/components/BasePage.vue";
 
diff --git a/src/pages/pc/home/HomeIndex.vue b/src/pages/pc/home/HomeIndex.vue
index 836cfd20..a103f04f 100644
--- a/src/pages/pc/home/HomeIndex.vue
+++ b/src/pages/pc/home/HomeIndex.vue
@@ -44,7 +44,7 @@ function clickEvent(e) {
               </div>
             </div>
             <div class="mt-5 text-sm">已学习5555个单词的1%</div>
-            <el-progress class="mt-1" percentage="80" :show-text="false"></el-progress>
+            <el-progress class="mt-1" :percentage="80" :show-text="false"></el-progress>
           </div>
           <div class="card flex gap-3">
             <div class="bg-slate-200 w-10 h-10 flex center text-2xl rounded">
@@ -60,7 +60,7 @@ function clickEvent(e) {
                 </div>
               </div>
               <div class="mt-2 text-xs">学习 50 个单词</div>
-              <el-progress class="flex-1 mt-1" percentage="80" :show-text="false"></el-progress>
+              <el-progress class="flex-1 mt-1" :percentage="80" :show-text="false"></el-progress>
             </div>
           </div>
         </div>
@@ -83,7 +83,7 @@ function clickEvent(e) {
               </div>
             </div>
             <div class="mt-5 text-sm">已学习5555个单词的1%</div>
-            <el-progress class="mt-1" percentage="80" color="white" :show-text="false"></el-progress>
+            <el-progress class="mt-1" :percentage="80" color="white" :show-text="false"></el-progress>
           </div>
         </div>
         <div class="flex justify-center mt-2 text-2xl">
diff --git a/src/pages/pc/word/EditWordDict.vue b/src/pages/pc/word/EditWordDict.vue
index e3337e2b..7d01ab32 100644
--- a/src/pages/pc/word/EditWordDict.vue
+++ b/src/pages/pc/word/EditWordDict.vue
@@ -1,19 +1,293 @@
 <script setup lang="ts">
 
 import BasePage from "@/pages/pc/components/BasePage.vue";
-import WordDictDetail from "@/pages/pc/dict/components/WordDictDetail.vue";
-import {onMounted} from "vue";
+import {onMounted, reactive} from "vue";
 import {useRoute} from "vue-router";
+import {useRuntimeStore} from "@/stores/runtime.ts";
+import {useBaseStore} from "@/stores/base.ts";
+import {assign, cloneDeep, reverse, shuffle} from "lodash-es";
+import {DefaultDict, Sort, Word} from "@/types.ts";
+import {nanoid} from "nanoid";
+import BaseIcon from "@/components/BaseIcon.vue";
+import {Icon} from "@iconify/vue";
+import {useNav} from "@/utils";
+import {FormInstance, FormRules} from "element-plus";
+import MiniDialog from "@/pages/pc/components/dialog/MiniDialog.vue";
+import BaseButton from "@/components/BaseButton.vue";
+import {$computed, $ref} from "vue/macros";
 
+const runtimeStore = useRuntimeStore()
+const store = useBaseStore()
 const route = useRoute()
-onMounted(() => {
-  console.log('r', route.query.type)
+
+let show = $ref(false)
+let searchKey = $ref('')
+let list = $computed({
+  get() {
+    if (searchKey) {
+      return runtimeStore.editDict.words.filter(v => v.word.includes(searchKey))
+    }
+    return runtimeStore.editDict.words
+  },
+  set(v) {
+    runtimeStore.editDict.words = v
+  }
 })
+
+onMounted(() => {
+  switch (Number(route.query.type)) {
+    case 0:
+      runtimeStore.editDict = cloneDeep({
+        ...cloneDeep(DefaultDict),
+        id: nanoid(),
+        name: '收藏',
+        words: store.collectWord
+      })
+      break
+    case 1:
+      runtimeStore.editDict = cloneDeep({
+        ...cloneDeep(DefaultDict),
+        id: nanoid(),
+        name: '错词本', words: store.wrong2
+      })
+      break
+    case 2:
+      runtimeStore.editDict = cloneDeep({
+        ...cloneDeep(DefaultDict),
+        id: nanoid(),
+        name: '简单词', words: store.simple2
+      })
+      break
+    default:
+      break
+  }
+})
+const {back} = useNav()
+
+
+let wordFormData = $ref({
+  where: '',
+  type: '',
+  id: '',
+  index: 0
+})
+
+enum FormMode {
+  None = '',
+  Add = 'Add',
+  Edit = 'Edit',
+}
+
+const DefaultFormWord = {
+  word: '',
+  phonetic0: '',
+  phonetic1: '',
+  trans: '',
+}
+let wordForm = $ref(cloneDeep(DefaultFormWord))
+const wordFormRef = $ref<FormInstance>()
+const wordRules = reactive<FormRules>({
+  name: [
+    {required: true, message: '请输入单词', trigger: 'blur'},
+    {max: 30, message: '名称不能超过30个字符', trigger: 'blur'},
+  ],
+})
+
+//TODO trans结构变了，
+async function onSubmitWord() {
+  await wordFormRef.validate((valid, fields) => {
+    if (valid) {
+      let data: any = cloneDeep(wordForm)
+      if (data.trans) {
+        data.trans = data.trans.split('\n');
+      } else {
+        data.trans = []
+      }
+      if (wordFormData.type === FormMode.Add) {
+        data.id = nanoid(6)
+        data.checked = false
+        let r = list.find(v => v.word === wordForm.word)
+        // if (r) return ElMessage.warning('已有相同名称单词！')
+        // else list.push(data)
+        list.push(data)
+        ElMessage.success('添加成功')
+        wordForm = cloneDeep(DefaultFormWord)
+        // setTimeout(wordListRef?.scrollToBottom, 100)
+      } else {
+        let r = list.find(v => v.id === wordFormData.id)
+        if (r) assign(r, data)
+        r = list.find(v => v.id === wordFormData.id)
+        if (r) assign(r, data)
+        ElMessage.success('修改成功')
+      }
+    } else {
+      ElMessage.warning('请填写完整')
+    }
+  })
+}
+
+function delWord(val: {
+  item: Word
+}) {
+  let rIndex2 = list.findIndex(v => v.id === val.item.id)
+  if (rIndex2 > -1) {
+    list.splice(rIndex2, 1)
+  }
+  if (wordFormData.type === FormMode.Edit && wordForm.word === val.item.word) {
+    closeWordForm()
+  }
+}
+
+function batchDelWord() {
+  console.log('multipleSelection', multipleSelection)
+  multipleSelection.map(v => delWord({item: v}))
+}
+
+function editWord(word: Word,) {
+  wordFormData.type = FormMode.Edit
+  wordFormData.id = word.id
+  wordForm.word = word.word
+  wordForm.phonetic1 = word.phonetic1
+  wordForm.phonetic0 = word.phonetic0
+  wordForm.trans = word.trans.join('\n')
+}
+
+function addWord() {
+  // setTimeout(wordListRef?.scrollToBottom, 100)
+  wordFormData.type = FormMode.Add
+  wordForm = cloneDeep(DefaultFormWord)
+}
+
+function closeWordForm() {
+  wordFormData.type = FormMode.None
+  wordForm = cloneDeep(DefaultFormWord)
+}
+
+
+let multipleSelection = $ref<any[]>([])
+const handleSelectionChange = (val: any[]) => {
+  multipleSelection = val
+}
+
+function sort(type: Sort) {
+  if (type === Sort.reverse) {
+    ElMessage.success('已翻转排序')
+    list = reverse(cloneDeep(list))
+  }
+  if (type === Sort.random) {
+    ElMessage.success('已随机排序')
+    list = shuffle(cloneDeep(list))
+  }
+}
+
+
 </script>
 
 <template>
   <BasePage>
-    <WordDictDetail/>
+    <header class="flex gap-4">
+      <div class="back" @click.stop="back">
+        <Icon icon="octicon:arrow-left-24" width="20"/>
+      </div>
+      <div class="left">
+        <div class="top">
+          <div class="title">
+            {{ runtimeStore.editDict.name }}
+          </div>
+        </div>
+        <div class="desc" v-if="runtimeStore.editDict.description">{{ runtimeStore.editDict.description }}</div>
+      </div>
+    </header>
+    <div class="flex">
+      <div class="w-1/2">
+        <div class="flex justify-end py-5 gap-2 relative">
+          <el-input v-model="searchKey"/>
+          <BaseIcon
+              v-if="multipleSelection.length"
+              @click="batchDelWord"
+              class="del"
+              title="删除"
+              icon="solar:trash-bin-minimalistic-linear"/>
+          <BaseIcon
+              @click="addWord"
+              icon="fluent:add-20-filled"
+              title="添加单词"/>
+          <BaseIcon
+              title="改变顺序"
+              icon="icon-park-outline:sort-two"
+              @click="show = !show"
+          />
+          <MiniDialog
+              v-model="show"
+              style="width: 8rem;"
+          >
+            <div class="mini-row-title">
+              列表循环设置
+            </div>
+            <div class="mini-row">
+              <BaseButton size="small" @click="sort(Sort.reverse)">翻转</BaseButton>
+              <BaseButton size="small" @click="sort(Sort.random)">随机</BaseButton>
+            </div>
+          </MiniDialog>
+        </div>
+        <el-table :data="list"
+                  @selection-change="handleSelectionChange"
+                  max-height="80vh">
+          <el-table-column type="selection" width="55"/>
+          <el-table-column prop="word" label="单词" width="120"/>
+          <el-table-column prop="trans" label="翻译" width="180">
+            <template #default="scope">
+              {{ scope.row.trans.map(v => v.cn) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作">
+            <template #default="scope">
+              <el-button size="small" @click="editWord( scope.row)">
+                Edit
+              </el-button>
+              <el-button
+                  size="small"
+                  type="danger"
+                  @click="delWord({item: scope.row})"
+              >
+                Delete
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="add w-1/2" v-if="wordFormData.type">
+        <div class="common-title">
+          {{ wordFormData.type === FormMode.Add ? '添加' : '修改' }}单词
+        </div>
+        <el-form
+            class="form"
+            ref="wordFormRef"
+            :rules="wordRules"
+            :model="wordForm"
+            label-width="6rem">
+          <el-form-item label="单词" prop="word">
+            <el-input v-model="wordForm.word"/>
+          </el-form-item>
+          <el-form-item label="翻译">
+            <el-input v-model="wordForm.trans"
+                      placeholder="多个翻译请换行"
+                      :autosize="{ minRows: 2, maxRows: 6 }"
+                      type="textarea"/>
+          </el-form-item>
+          <el-form-item label="音标/发音①">
+            <el-input v-model="wordForm.phonetic0"/>
+          </el-form-item>
+          <el-form-item label="音标/发音②">
+            <el-input v-model="wordForm.phonetic1"/>
+          </el-form-item>
+          <div class="flex-center">
+            <el-button @click="closeWordForm">关闭</el-button>
+            <el-button type="primary" @click="onSubmitWord">保存</el-button>
+          </div>
+        </el-form>
+      </div>
+    </div>
   </BasePage>
 </template>
 
diff --git a/src/pages/pc/word/WordHome.vue b/src/pages/pc/word/WordHome.vue
index eae1d3e3..fe4ffb9a 100644
--- a/src/pages/pc/word/WordHome.vue
+++ b/src/pages/pc/word/WordHome.vue
@@ -30,7 +30,7 @@ function clickEvent(e) {
             <div class="absolute bottom-4 right-4">{{ base.collectWord.length }}个词</div>
           </div>
           <div class="my-dict" @click="nav('edit-word-dict',{type:1})">
-            <span>生词本</span>
+            <span>错词本</span>
             <div class="absolute bottom-4 right-4">{{ base.wrong2.length }}个词</div>
           </div>
           <div class="my-dict" @click="nav('edit-word-dict',{type:2})">
diff --git a/src/stores/base.ts b/src/stores/base.ts
index 2a8c2ac2..9a06ec81 100644
--- a/src/stores/base.ts
+++ b/src/stores/base.ts
@@ -38,7 +38,65 @@ export interface BaseState {
 }
 
 export const DefaultBaseState = (): BaseState => ({
-  collectWord: [],
+  collectWord: [
+    {
+      "word": "pharmacy",
+      "trans": [
+        {
+          "cn": "n.药房，配药学，药学，制药业，一批备用药品"
+        }
+      ],
+      "phonetic0": "ˈfɑ:məsi",
+      "phonetic1": "ˈfɑ:rməsi"
+    },
+    {
+      "word": "foregone",
+      "trans": [
+        {
+          "cn": "过去的；先前的；预知的；预先决定的"
+        },
+        {
+          "cn": "发生在…之前（forego的过去分词）"
+        }
+      ],
+      "phonetic0": "fɔː'gɒn",
+      "phonetic1": "'fɔrɡɔn"
+    },
+
+    {
+      "word": "calculate",
+      "trans": [
+        {
+          "cn": "vt.& vi.计算，估计，打算，计划，旨在"
+        },
+        {
+          "cn": "vt.预测，推测"
+        }
+      ],
+      "phonetic0": "ˈkælkjuleɪt",
+      "phonetic1": "ˈkælkjəˌlet"
+    },
+    {
+      "word": "compete",
+      "trans": [
+        {
+          "cn": "vi.竞赛，竞争，比得上，参加比赛（或竞赛）"
+        }
+      ],
+      "phonetic0": "kəmˈpi:t",
+      "phonetic1": "kəmˈpit"
+    },
+    {
+      "word": "furnish",
+      "trans": [
+        {
+          "cn": "vt.陈设，布置，提供，供应，装修（房屋）"
+        }
+      ],
+      "phonetic0": "ˈfɜ:nɪʃ",
+      "phonetic1": "ˈfɜ:rnɪʃ"
+    },
+  ],
   collectArticle: [],
   simple2: [],
   wrong2: [],