diff --git a/components/default/Home.vue b/components/default/Home.vue index 53c6cc33..9b69a1f3 100644 --- a/components/default/Home.vue +++ b/components/default/Home.vue @@ -34,13 +34,9 @@ const props = defineProps({ diff --git a/components/default/HomePage.vue b/components/default/HomePage.vue index 1e183bcd..d10d0b9f 100644 --- a/components/default/HomePage.vue +++ b/components/default/HomePage.vue @@ -53,14 +53,20 @@ const goSetting = async () => { diff --git a/components/static/Detail.vue b/components/static/Detail.vue index cf157ed1..a748b915 100644 --- a/components/static/Detail.vue +++ b/components/static/Detail.vue @@ -29,6 +29,7 @@ import { Post } from "zhi-blog-api" import { createAppLogger } from "~/common/appLogger" import { getSummery } from "~/utils/utils" import { useServerAssets } from "~/plugins/renderer/useServerAssets" +import { useAuthModeFetch } from "~/composables/useAuthModeFetch" // https://github.com/nuxt/nuxt/issues/15346 // 由于布局是个宏,静态构建情况下,不能动态设置,只能在前面的页面写死 @@ -48,15 +49,15 @@ const { t } = useI18n() const route = useRoute() const id = props.pageId ?? ((route.params.id ?? "") as string) const { getFirstImageSrc } = useServerAssets() +const { fetchPublicText } = useAuthModeFetch() // datas const getPostData = async () => { - const mdResponse = await fetch(`/public/siyuan-blog/${id}.json`) - const mdText = await mdResponse.text() - formData.post = JsonUtil.safeParse(mdText, {} as Post) + const resText = await fetchPublicText(`${id}.json`) + formData.post = JsonUtil.safeParse(resText, {} as Post) formData.shareEnabled = !ObjectUtil.isEmptyObject(formData.post) - logger.info("post=>", formData.post) - logger.info(`shareEnabled=>${formData.shareEnabled}`) + // logger.info("post=>", formData.post) + // logger.info(`shareEnabled=>${formData.shareEnabled}`) } const formData = reactive({ diff --git a/components/static/Home.vue b/components/static/Home.vue index 3edb1e97..9195fb78 100644 --- a/components/static/Home.vue +++ b/components/static/Home.vue @@ -34,11 +34,5 @@ const props = defineProps({ diff --git a/components/static/HomePage.vue b/components/static/HomePage.vue index 42c8cdba..27eb1a7a 100644 --- a/components/static/HomePage.vue +++ b/components/static/HomePage.vue @@ -44,22 +44,23 @@ const seoMeta = { useSeoMeta(seoMeta) const homePageId = setting?.homePageId ?? undefined - -// methods -const goSetting = async () => { - await navigateTo("/setting") -}