From 65a1cef200acf2e9175521588da13778a1e34fc6 Mon Sep 17 00:00:00 2001 From: panda <7934952@qq.com> Date: Thu, 11 Jul 2024 17:10:41 +0800 Subject: [PATCH] add new --- src/assets/image.png | Bin 0 -> 11015 bytes src/assets/index.ts | 6 +- src/components/blogs/HomePage.vue | 104 ++++++++- src/components/blogs/ceshi.vue | 210 +++--------------- src/views/blog/blogcontent/BlogDetailView.vue | 41 ++-- src/views/blog/blogcontent/BlogListView.vue | 68 +++--- 6 files changed, 202 insertions(+), 227 deletions(-) create mode 100644 src/assets/image.png diff --git a/src/assets/image.png b/src/assets/image.png new file mode 100644 index 0000000000000000000000000000000000000000..fafa25f079a80f4c26364ffec9a84747dd11c820 GIT binary patch literal 11015 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 B<@f*q literal 0 HcmV?d00001 diff --git a/src/assets/index.ts b/src/assets/index.ts index 6e518ca..d22d9a9 100644 --- a/src/assets/index.ts +++ b/src/assets/index.ts @@ -3,7 +3,7 @@ import { createFromIconfontCN } from '@ant-design/icons-vue'; function createIconComponent(iconType: string) { const IconComponent = createFromIconfontCN({ - scriptUrl: '//at.alicdn.com/t/c/font_4513281_qhbaqfo6egj.js', // 在 iconfont.cn 上生成 + scriptUrl: '//at.alicdn.com/t/c/font_4513281_1cb6b9dny0i.js', // 在 iconfont.cn 上生成 }); return defineComponent({ @@ -32,6 +32,10 @@ const iconComponents = { YanJingLined: createIconComponent('icon-yanjing'), XieZiLined: createIconComponent('icon-xiezi'), CravatarLined: createIconComponent('icon-cravatar'), + GongAnLined: createIconComponent('icon-gonganbeian'), + IcpLined: createIconComponent('icon-wsmp-icprecord'), + BanQuanLined: createIconComponent('icon-banquan'), + } diff --git a/src/components/blogs/HomePage.vue b/src/components/blogs/HomePage.vue index 44f8d7a..d81fc58 100644 --- a/src/components/blogs/HomePage.vue +++ b/src/components/blogs/HomePage.vue @@ -104,6 +104,54 @@ + diff --git a/src/views/blog/blogcontent/BlogDetailView.vue b/src/views/blog/blogcontent/BlogDetailView.vue index d471d07..a0c9600 100644 --- a/src/views/blog/blogcontent/BlogDetailView.vue +++ b/src/views/blog/blogcontent/BlogDetailView.vue @@ -1,14 +1,17 @@ - - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/src/views/blog/blogcontent/BlogListView.vue b/src/views/blog/blogcontent/BlogListView.vue index d8f7063..88acd72 100644 --- a/src/views/blog/blogcontent/BlogListView.vue +++ b/src/views/blog/blogcontent/BlogListView.vue @@ -48,6 +48,16 @@ + + @@ -56,45 +66,49 @@ import { onMounted, ref } from 'vue'; import iconComponents from '@/assets'; import dayjs from 'dayjs'; import type { blogInterface } from '@/api/admin'; -import {get} from "@/tools/request" +import { get } from "@/tools/request" import router from '@/router'; const randomColor = () => { const labelColor = ref(["processing", "success", "error", "warning", "magenta", "red", "volcano", "orange", "gold", "lime", "green", "cyan", "blue", "geekblue", "purple"]) return labelColor.value[Math.floor(Math.random() * labelColor.value.length)]; } +const dataLoaded = ref(false); +// 分页 +const pageSizeOptions = ref(['10', '20', '30', '40', '50']); +const current = ref(1); +const total = ref(); +const pageSizeRef = ref(10); const bloglist = ref([]) -const blogList = async () => { +const onShowSizeChange = (page: number) => { + current.value = page; + blogList(page, pageSizeRef.value) +}; +const blogList = async (page: number, pageSize: number) => { try { - const response = await get("/blogs/list"); - if (response) { - bloglist.value = response.data.data.map((items: any, index: any) => ({ - key: (index + 1).toString(), - id: items.id, - blogtitle: items.blogtitle, - create_at: dayjs(items.create_at).format('YYYY-MM-DD HH:mm:ss'), - update_at: dayjs(items.update_at).format('YYYY-MM-DD HH:mm:ss'), - readnum: items.readnum, - readminite: (items.blogcontent.length/150).toFixed(2), - wordcount: items.blogcontent.length, - img: items.img, - blogcontent: items.blogcontent, - typename: items.typename, - labelnames: items.labelnames - })) - } else { - console.log("bloglist is not exits") - } + const response = await get('/blogs/list', { + page, + page_size: pageSize, + }); + console.log(response) + bloglist.value = response.data.data.blogs; + total.value = response.data.data.total; // 更新总数 + pageSizeRef.value = pageSize; // 更新页大小,如果需要从接口返回页大小也可以改为 response.data.data.page_size + dataLoaded.value = true } catch (error) { - console.log("bloglist is error") + console.error('Failed to fetch data', error); } +}; -} -const readMore=(id:any)=>{ + + + + +const readMore = (id: any) => { router.push(`/blog/${id}`) } onMounted(() => { - blogList(); + blogList(current.value, pageSizeRef.value); }); @@ -192,4 +206,8 @@ onMounted(() => { margin-left: 24px; } +#pagination{ + display: flex; + justify-content: right; +} \ No newline at end of file