-
- ![Blog image]()
-
+ {{ blog.title[0] }}
- {{ blog.title }}
- +{{ blog.post_date }}
{{ tag }}
@@ -39,26 +38,11 @@ defineProps({
cursor: pointer;
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
}
-.image-container {
- width: 100%;
- height: 100%;
-}
-.image-container .cover-character {
- width: 100%;
- height: 100%;
- font-size: 200px;;
- font-family: 'huangkaihua', Tahoma, Geneva, Verdana, sans-serif;
- color: gray;
- mix-blend-mode: difference;
-}
-.blog-image {
- width: 100%;
- height: 200px;
- object-fit: cover;
-}
+
.blog-details {
+ z-index: 10;
background: #111111;
width: 100%;
padding: 10px;
diff --git a/src/components/Blog_commentDisplay.vue b/src/components/Blog_commentDisplay.vue
new file mode 100644
index 0000000..35962ae
--- /dev/null
+++ b/src/components/Blog_commentDisplay.vue
@@ -0,0 +1,148 @@
+
+ ![Demo image]()
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/Blog_rootComment.vue b/src/components/Blog_rootComment.vue
new file mode 100644
index 0000000..a4bc5a0
--- /dev/null
+++ b/src/components/Blog_rootComment.vue
@@ -0,0 +1,122 @@
+
+
+
+
+
+
+
+ 加载中...
+ 没有更多评论了
+ {{ error }}
+ 暂无评论
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/DefaultCover.vue b/src/components/DefaultCover.vue
new file mode 100644
index 0000000..abd28aa
--- /dev/null
+++ b/src/components/DefaultCover.vue
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+ {{ comment.content }}
+
+
+
+ ![image]()
+
+
+
+
\ No newline at end of file
diff --git a/src/components/Demos_box.vue b/src/components/Demos_box.vue
index 1582ddb..405f08d 100644
--- a/src/components/Demos_box.vue
+++ b/src/components/Demos_box.vue
@@ -10,6 +10,7 @@ defineProps({
+ {{ text[0] }}
+
+ {{ demo.name }}
+{{ demo.description }}
{{ demo.date }}
@@ -93,6 +94,11 @@ h3 {
opacity: 0.5;
transition: opacity 0.3s ease;
}
+.description {
+ font-size: 14px;
+ opacity: 0.5;
+ transition: opacity 0.3s ease;
+}
.demo-box:hover .author {
opacity: 1;
}
@@ -151,7 +157,6 @@ h3 {
.demo-box.no-image .demo-details {
- gap: 15px;
align-items: center;
}
diff --git a/src/components/Like_button.vue b/src/components/Like_button.vue
index aaa076b..d4f84dc 100644
--- a/src/components/Like_button.vue
+++ b/src/components/Like_button.vue
@@ -1,7 +1,12 @@
-
@@ -93,20 +113,41 @@ label {
cursor: pointer;
user-select: none;
}
+label.disable {
+ cursor: not-allowed;
+}
.like {
display: flex;
flex-direction: row;
- align-items: center;
+ align-items: normal;
justify-content: center;
overflow: hidden;
gap: 3px;
color: gray;
}
+.disable.like {
+ cursor: not-allowed;
+}
+.like.vertical {
+ align-items: center;
+ flex-direction: column;
+ gap: 0;
+}
.like button {
color: gray;
padding: 4px 0 0;
}
+.like.vertical button {
+ width: 50px;
+}
+
+span {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+}
\ No newline at end of file
diff --git a/src/components/More_button.vue b/src/components/More_button.vue
new file mode 100644
index 0000000..8da8120
--- /dev/null
+++ b/src/components/More_button.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index 7ee2d6a..fb7af14 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -31,10 +31,19 @@
-
@@ -91,6 +100,14 @@ const toggleTheme = () => {
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f9e9ffb..19a2569 100644
--- a/src/main.js
+++ b/src/main.js
@@ -2,6 +2,8 @@ import { createApp } from 'vue'
import App from './App.vue'
import store from './store'
import router from './router'
+import ElementPlus from 'element-plus';
+import 'element-plus/dist/index.css';
import $ from 'jquery';
import './style.css'
@@ -13,4 +15,5 @@ window.jQuery = $;
app.use(router);
app.use(store);
+app.use(ElementPlus);
app.mount('#app')
diff --git a/src/pages/About.vue b/src/pages/About.vue
index 2b7b110..ccfd1bc 100644
--- a/src/pages/About.vue
+++ b/src/pages/About.vue
@@ -4,9 +4,10 @@ import MarkdownViewer from '../components/mdRenderer.vue';
import api from "../utils/axios.js";
import swal from "../utils/sweetalert.js";
import PagingController from "../components/PagingController.vue";
+import store from "../store/index.js";
-const messages = ref([]);
+const messages = ref(store.state.sessionStore.webLog ||[]);
const pageLoading = ref(false);
const amount = ref(1);
@@ -22,6 +23,7 @@ async function refreshLog(page, size) {
}
amount.value = Math.ceil(res.amount / size);
messages.value = res.data;
+ store.state.sessionStore.webLog = messages.value;
return 0;
}
diff --git a/src/pages/Blog_home.vue b/src/pages/Blog_home.vue
index 9140b1f..3c3d91c 100644
--- a/src/pages/Blog_home.vue
+++ b/src/pages/Blog_home.vue
@@ -5,6 +5,7 @@ import {getRandomIMG} from "../utils/randomIMG.js";
import PagingController from "../components/PagingController.vue";
import api from "../utils/axios.js";
import store from "../store/index.js";
+import swal from "../utils/sweetalert.js";
const tags = ref([]);
@@ -35,16 +36,25 @@ const refreshBlogs = async (page, size, sort) => {
sort = sort || 'post_date';
const tempPage = currentPage.value;
currentPage.value = page;
- const blogsResponse = await api.get(`/blogs?page=${page}&size=${size}&sort=${sort}`);
- if (!blogsResponse.amount) {
- currentPage.value = tempPage;
- return;
+ try {
+ const blogsResponse = await api.get(`/blogs?page=${page}&size=${size}&sort=${sort}`);
+ if (!blogsResponse.amount) {
+ currentPage.value = tempPage;
+ swal.tip('error', '加载失败...');
+ loadingText.value = '加载失败, 请刷新重试'
+ return;
+ }
+ amount.value = Math.ceil(blogsResponse.amount / size);
+ blogs.value = blogsResponse.data;
+ currentPage.value = page;
+ store.commit('setSessionValue', {key: 'blog', value: {blogs: blogs, blogAmount: amount, blogCurrentPage: currentPage}});
+ console.log(store.state.sessionStore.blog)
+ } catch {
+ swal.tip('error', '加载失败...');
+ loadingText.value = '加载失败, 请刷新重试'
}
- amount.value = Math.ceil(blogsResponse.amount / size);
- blogs.value = blogsResponse.blogs;
- currentPage.value = page;
- store.commit('setSessionValue', {key: 'blog', value: {blogs: blogs, blogAmount: amount, blogCurrentPage: currentPage}});
- console.log(store.state.sessionStore.blog)
+
+
}
onMounted(() => {
@@ -69,7 +79,7 @@ onMounted(() => {
+
+
+
![User Avatar]()
{{ store.state.userInfo.username }}
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/pages/Test_page.vue b/src/pages/Test_page.vue
index 77cc9f5..f79cdd8 100644
--- a/src/pages/Test_page.vue
+++ b/src/pages/Test_page.vue
@@ -1,26 +1,11 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/pages/accountPages/Account.vue b/src/pages/accountPages/Account.vue
index 0f56f20..a0e0258 100644
--- a/src/pages/accountPages/Account.vue
+++ b/src/pages/accountPages/Account.vue
@@ -25,25 +25,25 @@ onMounted(() => {
@@ -42,6 +76,7 @@ function createNewDraft() {
flex-direction: column;
align-items: center;
color: #f5f6f7;
+ margin-bottom: 40px;
animation: fadeIn 0.3s ease-in-out;
}
@@ -52,7 +87,9 @@ function createNewDraft() {
.top-bar {
display: flex;
+ flex-direction: column;
justify-content: center;
+ gap: 20px;
margin: 20px 0;
}
@@ -64,6 +101,7 @@ function createNewDraft() {
border-radius: 4px;
cursor: pointer;
}
+
.create-btn:hover {
background-color: #2f5687;
}
@@ -72,6 +110,7 @@ function createNewDraft() {
background-color: #ffc107;
color: #333333;
}
+
.theme-light .create-btn:hover {
background-color: #e0a806;
}
@@ -82,6 +121,7 @@ function createNewDraft() {
gap: 10px;
width: 80%;
max-width: 800px;
+ margin-bottom: 40px;
}
@keyframes fadeIn {
diff --git a/src/pages/accountPages/Account_setting.vue b/src/pages/accountPages/Account_setting.vue
index 4a6ae67..2e85004 100644
--- a/src/pages/accountPages/Account_setting.vue
+++ b/src/pages/accountPages/Account_setting.vue
@@ -73,7 +73,9 @@ function cancelEditUsername() {
function logout() {
AuthService.logout();
- router.replace('/login')
+ store.commit('cleanEditStore');
+ store.state.sessionStore.account = {};
+ router.replace('/login');
}
// 进入编辑简介
diff --git a/src/pages/accountPages/Account_worksmanage.vue b/src/pages/accountPages/Account_worksmanage.vue
index 674c02f..9ec373c 100644
--- a/src/pages/accountPages/Account_worksmanage.vue
+++ b/src/pages/accountPages/Account_worksmanage.vue
@@ -1,56 +1,93 @@
+
-
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/blogPages/submitBlogPages/SubmitBlog_step_interaction.vue b/src/pages/blogPages/submitBlogPages/SubmitBlog_step_interaction.vue
new file mode 100644
index 0000000..ac98ab2
--- /dev/null
+++ b/src/pages/blogPages/submitBlogPages/SubmitBlog_step_interaction.vue
@@ -0,0 +1,37 @@
+
+
+
+
+
+ 是
+ 否
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/blogPages/submitBlogPages/SubmitBlog_step_submit.vue b/src/pages/blogPages/submitBlogPages/SubmitBlog_step_submit.vue
new file mode 100644
index 0000000..1d20b5e
--- /dev/null
+++ b/src/pages/blogPages/submitBlogPages/SubmitBlog_step_submit.vue
@@ -0,0 +1,33 @@
+
+
+
+
+ 提交
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/blogPages/submitBlogPages/SubmitBlog_step_tag.vue b/src/pages/blogPages/submitBlogPages/SubmitBlog_step_tag.vue
new file mode 100644
index 0000000..bdae269
--- /dev/null
+++ b/src/pages/blogPages/submitBlogPages/SubmitBlog_step_tag.vue
@@ -0,0 +1,93 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/demoPages/gunGame/gunGame_page.vue b/src/pages/demoPages/gunGame/gunGame_page.vue
new file mode 100644
index 0000000..07277d7
--- /dev/null
+++ b/src/pages/demoPages/gunGame/gunGame_page.vue
@@ -0,0 +1,31 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/blogPages/blogEditor.vue b/src/pages/blogPages/blogEditor.vue
new file mode 100644
index 0000000..6624474
--- /dev/null
+++ b/src/pages/blogPages/blogEditor.vue
@@ -0,0 +1,799 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/blogPages/submitBlogPages/SubmitBlog_page.vue b/src/pages/blogPages/submitBlogPages/SubmitBlog_page.vue
new file mode 100644
index 0000000..d7fb65f
--- /dev/null
+++ b/src/pages/blogPages/submitBlogPages/SubmitBlog_page.vue
@@ -0,0 +1,153 @@
+
+
+
+
+
+ {{ titleInput }}
+
+
+
+
+ ![Poster Avatar]()
+
+ {{ store.state.userInfo.username || '' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上一步
+ 下一步
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/blogPages/submitBlogPages/SubmitBlog_step_check.vue b/src/pages/blogPages/submitBlogPages/SubmitBlog_step_check.vue
new file mode 100644
index 0000000..206337a
--- /dev/null
+++ b/src/pages/blogPages/submitBlogPages/SubmitBlog_step_check.vue
@@ -0,0 +1,44 @@
+
+
+
+ 请确认信息
+ -
+
- {{ info.allowComment ? '' : '不' }}允许评论 +
- 分类: {{ info.tagSelect }} +
是否允许评论？
+ 点击提交博客
+ 选择或新建分类
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/demoPages/messageBoard/Board_page.vue b/src/pages/demoPages/messageBoard/Board_page.vue
index 64d618e..f7eaea8 100644
--- a/src/pages/demoPages/messageBoard/Board_page.vue
+++ b/src/pages/demoPages/messageBoard/Board_page.vue
@@ -107,8 +107,7 @@ async function clickRefresh() {
}
pageLoading.value = false;
}
-
-let interval = null; // 定时器引用
+let interval;
function startCountdown() {
if (interval) clearInterval(interval); // 避免重复创建定时器
@@ -132,15 +131,8 @@ watch(sendCD, (newValue) => {
onMounted(async () => {
await refreshBoard();
- timer = setInterval(refreshBoard, 7000);
});
-onBeforeUnmount(() => {
- if (timer) {
- clearInterval(timer);
- timer = null; // ✅ 避免悬空定时器
- }
-});
diff --git a/src/pages/demoPages/messageBoard/Message.vue b/src/pages/demoPages/messageBoard/Message.vue
index a54754c..c34215f 100644
--- a/src/pages/demoPages/messageBoard/Message.vue
+++ b/src/pages/demoPages/messageBoard/Message.vue
@@ -44,8 +44,8 @@ async function deleteMessage(id, message) {
{{ message.content }}
{{ message.date }}
-
diff --git a/src/router/index.js b/src/router/index.js
index f4b8dea..45ccf8e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -27,11 +27,14 @@ import PdfEx_page from "../pages/toolPages/pdfExtractor/pdfEx_page.vue";
import RequestTester_page from "../pages/toolPages/RequestTester/requestTester_page.vue";
import About from "../pages/About.vue";
-import Editor from "../pages/Editor.vue";
+import Editor from "../pages/blogPages/blogEditor.vue";
import NotFound from "../pages/errorPages/notFound.vue";
import Test_page from "../pages/Test_page.vue";
import SingleBlog_page from "../pages/blogPages/SingleBlog_page.vue";
+import SubmitBlog_page from "../pages/blogPages/submitBlogPages/SubmitBlog_page.vue";
+import swal from "../utils/sweetalert.js";
+import GunGame_page from "../pages/demoPages/gunGame/gunGame_page.vue";
const routes = [
{path: '/404',
@@ -59,6 +62,11 @@ const routes = [
component: SingleBlog_page,
meta: {title: '博客'}
}, {
+ path: '/blog/submit',
+ name: 'SubmitBlog',
+ component: SubmitBlog_page,
+ meta: {title: '发布博客'}
+ },{
path: '/projects',
name: 'Projects',
component: Projects,
@@ -81,7 +89,12 @@ const routes = [
children: [
{path: "quiz", component: Pod_quiz}
]
- }
+ },
+ {
+ path: "gungame3d",
+ component: GunGame_page,
+ meta: {title: '打枪 '},
+ },
]
}, {
path: '/tools',
@@ -132,7 +145,7 @@ const router = createRouter({
routes
});
-router.beforeEach((to, from, next) => {
+router.beforeEach(async (to, from, next) => {
if (!store.state.userInfo.uid && store.state.token) {
AuthService.setSelfInfo();
}
@@ -149,6 +162,15 @@ router.beforeEach((to, from, next) => {
next('/account');
}
+ if ((from.path === '/editor' && store.state.editStore.isEditing && to.path !== '/blog/submit') ||
+ (from.path === '/blog/submit' && store.state.sessionStore.currentBlogId)
+ ) {
+ const result = await swal.window('info', '确定要退出吗?', '未保存的内容会丢失', '确认', '返回');
+ if (!result.isConfirmed) {
+ return;
+ }
+ }
+
if (to.matched.length === 0) {
next('/404');
}
diff --git a/src/store/index.js b/src/store/index.js
index 10c4fb4..27c049c 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -7,12 +7,17 @@ const store = createStore({
state: {
theme: localStorage.getItem('theme') || 'dark',
loading: {},
+ navBar: {
+ display: true
+ },
token: null,
userInfo: {},
editStore: {},
editAutoSave: {on: true, interval: 30000},
demosLocal: {},
- sessionStore: {},
+ sessionStore: {
+ account: {}
+ },
},
mutations: {
toggleTheme(state) {
@@ -46,11 +51,17 @@ const store = createStore({
state.sessionStore[obj.key] = {...state.sessionStore[obj.key], ...obj.value}
},
deleteSessionValue(state, obj) {
+ if (typeof obj === 'string') {
+ delete state.sessionStore[obj.key];
+ }
delete state.sessionStore[obj.key][obj.value];
},
saveEdit(state, obj) {
state.editStore = {...state.editStore, ...obj};
},
+ cleanEditStore(state) {
+ state.editStore = {};
+ },
setLogTemp(state, arr) {
state.log = arr;
},
@@ -59,7 +70,13 @@ const store = createStore({
},
setAutoSaveTime(state, ms) {
state.editAutoSave.interval = Number(ms) || 30000;
- }
+ },
+ showNavBar(state) {
+ state.navBar.display = true;
+ },
+ hideNavBar(state) {
+ state.navBar.display = false;
+ },
},
getters: {
currentTheme: state => state.theme,
diff --git a/src/style.css b/src/style.css
index a66cf4e..f54c849 100644
--- a/src/style.css
+++ b/src/style.css
@@ -89,6 +89,10 @@ code {
border: 2px solid #ddd;
}
+.el-tooltip__trigger:focus-visible {
+ outline: unset;
+}
+
/*::-webkit-scrollbar {*/
/* display: none;*/
/*}*/
@@ -132,3 +136,20 @@ code {
.theme-light ::-webkit-scrollbar-thumb:hover {
background-color: #aaa;
}
+
+.fade-enter-active,
+.fade-leave-active {
+ transition: opacity 0.5s ease, transform 0.5s ease;
+}
+
+.fade-enter-from,
+.fade-leave-to {
+ opacity: 0;
+ transform: translateY(20px); /* 从下方 20px 进入 */
+}
+
+.fade-enter-to,
+.fade-leave-from {
+ opacity: 1;
+ transform: translateY(0);
+}
\ No newline at end of file
diff --git a/src/utils/formatTime.js b/src/utils/formatTime.js
new file mode 100644
index 0000000..077e5da
--- /dev/null
+++ b/src/utils/formatTime.js
@@ -0,0 +1,91 @@
+export function formatGMTToLocal(timeString, sub) {
+ try {
+ if (!timeString || typeof timeString !== "string") {
+ throw new Error("Invalid input: timeString must be a non-empty string.");
+ }
+
+ const date = new Date(timeString);
+ if (isNaN(date.getTime())) {
+ throw new Error("Invalid date format.");
+ }
+
+ // 转换为北京时间（UTC+8）
+ const beijingTime = new Date(date.getTime() - 8 * 60 * 60 * 1000);
+
+ // 格式化时间
+ const year = beijingTime.getFullYear();
+ const month = String(beijingTime.getMonth() + 1).padStart(2, "0");
+ const day = String(beijingTime.getDate()).padStart(2, "0");
+ const hours = String(beijingTime.getHours()).padStart(2, "0");
+ const minutes = String(beijingTime.getMinutes()).padStart(2, "0");
+ const seconds = String(beijingTime.getSeconds()).padStart(2, "0");
+
+ const result = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+ return result.substring(0, result.length - sub);
+ } catch (error) {
+ return "未知时间";
+ }
+}
+export function getCurrentISODateTime() {
+ const date = new Date();
+
+ const year = date.getFullYear();
+ const month = String(date.getMonth() + 1).padStart(2, "0");
+ const day = String(date.getDate()).padStart(2, "0");
+
+ const hours = String(date.getHours()).padStart(2, "0");
+ const minutes = String(date.getMinutes()).padStart(2, "0");
+ const seconds = String(date.getSeconds()).padStart(2, "0");
+
+ return `${year}-${month}-${day}T${hours}:${minutes}:${seconds}`;
+}
+
+export function timeDifference(dateString) {
+ try {
+ if (!dateString || typeof dateString !== "string") {
+ throw new Error("Invalid input: dateString must be a non-empty string.");
+ }
+
+ let inputDate = new Date(dateString);
+ if (isNaN(inputDate.getTime())) {
+ // 尝试转换 "yyyy-mm-dd hh:mm:ss" 格式
+ inputDate = new Date(dateString.replace(" ", "T"));
+ if (isNaN(inputDate.getTime())) {
+ throw new Error("Invalid date format.");
+ }
+ }
+
+ const now = new Date();
+ const diffInMs = now - inputDate;
+ const diffInSeconds = Math.floor(diffInMs / 1000);
+ const diffInMinutes = Math.floor(diffInSeconds / 60);
+ const diffInHours = Math.floor(diffInMinutes / 60);
+ const diffInDays = Math.floor(diffInHours / 24);
+ const diffInMonths = Math.floor(diffInDays / 30); // Approximation
+ const diffInYears = Math.floor(diffInDays / 365); // Approximation
+
+ console.log({diffInMs,diffInSeconds ,diffInMinutes ,diffInHours ,diffInDays })
+
+ if (diffInSeconds < 0) {
+ return `刚刚`;
+ } else if (diffInSeconds < 60) {
+ return `${diffInSeconds}秒前`;
+ } else if (diffInMinutes < 60) {
+ return `${diffInMinutes}分钟前`;
+ } else if (diffInHours < 24) {
+ return `${diffInHours}小时前`;
+ } else if (diffInDays < 30) {
+ return `${diffInDays}天前`;
+ } else if (diffInMonths < 12) {
+ const monthAndDay = `${inputDate.getMonth() + 1}月${inputDate.getDate()}日`;
+ return now.getFullYear() === inputDate.getFullYear()
+ ? `${monthAndDay}`
+ : `${inputDate.getFullYear()}年${monthAndDay}`;
+ } else {
+ return `${inputDate.getFullYear()}年${inputDate.getMonth() + 1}月${inputDate.getDate()}日`;
+ }
+ } catch (error) {
+ // console.error("timeDifference Error:", error.message);
+ return "未知时间";
+ }
+}
diff --git a/src/utils/getInfoWithPages.js b/src/utils/getInfoWithPages.js
new file mode 100644
index 0000000..ad6bf2d
--- /dev/null
+++ b/src/utils/getInfoWithPages.js
@@ -0,0 +1,18 @@
+import {getDomain} from "./getDomain.js";
+import api from "./axios.js";
+
+export async function getInfoWithPages(url, page, size, other) {
+
+ const otherKeys = Object.keys(other || []);
+ let queryURL = url + `?page=${page || 1}&size=${size || 5}`;
+ otherKeys.forEach(key => {
+ queryURL += `&${key}=${other[key]}`;
+ })
+ try {
+ const response = await api.get(queryURL);
+ return response;
+ } catch {
+ return {code: 3};
+ }
+
+}
\ No newline at end of file
diff --git a/src/utils/sweetalert.js b/src/utils/sweetalert.js
index 2e6826c..18c26de 100644
--- a/src/utils/sweetalert.js
+++ b/src/utils/sweetalert.js
@@ -3,12 +3,14 @@ import Swal from 'sweetalert2';
const swalInstantiations = {
tip: Swal.mixin({
- toast: true, // 弹窗类型为 Toast
- position: 'top', // 弹窗显示位置
-
+ toast: true, // 以 Toast 形式展示
+ position: 'top', // 弹出位置
showConfirmButton: false, // 不显示确认按钮
- timer: 3000, // 弹窗显示3秒后自动关闭
+ showCloseButton: true, // ✅ 添加关闭按钮
+ timer: 3000, // 自动关闭时间 3 秒
+ // timerProgressBar: true, // 显示倒计时进度条
didOpen: (toast) => {
+ Swal.getPopup().style.marginTop = '60px';
toast.addEventListener('mouseenter', Swal.stopTimer);
toast.addEventListener('mouseleave', Swal.resumeTimer);
}
@@ -21,6 +23,7 @@ const swalInstantiations = {
confirmButtonText: '删除',
cancelButtonText: '取消',
didOpen: (toast) => {
+ Swal.getPopup().style.marginTop = '0';
toast.addEventListener('mouseenter', Swal.stopTimer);
toast.addEventListener('mouseleave', Swal.resumeTimer);
}
diff --git a/vite.config.js b/vite.config.js
index bbcf80c..c9cba4e 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -1,7 +1,37 @@
import { defineConfig } from 'vite'
+
import vue from '@vitejs/plugin-vue'
-// https://vite.dev/config/
+import AutoImport from 'unplugin-auto-import/vite'
+
+import Components from 'unplugin-vue-components/vite'
+
+import { ElementPlusResolver } from 'unplugin-vue-components/resolvers'
+
export default defineConfig({
- plugins: [vue()],
-})
+ css: {
+ preprocessorOptions: {
+ scss: {
+ additionalData: `@import "./src/assets/styles/element/index.scss";` // 你的全局 SCSS 文件路径
+ }
+ }
+ },
+ plugins: [
+
+ vue(),
+
+ AutoImport({
+
+ resolvers: [ElementPlusResolver()],
+
+ }),
+
+ Components({
+
+ resolvers: [ElementPlusResolver()],
+
+ }),
+
+ ],
+
+})
\ No newline at end of file