diff --git a/src/App.vue b/src/App.vue
index da97eff3..5d320f89 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -6,7 +6,7 @@
 
 <script setup lang="ts">
 
-import {computed, ref, watch} from "vue";
+import {computed, onMounted, ref, watch} from "vue";
 import {useAppStoreHook} from "@/store/modules/app";
 import {ElConfigProvider} from 'element-plus'
 
@@ -29,5 +29,9 @@ watch(language, (value) => {
   // 初始化立即执行，
   immediate: true
 })
+onMounted(()=>{
+  const style = localStorage.getItem("style");
+  document.documentElement.style.cssText = style as string;
+})
 </script>
 
diff --git a/src/components/RightPanel/index.vue b/src/components/RightPanel/index.vue
index cda221ff..e72e10e2 100644
--- a/src/components/RightPanel/index.vue
+++ b/src/components/RightPanel/index.vue
@@ -2,31 +2,28 @@
   <div ref="rightPanel" :class="{show:show}" class="rightPanel-container">
     <div class="rightPanel-background"/>
     <div class="rightPanel">
-       <div class="handle-button" :style="{'top':buttonTop+'px','background-color':theme}" @click="show=!show">
-          <Close style="width: 1em; height: 1em;vertical-align: middle " v-show="show"/>
-          <Setting style="width:1em; height:1em;vertical-align: middle " v-show="!show"/>
-        </div>
-        <div class="rightPanel-items">
-          <slot/>
-        </div>
+      <div class="handle-button" :style="{'top':buttonTop+'px','background-color':theme}" @click="show=!show">
+        <Close style="width: 1em; height: 1em;vertical-align: middle " v-show="show"/>
+        <Setting style="width:1em; height:1em;vertical-align: middle " v-show="!show"/>
+      </div>
+      <div class="rightPanel-items">
+        <slot/>
       </div>
     </div>
+  </div>
 </template>
 
 <script setup lang="ts">
-import {computed, onBeforeUnmount, onMounted, ref, watchEffect} from "vue";
+import {computed, onBeforeUnmount, onMounted, ref, watch} from "vue";
 
 import {addClass, removeClass} from '@/utils/index'
 import {useSettingStoreHook} from "@/store/modules/settings";
 
 // 图标依赖
 import {Close, Setting} from '@element-plus/icons-vue'
