diff --git a/.env.development b/.env.development index c6c0864..159efbd 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # 变量必须以 VITE_ 为前缀才能暴露给外部读取 NODE_ENV = 'development' -VITE_APP_BASE_API = 'https://tools.1024tool.vip/' -VITE_SERVE = "https://tools.1024tool.vip/" +VITE_APP_BASE_API = 'https://ddbs.1024tool.vip/' +VITE_SERVE = "https://ddbs.1024tool.vip/" # VITE_SERVE = "http://192.168.210.29:18100/" diff --git a/package.json b/package.json index 56c81a7..98ad9fd 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "element-plus": "^2.8.0", "mitt": "^3.0.1", "moment": "^2.29.4", + "js-md5": "^0.8.3", "nprogress": "^0.2.0", "pinia": "^2.1.6", "pinia-plugin-persistedstate": "^3.2.0", diff --git a/src/layout/home/index.vue b/src/layout/home/index.vue index 682c059..0356986 100644 --- a/src/layout/home/index.vue +++ b/src/layout/home/index.vue @@ -57,7 +57,7 @@ const cachedComponents = computed(() => .el-main { height: 100%; background-color: #fff; - min-width: 1250px; + // min-width: 1250px; padding: 20px; overflow: hidden; } diff --git a/src/styles/index.scss b/src/styles/index.scss index c4428f2..31c3770 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -5,10 +5,10 @@ // --my-shadow: 0 1px 3px 0 rgba(0, 0, 0, .1); // --my-shadow-large: 0px 0px 3px 5px var(--el-border-color); // --my-shadow-small: 0px 0px 0px 1px var(--el-border-color); - --my-border-radius: 8px; - --my-border-radius-large: 16px; - --my-border-radius-small: 4px; - --el-fill-color-blank: rgba(240, 245, 245, 1) !important; + // --my-border-radius: 8px; + // --my-border-radius-large: 16px; + // --my-border-radius-small: 4px; + // --el-fill-color-blank: rgba(240, 245, 245, 1) !important; } //滚动条外观设置 @@ -23,89 +23,89 @@ border-radius: 10px; } -.el-popover.el-popper { - border-radius: var(--my-border-radius) !important; -} +// .el-popover.el-popper { +// border-radius: var(--my-border-radius) !important; +// } -.el-popper__arrow { - display: none; -} +// .el-popper__arrow { +// display: none; +// } -.el-popper.is-light { - border: 0; -} +// .el-popper.is-light { +// border: 0; +// } -.pagination-box { - // overflow: hidden; - margin-top: 25px; - text-align: right; - height: 30px; +// .pagination-box { +// // overflow: hidden; +// margin-top: 25px; +// text-align: right; +// height: 30px; - .el-pagination { - float: right; - } -} -.el-table { - --el-table-header-text-color: var(--el-color-primary) !important; - --el-table-bg-color: var(--el-bg-color) !important; -} +// .el-pagination { +// float: right; +// } +// } +// .el-table { +// --el-table-header-text-color: var(--el-color-primary) !important; +// --el-table-bg-color: var(--el-bg-color) !important; +// } -.el-input { - --el-select-input-focus-border-color: none !important; - --el-input-bg-color: rgba(240, 245, 245, 1) !important; - --el-input-focus-border-color: none; - --el-input-border-color: none !important; -} +// .el-input { +// --el-select-input-focus-border-color: none !important; +// --el-input-bg-color: rgba(240, 245, 245, 1) !important; +// --el-input-focus-border-color: none; +// --el-input-border-color: none !important; +// } -.el-input__wrapper.is-focus, -.el-select__wrapper.is-focused, -.el-select__wrapper { - box-shadow: none !important; -} +// .el-input__wrapper.is-focus, +// .el-select__wrapper.is-focused, +// .el-select__wrapper { +// box-shadow: none !important; +// } -.el-textarea, -.el-date-editor, -.el-cascader { - --el-input-focus-border-color: none !important; - --el-input-bg-color: rgba(240, 245, 245, 1) !important; - --el-input-border-color: none !important; -} +// .el-textarea, +// .el-date-editor, +// .el-cascader { +// --el-input-focus-border-color: none !important; +// --el-input-bg-color: rgba(240, 245, 245, 1) !important; +// --el-input-border-color: none !important; +// } -.el-input__wrapper:hover, -.el-textarea__inner:hover, -.el-input-group__append:hover, -.el-input-group__prepend:hover { - box-shadow: none !important; +// .el-input__wrapper:hover, +// .el-textarea__inner:hover, +// .el-input-group__append:hover, +// .el-input-group__prepend:hover { +// box-shadow: none !important; -} +// } -.el-input__wrapper.is-focus, -.el-textarea__inner:focus, -.el-date-editor.is-active { - box-shadow: none !important; +// .el-input__wrapper.is-focus, +// .el-textarea__inner:focus, +// .el-date-editor.is-active { +// box-shadow: none !important; -} +// } -.el-input-group__append, -.el-input-group__prepend { - background: var(--el-input-bg-color) !important; - box-shadow: none !important; - padding: 0 10px !important; -} +// .el-input-group__append, +// .el-input-group__prepend { +// background: var(--el-input-bg-color) !important; +// box-shadow: none !important; +// padding: 0 10px !important; +// } -.el-textarea, -.el-date-editor, -.el-cascader { - --el-input-focus-border-color: none !important; - --el-input-border-color: none !important; -} +// .el-textarea, +// .el-date-editor, +// .el-cascader { +// --el-input-focus-border-color: none !important; +// --el-input-border-color: none !important; +// } -.el-radio{ - --el-radio-input-bg-color: #fff!important; -} +// .el-radio{ +// --el-radio-input-bg-color: #fff!important; +// } -.el-descriptions__body { - background-color: #fff!important; -} \ No newline at end of file +// .el-descriptions__body { +// background-color: #fff!important; +// } \ No newline at end of file diff --git a/src/views/adminPages/AICreation/index.vue b/src/views/adminPages/AICreation/index.vue deleted file mode 100644 index 22e9f02..0000000 --- a/src/views/adminPages/AICreation/index.vue +++ /dev/null @@ -1,769 +0,0 @@ - - - \ No newline at end of file diff --git a/src/views/adminPages/hot/index.vue b/src/views/adminPages/hot/index.vue deleted file mode 100644 index f8c6324..0000000 --- a/src/views/adminPages/hot/index.vue +++ /dev/null @@ -1,128 +0,0 @@ - - - \ No newline at end of file diff --git a/src/views/adminPages/works/index.vue b/src/views/adminPages/works/index.vue deleted file mode 100644 index 533dfdb..0000000 --- a/src/views/adminPages/works/index.vue +++ /dev/null @@ -1,8 +0,0 @@ - - diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 10c4991..414355d 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -47,6 +47,7 @@ import { useRouter } from 'vue-router' import { ElMessage } from 'element-plus' import { userLogin } from '@/api/login' + import md5 from 'js-md5' const router = useRouter() const loginFormRef = ref(null) const loading = ref(false) @@ -62,7 +63,6 @@ ], password: [ { required: true, message: '请输入密码', trigger: 'blur' }, - { min: 6, message: '密码长度不能小于6位', trigger: 'blur' } ] } @@ -73,20 +73,20 @@ await loginFormRef.value.validate() loading.value = true - // TODO: 这里添加实际的登录API调用 - // const res = await login(loginForm) - userLogin(loginForm).then(res => { - console.log(res) - localStorage.setItem('TOKEN', res.data.token) - router.push('/') + // 对密码进行MD5加密 + const encryptedPassword = md5(loginForm.password) + const loginData = { + username: loginForm.username, + password: encryptedPassword + } + + userLogin(loginData).then(res => { + localStorage.setItem('TOKEN', res.token) + router.push('/user') + loading.value = false + }).catch(err => { loading.value = false }) - // 模拟登录成功 - // setTimeout(() => { - // ElMessage.success('登录成功') - // router.push('/') - // loading.value = false - // }, 1000) } catch (error) { ElMessage.error('登录失败,请检查用户名和密码') diff --git a/src/views/news/addNew.vue b/src/views/news/addNew.vue index d234c5f..9722d46 100644 --- a/src/views/news/addNew.vue +++ b/src/views/news/addNew.vue @@ -208,7 +208,7 @@ const handleCreated = (editor) => { const newTitle = ref('') - +const dialogPreview = ref(false) const handlePreviewArticle = () => { dialogPreview.value = true } @@ -220,7 +220,9 @@ const handlePreviewArticle = () => { onMounted(() => { - + if(route.query.id){ + newTitle.value = sessionStorage.getItem('title') + } }) // Auto-resize directive diff --git a/src/views/news/index.vue b/src/views/news/index.vue index 0db6986..07484ba 100644 --- a/src/views/news/index.vue +++ b/src/views/news/index.vue @@ -1,33 +1,44 @@