From ecdb6a706c299c9c4ff05117d505a51266baa813 Mon Sep 17 00:00:00 2001
From: Plumbiu <99574369+Plumbiu@users.noreply.github.com>
Date: Fri, 27 Jan 2023 11:06:04 +0800
Subject: [PATCH 1/6] feat: add query

---
 frontend/components/Articles/index.vue | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/frontend/components/Articles/index.vue b/frontend/components/Articles/index.vue
index 5f0395b..6e5942e 100644
--- a/frontend/components/Articles/index.vue
+++ b/frontend/components/Articles/index.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-watchEffect(() => {
-  // TODO: 请求数据
-})
+const route = useRoute()
+const path = route.path.replace('/', '')
+const sort = route.query?.sort ? route.query.sort : ''
 let pagenum = 0
 const isLoading = useState('isLoading', () => false)
 const artlistData = useArtlist(await useFetchPostData())
@@ -17,6 +17,16 @@ const addArtListItem = () => {
     }, 1000)
   }
 }
+watchEffect(() => {
+  // TODO: 请求数据
+  // const queryStr = '/api/articles/list?sort=sort&type=type&pageNum=pageNum'
+
+  // eslint-disable-next-line no-console
+  console.log('path', path)
+  // eslint-disable-next-line no-console
+  console.log('sort', sort)
+  const queryStr = path === '' ? `/api/articles/list?sort=${sort}&type=${path}&pageNum=${pagenum}` : `/api/articles/list?sort=${sort}&type=type&pageNum=${pagenum}`
+})
 onMounted(() => {
   const EmployeeWindow = window as any
   EmployeeWindow.addEventListener('scroll', addArtListItem)

From 6911b0b098e4a8265eea3dd60cbf0aba1555420d Mon Sep 17 00:00:00 2001
From: Plumbiu <99574369+Plumbiu@users.noreply.github.com>
Date: Fri, 27 Jan 2023 16:01:44 +0800
Subject: [PATCH 2/6] =?UTF-8?q?feat:=20=E8=B0=83=E7=94=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/components/Articles/Item.vue    |  16 +--
 frontend/components/Articles/index.vue   |  24 ++--
 frontend/composables/useFetchPostData.ts | 135 ++++++-----------------
 frontend/types/IPanel.ts                 |  28 +++--
 4 files changed, 70 insertions(+), 133 deletions(-)

diff --git a/frontend/components/Articles/Item.vue b/frontend/components/Articles/Item.vue
index bb6d422..159d062 100644
--- a/frontend/components/Articles/Item.vue
+++ b/frontend/components/Articles/Item.vue
@@ -1,18 +1,19 @@
 <script setup lang="ts">
 const props = defineProps({
-  uname: String,
+  name: String,
   duration: String,
   title: String,
-  desc: String,
+  summary: String,
   tags: {
     type: Array,
-    default: () => [],
+    default: (): string[] => [],
   },
   topicHeat: {
     type: Array,
     default: (): number[] => [0, 0, 0],
   },
   postID: String,
+  cover: String,
 })
 const enteredtopicHeat: (string | number)[] = props.topicHeat.map((item) => {
   const value = item as number
@@ -22,9 +23,9 @@ const enteredtopicHeat: (string | number)[] = props.topicHeat.map((item) => {
 
 <template>
   <li class="focus:text-slate-500 flex justify-between items-center py-4 transition-all bg-white hover:bg-gray-50 b-b b-grey all-cursor-pointer">
-    <NuxtLink class="flex-auto pl-5 truncate" :to="`/${uname}`" style="flex: 1">
+    <NuxtLink class="flex-auto pl-5 truncate" :to="`/${name}`" style="flex: 1">
       <div class="flex items-center all-px-4 pr-4" style="font-size: 13px;">
-        <span class="border-r-1 pl-0">{{ uname }}</span>
+        <span class="border-r-1 pl-0">{{ name }}</span>
         <span class="text-gray-500 border-r-1">{{ duration }}前</span>
         <div class="flex">
           <div v-for="(tag, index) in tags" :key="index" class="al-px-0 px-0 text-gray-500 items-center flex">
@@ -38,7 +39,7 @@ const enteredtopicHeat: (string | number)[] = props.topicHeat.map((item) => {
           {{ title }}
         </div>
         <div class="truncate pt-4 text-slate-500" style="font-size: 13px;">
-          {{ desc }}
+          {{ summary }}
         </div>
       </div>
       <div class="flex all-flex all-items-center all-text-slate-700" style="font-size: 13px;">
@@ -58,7 +59,8 @@ const enteredtopicHeat: (string | number)[] = props.topicHeat.map((item) => {
     </NuxtLink>
     <div class="px-4">
       <nuxt-img
-        src="/og-image.png"
+        :src="cover"
+        :alt="summary"
         width="120"
         height="80"
         loading="lazy"
diff --git a/frontend/components/Articles/index.vue b/frontend/components/Articles/index.vue
index 6e5942e..e5e1fcd 100644
--- a/frontend/components/Articles/index.vue
+++ b/frontend/components/Articles/index.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 const route = useRoute()
-const path = route.path.replace('/', '')
-const sort = route.query?.sort ? route.query.sort : ''
 let pagenum = 0
+const type = route.path.replace('/', '')
+const sort = route.query?.sort as string | undefined
 const isLoading = useState('isLoading', () => false)
 const artlistData = useArtlist(await useFetchPostData())
 const addArtListItem = () => {
@@ -10,22 +10,19 @@ const addArtListItem = () => {
     const timer = setTimeout(async () => {
       if (useScrollBottom()) {
         pagenum++
-        const newArtlistData = await useFetchPostData()
-        artlistData.value = newArtlistData
+        const newArtlistData = await useFetchPostData(type, sort, pagenum)
+        artlistData.value.push(...newArtlistData)
       }
       clearTimeout(timer)
     }, 1000)
   }
 }
 watchEffect(() => {
-  // TODO: 请求数据
-  // const queryStr = '/api/articles/list?sort=sort&type=type&pageNum=pageNum'
-
-  // eslint-disable-next-line no-console
-  console.log('path', path)
   // eslint-disable-next-line no-console
-  console.log('sort', sort)
-  const queryStr = path === '' ? `/api/articles/list?sort=${sort}&type=${path}&pageNum=${pagenum}` : `/api/articles/list?sort=${sort}&type=type&pageNum=${pagenum}`
+  console.log(type, sort)
+  useFetchPostData(type, sort).then((data) => {
+    artlistData.value = data
+  })
 })
 onMounted(() => {
   const EmployeeWindow = window as any
@@ -45,8 +42,9 @@ onUnmounted(() => {
     </div>
     <ul v-if="!isLoading && artlistData">
       <ArticlesItem
-        v-for="items in artlistData" :key="items.uname" :uname="items.uname" :duration="items.duration"
-        :title="items.title" :desc="items.desc" :tags="items.tags" :topic-heat="items.topicHeat"
+        v-for="items in artlistData" :key="items.id" :name="items.name" :duration="items.duration"
+        :title="items.title" :summary="items.summary" :tags="items.tagIds" :topic-heat="items.topicHeat"
+        :cover="items.cover"
       />
     </ul>
     <ArticlesSkeleton v-else />
diff --git a/frontend/composables/useFetchPostData.ts b/frontend/composables/useFetchPostData.ts
index f5407f2..51fd23b 100644
--- a/frontend/composables/useFetchPostData.ts
+++ b/frontend/composables/useFetchPostData.ts
@@ -1,5 +1,14 @@
-import type { IPanel } from '~~/types/IPanel'
-const postData: IPanel[] = []
+import type { IArticleItem } from '~~/types/IPanel'
+interface IPanel {
+  id: string
+  title: string
+  topicHeat: number[]
+  summary: string
+  cover: string
+  duration: string
+  tagIds: string[]
+  name: string
+}
 export const useArtlist = (data: IPanel[]) => useState('artlist', () => [...data] as IPanel[])
 export const useArtlistPath = (path?: string | undefined) => useState('artlistPath', () => {
   if (path === undefined)
@@ -7,108 +16,26 @@ export const useArtlistPath = (path?: string | undefined) => useState('artlistPa
   return path
 })
 // TODO: 请求数据
-export default async (/* mode = 'recommend' | 'latest' | 'heat' , pagenum = 1,  */): Promise<IPanel[]> => {
+export default async (type?: string, sort = 'recommended', pagenum = 1): Promise<IPanel[]> => {
   // 接口
-  // const fetchData = await useFetch()
-  const value = [
-    {
-      uname: 'OrzR3',
-      duration: '2月',
-      tags: ['后端', 'Go', '前端'],
-      title: 'Go 语言中的 Gin 框架',
-      desc: 'Go 语言中的 gin 框架简易上手指南，初始化安装，加载静态资源和页面，以及表单提交Go 语言中的 gin 框架简易上手指南，初始化安装，加载静态资源和页面，以及表单提交',
-      topicHeat: [3182, 22, 6],
-    },
-    {
-      uname: 'xj1',
-      duration: '2月',
-      tags: ['Vue.js', 'arco design', 'koa'],
-      title: '帮朋友搭建后台管理系统',
-      desc: '对，还是那位朋友，一位接近40的澳洲老哥，找我帮忙搞一个管理后台，他刚找到编程',
-      topicHeat: [15000, 276, 45],
-    },
-    {
-      uname: 'sx1',
-      duration: '8天',
-      tags: ['前端', '后端'],
-      title: '如何打造一个优雅的git工作流',
-      desc: '在开发中，不论是一个团队一起开发一个项目，还是自己独立开发一个项目。都少不了',
-      topicHeat: [2022, 26, 6],
-    },
-    {
-      uname: 'OrzR31',
-      duration: '2月',
-      tags: ['后端', 'Go', '前端'],
-      title: 'Go 语言中的 Gin 框架',
-      desc: 'Go 语言中的 gin 框架简易上手指南，初始化安装，加载静态资源和页面，以及表单提交Go 语言中的 gin 框架简易上手指南，初始化安装，加载静态资源和页面，以及表单提交',
-      topicHeat: [3182, 22, 6],
-    },
-    {
-      uname: 'xj2',
-      duration: '2月',
-      tags: ['Vue.js', 'arco design', 'koa'],
-      title: '帮朋友搭建后台管理系统',
-      desc: '对，还是那位朋友，一位接近40的澳洲老哥，找我帮忙搞一个管理后台，他刚找到编程',
-      topicHeat: [15000, 276, 45],
-    },
-    {
-      uname: 'sx2',
-      duration: '8天',
-      tags: ['前端', '后端'],
-      title: '如何打造一个优雅的git工作流',
-      desc: '在开发中，不论是一个团队一起开发一个项目，还是自己独立开发一个项目。都少不了',
-      topicHeat: [2022, 26, 6],
-    },
-    {
-      uname: 'OrzR32',
-      duration: '2月',
-      tags: ['后端', 'Go', '前端'],
-      title: 'Go 语言中的 Gin 框架',
-      desc: 'Go 语言中的 gin 框架简易上手指南，初始化安装，加载静态资源和页面，以及表单提交Go 语言中的 gin 框架简易上手指南，初始化安装，加载静态资源和页面，以及表单提交',
-      topicHeat: [3182, 22, 6],
-    },
-    {
-      uname: 'xj',
-      duration: '2月',
-      tags: ['Vue.js', 'arco design', 'koa'],
-      title: '帮朋友搭建后台管理系统',
-      desc: '对，还是那位朋友，一位接近40的澳洲老哥，找我帮忙搞一个管理后台，他刚找到编程',
-      topicHeat: [15000, 276, 45],
-    },
-    {
-      uname: 'sx',
-      duration: '8天',
-      tags: ['前端', '后端'],
-      title: '如何打造一个优雅的git工作流',
-      desc: '在开发中，不论是一个团队一起开发一个项目，还是自己独立开发一个项目。都少不了',
-      topicHeat: [2022, 26, 6],
-    },
-    {
-      uname: 'OrzR3',
-      duration: '2月',
-      tags: ['后端', 'Go', '前端'],
-      title: 'Go 语言中的 Gin 框架',
-      desc: 'Go 语言中的 gin 框架简易上手指南，初始化安装，加载静态资源和页面，以及表单提交Go 语言中的 gin 框架简易上手指南，初始化安装，加载静态资源和页面，以及表单提交',
-      topicHeat: [3182, 22, 6],
-    },
-    {
-      uname: 'xj',
-      duration: '2月',
-      tags: ['Vue.js', 'arco design', 'koa'],
-      title: '帮朋友搭建后台管理系统',
-      desc: '对，还是那位朋友，一位接近40的澳洲老哥，找我帮忙搞一个管理后台，他刚找到编程',
-      topicHeat: [15000, 276, 45],
-    },
-    {
-      uname: 'sx',
-      duration: '8天',
-      tags: ['前端', '后端'],
-      title: '如何打造一个优雅的git工作流',
-      desc: '在开发中，不论是一个团队一起开发一个项目，还是自己独立开发一个项目。都少不了',
-      topicHeat: [2022, 26, 6],
-    },
-  ]
+  const { data: fetchData } = await useFetch(`/api/articles/list?sort=${sort}&type=${type}&pageNum=${pagenum}`)
+  const data = fetchData.value.articles.data
+  const value: IPanel[] = data.map((item: IArticleItem) => {
+    const tagIds: string[] = []
+    item.tagIds.data.forEach((sub) => {
+      tagIds.push(sub.tag)
+    })
+    return {
+      id: item.id,
+      title: item.title,
+      topicHeat: [item.viewed, item.liked, item.commented],
+      summary: item.summary,
+      cover: item.cover,
+      duration: item.createdAt,
+      tagIds,
+      name: item.authorId.name,
+    }
+  })
   // 数据内容
-  postData.push(...value)
-  return postData
+  return value
 }
diff --git a/frontend/types/IPanel.ts b/frontend/types/IPanel.ts
index 315d37c..76b3848 100644
--- a/frontend/types/IPanel.ts
+++ b/frontend/types/IPanel.ts
@@ -1,13 +1,23 @@
-interface IPanel {
-  uname: string
-  duration: string
-  tags?: string[]
-  title: string
-  desc: string
-  topicHeat: number[]
-  imgUrl?: string
+interface IAuthor {
+  name: string
+}
+
+interface ITagItem {
+  tag: string
 }
 
+interface IArticleItem {
+  id: string
+  title: string
+  viewed: number
+  liked: number
+  commented: number
+  summary: string
+  cover: string
+  createdAt: string
+  authorId: IAuthor
+  tagIds: { data: ITagItem[] }
+}
 export {
-  IPanel,
+  IArticleItem,
 }

From 3903563cd41ee038318b2eb7f476744513115c7e Mon Sep 17 00:00:00 2001
From: Plumbiu <99574369+Plumbiu@users.noreply.github.com>
Date: Fri, 27 Jan 2023 17:02:34 +0800
Subject: [PATCH 3/6] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E9=AA=A8?=
 =?UTF-8?q?=E6=9E=B6=E5=B1=8F=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/.tmp/data.db                          | Bin 1048576 -> 1060864 bytes
 .../1.0.0/full_documentation.json             |   2 +-
 frontend/components/Articles/index.vue        |  12 +++++++-----
 frontend/composables/useFetchPostData.ts      |   5 ++---
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/backend/.tmp/data.db b/backend/.tmp/data.db
index f47ecfdda5af6bf18e330ed71d59c8daa43a5d41..29f4877fc5ac1beb8f9d7b51d695961e7e316a4f 100644
GIT binary patch
delta 10317
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

delta 8778
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%0Dls@Zy3R9wMHTVqo*LQW3+j
zGVzML#%nH=T_UYu=d+Rq1D=ycz+H9H;Ao|$T}zzYwx;9%&aQEsu=W2*0FagP+XMhF
z?(=@L0HCA%+z|l02>yxyz<Uki(|8C8HBqqlC;1Ojpi@mGlw6dbRRhsA5vpex<YbZ*
zsJw)xf6IHcly}4SOY$0{Cc6d`4H!eLWH#R$t-F7ggF-)IUgqM>4TgDwPG+0g1ME(A
zE6XLV={fo#QP79B!4F=kl*2D0uan2gVlsvFH8)UTUz%@WuK5lV3eM1!+A}l(8qd*`
zY<d%?>U#UwD3#Oowo&{w77Hzv5bw6>H+Zhn!`8_*QKB{X4AuDV^d<bfiCwQcMeK+F
zaURj`+CJtg-8L-tqpLbBI!jZtTg}H7eES$)y)x>RCJ`pb%rM)lBZt`<E*%jUe0`So
zjb$gf*ngRIYk2f5O@^FvbVXvcJpissxH3SPiJc&jAOSa_KA%WAaPmQt0eK&hsjxSb
z8rJ3<GL}KkP!hox*Vhrr4aaUK)1hoP@mim)A?;Y`neLG`kK>T_6B%Sp+D4wnq{}Gc
z5F3F{rgPxTP)e;(1DVZ2vwKC>H`;7=eMkCPWp9$hJiK;7HLPwQlD#BUm+kcX93s3l
z4Ni2x)X2(aGC4e+(M&E-nDaoG_ZP5!DCzm~DEbnEMi+JZ{Uy{mU>1~Jq^h;TO&78&
z{Jw<dCYo*yN})R$thzbe_^%Miqyr)OLE?hKOd1cDo9XyaULP4QXVM6W8%JZEud5cm
z{!O%Nhue(}xIBhN*{|b5m%FQQt_Mv8Wf+YO4Y*OY@a+l7sk9pV(hg3yae$~|6%L^5
z`G_`YZRV5?_LcZ5d~N#TzMZlnawrp=F0gViO|VwqM9mf!xN%Wo6t=vN(e{{8cqG$D
z(id9zCKu62C$X_Ok5)teWUAXoaoQsJ^pSrwG3}g7wAE@H&23?3_j8f})}DzJ*HHE@
zQSF{huze@#ZVmL({&*v3rc>eAOuXjLJdZ+z7=?$=(@Y1mFfPB{8Dc8DQA(MWR7$_#
z+d9#r9WWd09XnwDft|-F^K<+Pxrd#?IP)NT2P2wi!hv%e!LXB@&L<2(w^7Xrp;a3V
zN7L}_IwSs{f^&L_)#kfAyoG$8XYgjBD>wfCaj-aKw#%ORml*0Fbv}N5jVa|5n9+R~
rM|>(g^LCQ+^+mnr>x<GdcY6i0Vy^(c+OH;9(i)ucvL?EziMjt9MOWB*

diff --git a/backend/src/extensions/documentation/documentation/1.0.0/full_documentation.json b/backend/src/extensions/documentation/documentation/1.0.0/full_documentation.json
index 986564d..f62c954 100644
--- a/backend/src/extensions/documentation/documentation/1.0.0/full_documentation.json
+++ b/backend/src/extensions/documentation/documentation/1.0.0/full_documentation.json
@@ -14,7 +14,7 @@
       "name": "Apache 2.0",
       "url": "https://www.apache.org/licenses/LICENSE-2.0.html"
     },
-    "x-generation-date": "2023-01-27T04:58:57.064Z"
+    "x-generation-date": "2023-01-27T08:40:22.000Z"
   },
   "x-strapi-config": {
     "path": "/documentation",
diff --git a/frontend/components/Articles/index.vue b/frontend/components/Articles/index.vue
index e5e1fcd..9b76c4f 100644
--- a/frontend/components/Articles/index.vue
+++ b/frontend/components/Articles/index.vue
@@ -1,8 +1,6 @@
 <script setup lang="ts">
 const route = useRoute()
-let pagenum = 0
-const type = route.path.replace('/', '')
-const sort = route.query?.sort as string | undefined
+let pagenum = 1
 const isLoading = useState('isLoading', () => false)
 const artlistData = useArtlist(await useFetchPostData())
 const addArtListItem = () => {
@@ -10,6 +8,8 @@ const addArtListItem = () => {
     const timer = setTimeout(async () => {
       if (useScrollBottom()) {
         pagenum++
+        const type = route.path.replace('/', '')
+        const sort = route.query?.sort as (string | undefined)
         const newArtlistData = await useFetchPostData(type, sort, pagenum)
         artlistData.value.push(...newArtlistData)
       }
@@ -18,10 +18,12 @@ const addArtListItem = () => {
   }
 }
 watchEffect(() => {
-  // eslint-disable-next-line no-console
-  console.log(type, sort)
+  const type = route.path.replace('/', '')
+  const sort = route.query?.sort as (string | undefined)
+  isLoading.value = true
   useFetchPostData(type, sort).then((data) => {
     artlistData.value = data
+    isLoading.value = false
   })
 })
 onMounted(() => {
diff --git a/frontend/composables/useFetchPostData.ts b/frontend/composables/useFetchPostData.ts
index 51fd23b..caba78c 100644
--- a/frontend/composables/useFetchPostData.ts
+++ b/frontend/composables/useFetchPostData.ts
@@ -18,9 +18,8 @@ export const useArtlistPath = (path?: string | undefined) => useState('artlistPa
 // TODO: 请求数据
 export default async (type?: string, sort = 'recommended', pagenum = 1): Promise<IPanel[]> => {
   // 接口
-  const { data: fetchData } = await useFetch(`/api/articles/list?sort=${sort}&type=${type}&pageNum=${pagenum}`)
-  const data = fetchData.value.articles.data
-  const value: IPanel[] = data.map((item: IArticleItem) => {
+  const { data } = await useFetch(`/api/articles/list?sort=${sort}&type=${type}&pageNum=${pagenum}`)
+  const value: IPanel[] = data.value.map((item: IArticleItem) => {
     const tagIds: string[] = []
     item.tagIds.data.forEach((sub) => {
       tagIds.push(sub.tag)

From f52de4d205902d26ae7af3b117ac35119d15b98d Mon Sep 17 00:00:00 2001
From: Plumbiu <99574369+Plumbiu@users.noreply.github.com>
Date: Fri, 27 Jan 2023 18:45:09 +0800
Subject: [PATCH 4/6] =?UTF-8?q?fix:=20watchEffect=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B8=85=E7=A9=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/components/Articles/Item.vue    |  2 +-
 frontend/components/Articles/index.vue   | 17 ++++---
 frontend/composables/useFetchPostData.ts | 64 +++++++++++++++---------
 frontend/types/IPanel.ts                 | 11 ++++
 4 files changed, 63 insertions(+), 31 deletions(-)

diff --git a/frontend/components/Articles/Item.vue b/frontend/components/Articles/Item.vue
index 159d062..ee75fab 100644
--- a/frontend/components/Articles/Item.vue
+++ b/frontend/components/Articles/Item.vue
@@ -26,7 +26,7 @@ const enteredtopicHeat: (string | number)[] = props.topicHeat.map((item) => {
     <NuxtLink class="flex-auto pl-5 truncate" :to="`/${name}`" style="flex: 1">
       <div class="flex items-center all-px-4 pr-4" style="font-size: 13px;">
         <span class="border-r-1 pl-0">{{ name }}</span>
-        <span class="text-gray-500 border-r-1">{{ duration }}前</span>
+        <span class="text-gray-500 border-r-1">{{ duration }}</span>
         <div class="flex">
           <div v-for="(tag, index) in tags" :key="index" class="al-px-0 px-0 text-gray-500 items-center flex">
             <span class="px-0 text-gray-500">{{ tag }}</span>
diff --git a/frontend/components/Articles/index.vue b/frontend/components/Articles/index.vue
index 9b76c4f..c542df6 100644
--- a/frontend/components/Articles/index.vue
+++ b/frontend/components/Articles/index.vue
@@ -1,31 +1,34 @@
+<!-- eslint-disable no-console -->
 <script setup lang="ts">
 const route = useRoute()
-let pagenum = 1
+let pagenum = 0
 const isLoading = useState('isLoading', () => false)
 const artlistData = useArtlist(await useFetchPostData())
+console.log('0', artlistData.value)
 const addArtListItem = () => {
   if (useScrollBottom()) {
     const timer = setTimeout(async () => {
       if (useScrollBottom()) {
         pagenum++
         const type = route.path.replace('/', '')
-        const sort = route.query?.sort as (string | undefined)
+        const sort = route.query?.sort as string | undefined
         const newArtlistData = await useFetchPostData(type, sort, pagenum)
+        console.log('new', newArtlistData)
         artlistData.value.push(...newArtlistData)
       }
       clearTimeout(timer)
     }, 1000)
   }
 }
-watchEffect(() => {
-  const type = route.path.replace('/', '')
-  const sort = route.query?.sort as (string | undefined)
+watch(route, (newRoute) => {
+  const type = newRoute.path.replace('/', '')
+  const sort = newRoute.query?.sort as string | undefined
   isLoading.value = true
   useFetchPostData(type, sort).then((data) => {
     artlistData.value = data
     isLoading.value = false
   })
-})
+}, { immediate: false, deep: true })
 onMounted(() => {
   const EmployeeWindow = window as any
   EmployeeWindow.addEventListener('scroll', addArtListItem)
@@ -42,7 +45,7 @@ onUnmounted(() => {
       <ArticlesLink />
       <UnoSelect />
     </div>
-    <ul v-if="!isLoading && artlistData">
+    <ul v-if="!isLoading">
       <ArticlesItem
         v-for="items in artlistData" :key="items.id" :name="items.name" :duration="items.duration"
         :title="items.title" :summary="items.summary" :tags="items.tagIds" :topic-heat="items.topicHeat"
diff --git a/frontend/composables/useFetchPostData.ts b/frontend/composables/useFetchPostData.ts
index caba78c..2721dcd 100644
--- a/frontend/composables/useFetchPostData.ts
+++ b/frontend/composables/useFetchPostData.ts
@@ -1,25 +1,28 @@
-import type { IArticleItem } from '~~/types/IPanel'
-interface IPanel {
-  id: string
-  title: string
-  topicHeat: number[]
-  summary: string
-  cover: string
-  duration: string
-  tagIds: string[]
-  name: string
+import type { Ref } from 'vue'
+import type { IArticleItem, IPanel } from '~~/types/IPanel'
+function fixPoint(num: number) {
+  return num.toFixed(0)
 }
-export const useArtlist = (data: IPanel[]) => useState('artlist', () => [...data] as IPanel[])
-export const useArtlistPath = (path?: string | undefined) => useState('artlistPath', () => {
-  if (path === undefined)
-    return ''
-  return path
-})
-// TODO: 请求数据
-export default async (type?: string, sort = 'recommended', pagenum = 1): Promise<IPanel[]> => {
-  // 接口
-  const { data } = await useFetch(`/api/articles/list?sort=${sort}&type=${type}&pageNum=${pagenum}`)
-  const value: IPanel[] = data.value.map((item: IArticleItem) => {
+function formatTime(createdAt: string) {
+  const created = new Date(createdAt)
+  const now = new Date()
+  const duration = (now.getTime() - created.getTime()) / 1000 / 60
+  let ans = '刚刚'
+  // 年月日时分秒
+  if (duration < 60) // 一小时内
+    ans = `${fixPoint(duration)}分钟前`
+  else if (duration < 60 * 24) // 一天内
+    ans = `${fixPoint(duration / 60)}小时前`
+  else if (duration < 60 * 24 * 30) // 一个月内
+    ans = `${fixPoint(duration / 60 / 24)}天前`
+  else if (duration < 60 * 24 * 30 * 365) // 一年内
+    ans = `${fixPoint(duration / 60 / 24 / 30)}月前`
+  else // 超过一年
+    ans = `${fixPoint(duration / 60 / 24 / 30 / 365)}年前`
+  return ans
+}
+function formatArtlist(artlistData: Ref<IArticleItem[]>): IPanel[] {
+  return artlistData.value.map((item: IArticleItem) => {
     const tagIds: string[] = []
     item.tagIds.data.forEach((sub) => {
       tagIds.push(sub.tag)
@@ -30,11 +33,26 @@ export default async (type?: string, sort = 'recommended', pagenum = 1): Promise
       topicHeat: [item.viewed, item.liked, item.commented],
       summary: item.summary,
       cover: item.cover,
-      duration: item.createdAt,
+      duration: formatTime(item.createdAt),
       tagIds,
       name: item.authorId.name,
     }
   })
+}
+export const useArtlist = (data: IPanel[]) => useState('artlist', () => [...data] as IPanel[])
+export const useArtlistPath = (path?: string | undefined) => useState('artlistPath', () => {
+  if (path === undefined)
+    return ''
+  return path
+})
+// TODO: 请求数据
+export default async (type?: string, sort?: string, pagenum = 1): Promise<IPanel[]> => {
+  // 接口
+  if (type === undefined)
+    type = ''
+  if (sort === undefined)
+    sort = 'recommended'
+  const { data } = await useFetch(`/api/articles/list?sort=${sort}&type=${type}&pageNum=${pagenum}`)
   // 数据内容
-  return value
+  return formatArtlist(data)
 }
diff --git a/frontend/types/IPanel.ts b/frontend/types/IPanel.ts
index 76b3848..a88ac4c 100644
--- a/frontend/types/IPanel.ts
+++ b/frontend/types/IPanel.ts
@@ -18,6 +18,17 @@ interface IArticleItem {
   authorId: IAuthor
   tagIds: { data: ITagItem[] }
 }
+interface IPanel {
+  id: string
+  title: string
+  topicHeat: number[]
+  summary: string
+  cover: string
+  duration: string
+  tagIds: string[]
+  name: string
+}
 export {
   IArticleItem,
+  IPanel,
 }

From aa8403db057b2eecaca540f43b3e8d8dfbc64e70 Mon Sep 17 00:00:00 2001
From: Plumbiu <99574369+Plumbiu@users.noreply.github.com>
Date: Fri, 27 Jan 2023 18:55:20 +0800
Subject: [PATCH 5/6] =?UTF-8?q?fix:=20watchEffect=E5=89=AF=E4=BD=9C?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/components/Articles/index.vue | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/frontend/components/Articles/index.vue b/frontend/components/Articles/index.vue
index c542df6..f38d272 100644
--- a/frontend/components/Articles/index.vue
+++ b/frontend/components/Articles/index.vue
@@ -4,7 +4,6 @@ const route = useRoute()
 let pagenum = 0
 const isLoading = useState('isLoading', () => false)
 const artlistData = useArtlist(await useFetchPostData())
-console.log('0', artlistData.value)
 const addArtListItem = () => {
   if (useScrollBottom()) {
     const timer = setTimeout(async () => {
@@ -20,15 +19,15 @@ const addArtListItem = () => {
     }, 1000)
   }
 }
-watch(route, (newRoute) => {
-  const type = newRoute.path.replace('/', '')
-  const sort = newRoute.query?.sort as string | undefined
+watchEffect(() => {
+  const type = route.path.replace('/', '')
+  const sort = route.query?.sort as string | undefined
   isLoading.value = true
   useFetchPostData(type, sort).then((data) => {
     artlistData.value = data
     isLoading.value = false
   })
-}, { immediate: false, deep: true })
+}, { flush: 'post' })
 onMounted(() => {
   const EmployeeWindow = window as any
   EmployeeWindow.addEventListener('scroll', addArtListItem)

From 0e5c4baac2fb53dd4cf828b41346e5fe4ccf973a Mon Sep 17 00:00:00 2001
From: Plumbiu <99574369+Plumbiu@users.noreply.github.com>
Date: Fri, 27 Jan 2023 20:29:35 +0800
Subject: [PATCH 6/6] fix: remove log

---
 frontend/components/Articles/index.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frontend/components/Articles/index.vue b/frontend/components/Articles/index.vue
index f38d272..d57f1e6 100644
--- a/frontend/components/Articles/index.vue
+++ b/frontend/components/Articles/index.vue
@@ -1,4 +1,3 @@
-<!-- eslint-disable no-console -->
 <script setup lang="ts">
 const route = useRoute()
 let pagenum = 0
@@ -12,7 +11,6 @@ const addArtListItem = () => {
         const type = route.path.replace('/', '')
         const sort = route.query?.sort as string | undefined
         const newArtlistData = await useFetchPostData(type, sort, pagenum)
-        console.log('new', newArtlistData)
         artlistData.value.push(...newArtlistData)
       }
       clearTimeout(timer)