+import {ElColorPicker} from "element-plus";
 
 const props = defineProps({
-  clickNotClose: {
-    default: false,
-    type: Boolean
-  },
   buttonTop: {
     default: 250,
     type: Number
@@ -37,11 +34,12 @@ const theme = computed(() => useSettingStoreHook().theme)
 
 const show = ref(false)
 
-watchEffect(() => {
-  if (show.value && !props.clickNotClose) {
+watch(show, (value) => {
+  console.log('show', value)
+  if (value) {
     addEventClick()
   }
-  if (show.value) {
+  if (value) {
     addClass(document.body, 'showRightPanel')
   } else {
     removeClass(document.body, 'showRightPanel')
@@ -53,24 +51,29 @@ function addEventClick() {
 }
 
 function closeSidebar(evt: any) {
-  const parent = evt.target.closest('.rightPanel')
+
+  // 主题选择点击不关闭
+  let parent = evt.target.closest('.theme-picker-dropdown')
+  if (parent) {
+    return
+  }
+
+  parent = evt.target.closest('.rightPanel')
   if (!parent) {
     show.value = false
     window.removeEventListener('click', closeSidebar)
   }
 }
 
-const rightPanel = ref(null)
+const rightPanel = ref(ElColorPicker)
 
 function insertToBody() {
-  console.log('insertToBody', rightPanel)
   const elx = rightPanel.value as any
   const body = document.querySelector('body') as any
   body.insertBefore(elx, body.firstChild)
 }
 
 onMounted(() => {
-  console.log('theme', useSettingStoreHook().theme)
   insertToBody()
 })
 
diff --git a/src/components/ThemePicker/index.vue b/src/components/ThemePicker/index.vue
new file mode 100644
index 00000000..193a8425
--- /dev/null
+++ b/src/components/ThemePicker/index.vue
@@ -0,0 +1,56 @@
+<template>
+  <el-color-picker
+      v-model="theme"
+      :predefine="['#409EFF', '#1890ff', '#304156','#212121','#11a983', '#13c2c2', '#6959CD', '#f5222d' ]"
+      class="theme-picker"
+      popper-class="theme-picker-dropdown"
+  />
+</template>
+
+<script setup lang="ts">
+import {computed, nextTick, watch} from "vue";
+import {useSettingStoreHook} from "@/store/modules/settings";
+import {useTagsViewStoreHook} from "@/store/modules/tagsView";
+import {useRoute, useRouter} from "vue-router";
+
+// 参考连接:https://juejin.cn/post/7024025899813044232#heading-1
+import {mix} from "@/utils";
+// 白色混合色
+const mixWhite = "#ffffff";
+// 黑色混合色
+const mixBlack = "#000000";
+
+const node = document.documentElement;
+
+const theme = computed(() => useSettingStoreHook().theme)
+
+watch(theme, (color: string) => {
+  node.style.setProperty("--el-color-primary", color);
+  localStorage.setItem("theme", color)
+
+  for (let i = 1; i < 10; i += 1) {
+    node.style.setProperty(`--el-color-primary-light-${i}`, mix(color, mixWhite, i * 0.1));
+  }
+  node.style.setProperty("--el-color-primary-dark", mix(color, mixBlack, 0.1));
+
+  localStorage.setItem("style", node.style.cssText);
+})
+
+</script>
+
+<style>
+.theme-message,
+.theme-picker-dropdown {
+  z-index: 99999 !important;
+}
+
+.theme-picker .el-color-picker__trigger {
+  height: 26px !important;
+  width: 26px !important;
+  padding: 2px;
+}
+
+.theme-picker-dropdown .el-color-dropdown__link-btn {
+  display: none;
+}
+</style>
diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index 1f34f6e2..03c97c97 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -1,11 +1,16 @@
 <template>
   <div class="drawer-container">
-    <div>
       <h3 class="drawer-title">系统布局配置</h3>
+      <div class="drawer-item">
+        <span>主题颜色</span>
+        <div style="float: right;height: 26px;margin: -3px 8px 0 0;">
+          <theme-picker @change="themeChange"/>
+        </div>
+      </div>
 
       <div class="drawer-item">
         <span>开启 Tags-View</span>
-        <el-switch v-model="tagsView" class="drawer-switch"/>
+        <el-switch v-model="state.tagsView" class="drawer-switch"/>
       </div>
 
       <div class="drawer-item">
@@ -17,40 +22,38 @@
         <span>侧边栏 Logo</span>
         <el-switch v-model="sidebarLogo" class="drawer-switch"/>
       </div>
-    </div>
   </div>
 </template>
 
-<script>
-import {defineComponent, reactive, toRefs, watch} from "vue"
-import { useSettingStoreHook } from "@/store/modules/settings";
-export default defineComponent({
-  setup() {
-    const state = reactive({
-      fixedHeader:useSettingStoreHook().fixedHeader,
-      tagsView:useSettingStoreHook().tagsView,
-      sidebarLogo:useSettingStoreHook().sidebarLogo,
-      themeChange: (val) => {
-        useSettingStoreHook().changeSetting( { key: 'theme', val })
-      }
-    })
-    watch(()=>state.fixedHeader,(value)=>{
-      useSettingStoreHook().changeSetting( { key: 'fixedHeader', value })
-    })
+<script setup lang="ts">
+import {reactive, toRefs, watch} from "vue";
+import {useSettingStoreHook} from "@/store/modules/settings";
+import ThemePicker from '@/components/ThemePicker/index.vue';
 
-    watch(() => state.tagsView, (value) => {
-      useSettingStoreHook().changeSetting( { key: 'showTagsView', value })
-    })
-
-    watch(() => state.sidebarLogo, (value) => {
-      useSettingStoreHook().changeSetting( { key: 'sidebarLogo', value })
-    })
-
-    return {
-      ...toRefs(state)
-    }
-  }
+const state = reactive({
+  fixedHeader: useSettingStoreHook().fixedHeader,
+  tagsView: useSettingStoreHook().tagsView,
+  sidebarLogo: useSettingStoreHook().sidebarLogo
 })
+
+const {fixedHeader, tagsView, sidebarLogo} = toRefs(state)
+
+function themeChange(val: any) {
+  useSettingStoreHook().changeSetting({key: 'theme', value: val})
+}
+
+watch(() => state.fixedHeader, (value) => {
+  useSettingStoreHook().changeSetting({key: 'fixedHeader', value: value})
+})
+
+watch(() => state.tagsView, (value) => {
+  useSettingStoreHook().changeSetting({key: 'showTagsView', value: value})
+})
+
+watch(() => state.sidebarLogo, (value) => {
+  useSettingStoreHook().changeSetting({key: 'sidebarLogo', value: value})
+})
+
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 8f76168f..35dfd778 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div :class="classObj" class="app-wrapper">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
+    <div v-if="device==='mobile' && sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
     <sidebar class="sidebar-container"/>
     <div :class="{hasTagsView:needTagsView}" class="main-container">
       <div :class="{'fixed-header':fixedHeader}">
diff --git a/src/store/modules/settings.ts b/src/store/modules/settings.ts
index be042c17..51c250ac 100644
--- a/src/store/modules/settings.ts
+++ b/src/store/modules/settings.ts
@@ -2,13 +2,14 @@ import {defineStore} from "pinia";
 import {store} from "@/store";
 import {SettingState} from "@/store/interface";
 import defaultSettings from '../../settings'
+
 const {showSettings, tagsView, fixedHeader, sidebarLogo} = defaultSettings
 import variables from '@/styles/element-variables.module.scss'
 
 export const useSettingStore = defineStore({
     id: "setting",
     state: (): SettingState => ({
-        theme: variables.theme,
+        theme: localStorage.get("theme") || variables.theme,
         showSettings: showSettings,
         tagsView: tagsView,
         fixedHeader: fixedHeader,
diff --git a/src/styles/element-plus.scss b/src/styles/element-plus.scss
index 7bd1b6d6..7c2518d1 100644
--- a/src/styles/element-plus.scss
+++ b/src/styles/element-plus.scss
@@ -1,5 +1,35 @@
 :root {
-  --el-color-primary: #409EFF;
+  // 这里可以设置你自定义的颜色变量
+  // 这个是element主要按钮:active的颜色，当主题更改后此变量的值也随之更改
+  --el-color-primary-dark: #0d84ff;
+}
+
+/* 核心组件的变量，下面这些样式是必须要写的 */
+
+.el-link.el-link--primary:hover {
+  color: var(--el-color-primary-light-2) !important;
+}
+
+.el-tag {
+  --el-tag-bg-color: var(--el-color-primary-light-9);
+  --el-tag-border-color: var(--el-color-primary-light-8);
+  --el-tag-text-color: var(--el-color-primary);
+  --el-tag-hover-color: var(--el-color-primary);
+}
+
+.el-button--default:active {
+  color: var(--el-color-primary-dark) !important;
+  border-color: var(--el-color-primary-dark) !important;
+}
+
+.el-button--primary {
+  --el-button-text-color: var(--el-color-white) !important;
+  --el-button-bg-color: var(--el-color-primary) !important;
+  --el-button-border-color: var(--el-color-primary) !important;
+  --el-button-hover-bg-color: var(--el-color-primary-light-2) !important;
+  --el-button-hover-border-color: var(--el-color-primary-light-2) !important;
+  --el-button-active-bg-color: var(--el-color-primary-dark) !important;
+  --el-button-active-border-color: var(--el-color-primary-dark) !important;
 }
 
 // 覆盖 element-plus 的样式
diff --git a/src/styles/element-variables.module.scss b/src/styles/element-variables.module.scss
index 1c2492d2..2fe9a2b5 100644
--- a/src/styles/element-variables.module.scss
+++ b/src/styles/element-variables.module.scss
@@ -1,5 +1,5 @@
 /**
-* I think element-ui's default theme color is too light for long-term use.
+* I think element default theme color is too light for long-term use.
 * So I modified the default color and you can modify it to your liking.
 * https://vitejs.cn/guide/features.html#postcss
 **/
diff --git a/src/utils/index.ts b/src/utils/index.ts
index f38ef432..a29e5006 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -27,4 +27,21 @@ export function removeClass(ele: HTMLElement, cls: string) {
         const reg = new RegExp('(\\s|^)' + cls + '(\\s|$)')
         ele.className = ele.className.replace(reg, ' ')
     }
-}
\ No newline at end of file
+}
+
+export function mix(color1: string, color2: string, weight: number) {
+    weight = Math.max(Math.min(Number(weight), 1), 0);
+    let r1 = parseInt(color1.substring(1, 3), 16);
+    let g1 = parseInt(color1.substring(3, 5), 16);
+    let b1 = parseInt(color1.substring(5, 7), 16);
+    let r2 = parseInt(color2.substring(1, 3), 16);
+    let g2 = parseInt(color2.substring(3, 5), 16);
+    let b2 = parseInt(color2.substring(5, 7), 16);
+    let r = Math.round(r1 * (1 - weight) + r2 * weight);
+    let g = Math.round(g1 * (1 - weight) + g2 * weight);
+    let b = Math.round(b1 * (1 - weight) + b2 * weight);
+    const rStr = ("0" + (r || 0).toString(16)).slice(-2);
+    const gStr = ("0" + (g || 0).toString(16)).slice(-2);
+    const bStr = ("0" + (b || 0).toString(16)).slice(-2);
+    return "#" + rStr + gStr + bStr;
+};