diff --git a/CHANGELOG.md b/CHANGELOG.md index 34f80c7e..43553bf3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ * 功能优化:使用思维链提示词生成思维导图,确保生成的思维导图不会出现格式错误 * 功能优化:优化首页登录注册页面的 UI * BUG修复:修复License验证的逻辑漏洞 -* 功能优化:支持点卡充值设置有效期 +* Bug修复:后台添加用户的时候密码规则限制跟前台注册保持一致 ## v4.0.4 diff --git a/web/src/assets/css/color-dark.styl b/web/src/assets/css/color-dark.styl index 4b6854c1..ab18ff52 100644 --- a/web/src/assets/css/color-dark.styl +++ b/web/src/assets/css/color-dark.styl @@ -1,30 +1,95 @@ -.admin-home { - .header { - - } +.dark { + color-scheme: dark; + --el-color-primary: #409eff; + --el-color-primary-light-3: #3375b9; + --el-color-primary-light-5: #2a598a; + --el-color-primary-light-7: #213d5b; + --el-color-primary-light-8: #1d3043; + --el-color-primary-light-9: #18222c; + --el-color-primary-dark-2: #66b1ff; + --el-color-success: #67c23a; + --el-color-success-light-3: #4e8e2f; + --el-color-success-light-5: #3e6b27; + --el-color-success-light-7: #2d481f; + --el-color-success-light-8: #25371c; + --el-color-success-light-9: #1c2518; + --el-color-success-dark-2: #85ce61; + --el-color-warning: #e6a23c; + --el-color-warning-light-3: #a77730; + --el-color-warning-light-5: #7d5b28; + --el-color-warning-light-7: #533f20; + --el-color-warning-light-8: #3e301c; + --el-color-warning-light-9: #292218; + --el-color-warning-dark-2: #ebb563; + --el-color-danger: #f56c6c; + --el-color-danger-light-3: #b25252; + --el-color-danger-light-5: #854040; + --el-color-danger-light-7: #582e2e; + --el-color-danger-light-8: #412626; + --el-color-danger-light-9: #2b1d1d; + --el-color-danger-dark-2: #f78989; + --el-color-error: #f56c6c; + --el-color-error-light-3: #b25252; + --el-color-error-light-5: #854040; + --el-color-error-light-7: #582e2e; + --el-color-error-light-8: #412626; + --el-color-error-light-9: #2b1d1d; + --el-color-error-dark-2: #f78989; + --el-color-info: #909399; + --el-color-info-light-3: #6b6d71; + --el-color-info-light-5: #525457; + --el-color-info-light-7: #393a3c; + --el-color-info-light-8: #2d2d2f; + --el-color-info-light-9: #202121; + --el-color-info-dark-2: #a6a9ad; + --el-box-shadow: 0px 12px 32px 4px rgba(0, 0, 0, 0.36), 0px 8px 20px rgba(0, 0, 0, 0.72); + --el-box-shadow-light: 0px 0px 12px rgba(0, 0, 0, 0.72); + --el-box-shadow-lighter: 0px 0px 6px rgba(0, 0, 0, 0.72); + --el-box-shadow-dark: 0px 16px 48px 16px rgba(0, 0, 0, 0.72), 0px 12px 32px #000000, 0px 8px 16px -8px #000000; + --el-bg-color-page: #0a0a0a; + --el-bg-color: #141414; + --el-bg-color-overlay: #1d1e1f; + --el-text-color-primary: #E5EAF3; + --el-text-color-regular: #CFD3DC; + --el-text-color-secondary: #A3A6AD; + --el-text-color-placeholder: #8D9095; + --el-text-color-disabled: #6C6E72; + --el-border-color-darker: #636466; + --el-border-color-dark: #58585B; + --el-border-color: #4C4D4F; + --el-border-color-light: #414243; + --el-border-color-lighter: #363637; + --el-border-color-extra-light: #2B2B2C; + --el-fill-color-darker: #424243; + --el-fill-color-dark: #39393A; + --el-fill-color: #303030; + --el-fill-color-light: #262727; + --el-fill-color-lighter: #1D1D1D; + --el-fill-color-extra-light: #191919; + --el-fill-color-blank: transparent; + --el-mask-color: rgba(0, 0, 0, 0.8); + --el-mask-color-extra-light: rgba(0, 0, 0, 0.3) + --el-menu-bg-color-dark: #39393A + --el-menu-bg-color-darker: #424243 +} - .login-wrap { - background: #324157; - } +.dark .el-button { + --el-button-disabled-text-color: rgba(255, 255, 255, 0.5) +} - .plugins-tips { - background: #eef1f6; - } +.dark .el-card { + --el-card-bg-color: var(--el-bg-color-overlay) +} - .plugins-tips a { - color: #20a0ff; - } - - .tags-li.active { - border: 1px solid #409EFF; - background-color: #409EFF; - } - - .message-title { - color: #20a0ff; - } - - .collapse-btn:hover { - background: rgb(40, 52, 70); - } +.dark .el-empty { + --el-empty-fill-color-0: var(--el-color-black); + --el-empty-fill-color-1: #4b4b52; + --el-empty-fill-color-2: #36383d; + --el-empty-fill-color-3: #1e1e20; + --el-empty-fill-color-4: #262629; + --el-empty-fill-color-5: #202124; + --el-empty-fill-color-6: #212224; + --el-empty-fill-color-7: #1b1c1f; + --el-empty-fill-color-8: #1c1d1f; + --el-empty-fill-color-9: #18181a } \ No newline at end of file diff --git a/web/src/assets/css/main.styl b/web/src/assets/css/main.styl index d8cb8c08..2b7bc06c 100644 --- a/web/src/assets/css/main.styl +++ b/web/src/assets/css/main.styl @@ -37,6 +37,19 @@ body { transition: left .3s ease-in-out; background: #f0f0f0; + ::-webkit-scrollbar { + width: 8px; /* 滚动条宽度 */ + } + + ::-webkit-scrollbar-thumb { + background-color: #666666; + border-radius 8px + } + + ::-webkit-scrollbar-thumb:hover { + background-color: #999999; + } + .content { width: auto; height: 100vh; @@ -45,14 +58,8 @@ body { .container { padding: 15px 20px 30px 20px; - background: #fff; - border: 1px solid #ddd; - border-radius: 5px; + background: #ffffff; margin-bottom 80px - - .handle-box { - margin-bottom: 20px; - } } .crumbs { @@ -60,7 +67,7 @@ body { } .el-table th { - background-color: #f5f7fa !important; + background-color: #f5f7fa; } .pagination { @@ -142,6 +149,23 @@ body { display: none !important; } } + + .dark { + background: var(--el-bg-color); + + .container { + background: var(--el-bg-color); + } + + .crumbs { + margin: 10px 0; + } + + .el-table th { + background-color: var(--el-fill-color-darker); + } + + } } .content-collapse { diff --git a/web/src/components/admin/AdminSidebar.vue b/web/src/components/admin/AdminSidebar.vue index 6b52f544..cf5f360e 100644 --- a/web/src/components/admin/AdminSidebar.vue +++ b/web/src/components/admin/AdminSidebar.vue @@ -1,5 +1,5 @@