diff --git a/src/assets/image.png b/src/assets/image.png deleted file mode 100644 index fafa25f..0000000 Binary files a/src/assets/image.png and /dev/null differ diff --git a/src/assets/images/ceshi.png b/src/assets/images/ceshi.png deleted file mode 100644 index 348422b..0000000 Binary files a/src/assets/images/ceshi.png and /dev/null differ diff --git a/src/assets/images/nav01.jpg b/src/assets/images/nav01.jpg new file mode 100644 index 0000000..b0b78b9 Binary files /dev/null and b/src/assets/images/nav01.jpg differ diff --git a/src/assets/images/nav02.jpg b/src/assets/images/nav02.jpg new file mode 100644 index 0000000..e3461c5 Binary files /dev/null and b/src/assets/images/nav02.jpg differ diff --git a/src/assets/images/nav03.jpg b/src/assets/images/nav03.jpg new file mode 100644 index 0000000..baeab5c Binary files /dev/null and b/src/assets/images/nav03.jpg differ diff --git a/src/assets/images/nav1.png b/src/assets/images/nav1.png deleted file mode 100644 index 6d0219f..0000000 Binary files a/src/assets/images/nav1.png and /dev/null differ diff --git a/src/assets/images/nav10.png b/src/assets/images/nav10.png deleted file mode 100644 index 89e73ca..0000000 Binary files a/src/assets/images/nav10.png and /dev/null differ diff --git a/src/assets/images/nav13.png b/src/assets/images/nav13.png deleted file mode 100644 index 01b0148..0000000 Binary files a/src/assets/images/nav13.png and /dev/null differ diff --git a/src/assets/lrc/故事中的你-是你的垚.lrc b/src/assets/lrc/故事中的你-是你的垚.lrc new file mode 100644 index 0000000..7a6ea1d --- /dev/null +++ b/src/assets/lrc/故事中的你-是你的垚.lrc @@ -0,0 +1,40 @@ +[00:01.11]作词：玖伍陆柒/温瑞梁 +[00:08.94]作曲：玖伍陆柒 +[00:13.23]出品：网易电波 +[00:16.02]听过好多的遗憾 +[00:18.84]我和你之间结局也很烂 +[00:23.64]没有固定的答案 +[00:25.92]这一片回忆全部都写满 +[00:30.45]其实我可以装作很勇敢 +[00:34.08]一个人在轨道循环 +[00:38.25]眼看黑夜变淡 +[00:43.35]你说的话还算不算 +[00:48.57]在我的孤单世界里什么都没有 +[00:55.68]只存在故事中的你还被我保留 +[01:02.82]被黎明侵蚀过的风停在我左右或许太温柔 +[01:09.81]我仅剩的想念都快被时间偷走 +[01:32.52]听过好多的遗憾 +[01:34.68]我和你之间结局也很烂 +[01:39.57]没有固定的答案 +[01:41.76]这一片回忆全部都写满 +[01:46.35]其实我可以装作很勇敢 +[01:49.92]一个人在轨道循环 +[01:54.12]眼看黑夜变淡 +[01:59.22]你说的话还算不算 +[02:04.47]在我的孤单世界里什么都没有 +[02:11.58]只存在故事中的你还被我保留 +[02:18.72]被黎明侵蚀过的风停在我左右或许太温柔 +[02:25.65]我仅剩的想念都快被时间偷走 +[02:32.73]在我的孤单世界里什么都没有 +[02:39.75]想跨过回忆拥抱你找不到理由 +[02:46.83]如果说爱是一场梦我尽力拼凑从黑夜到白昼 +[02:54.12]这一场梦我还能够做多久 +[02:58.41]制作人：赵倘若@88young +[02:58.89]编曲：杨爽 +[03:00.81]混音：陈杰 +[03:03.03]和声：彭浩楷 +[03:04.83]统筹：小逐@88young +[03:06.96]企划：温瑞梁 +[03:09.09]监制：温瑞梁/詹胜 +[03:11.19]出品人： Dylan刘勇 +[03:13.17]联合出品：88young diff --git a/src/assets/lrc/整个冬天都是你-陈奕楠,knowme,艾纳德.lrc b/src/assets/lrc/整个冬天都是你-陈奕楠,knowme,艾纳德.lrc new file mode 100644 index 0000000..b012b1f --- /dev/null +++ b/src/assets/lrc/整个冬天都是你-陈奕楠,knowme,艾纳德.lrc @@ -0,0 +1,68 @@ +[00:00.000] 作词 : 陈奕楠/knowme/艾纳德 +[00:01.000] 作曲 : 陈奕楠/knowme/艾纳德 +[00:02.000] 编曲 : MASEVENG +[00:03.000] 制作人 : knowme +[00:24.69]艾纳德： +[00:24.84]在这个没有你的冬天感觉好冷 +[00:27.03]都在劝我放弃你说没有什么好等 +[00:29.58]可能是我不懂怎么去挽留 +[00:31.41]眼睁睁看着你转头 +[00:32.67]是的全部都怪在我比较笨 +[00:34.80]不习惯手机再没有你的消息 +[00:37.20]一个人的房间陪我的只有焦虑 +[00:39.66]你怎么可以这么狠心的把我给抛弃 +[00:42.24]我的心里只容得下你因为我挑剔 +[00:44.82]那天我其实只是想看到你点头 +[00:47.43]想回到那天在小巷羞涩和你牵手 +[00:50.10]等到今天最后却只望着你远走 +[00:52.56]留下的那张合照现在也已变旧 +[00:55.08] so baby come back come back now +[00:57.27]我想要你再次回到我的怀抱 +[00:59.76]我明白以前的我到底多么可笑 +[01:02.25]我答应你要比以前更加的可靠 +[01:04.23]陈奕楠： +[01:04.41]这没你的冬天格外寂寞 +[01:09.09]与你的回忆够我留恋好久 +[01:14.07]也许我糊涂了 +[01:16.56]慌乱又无措了 +[01:19.74]奢望着你会停留 +[01:24.18]这一场雪刚好落在心头 +[01:29.19]这清冷季节怎么过得这么久 +[01:34.23]就找个借口 +[01:36.48]找个合适理由 +[01:39.99]不至于让自己 +[01:42.33]失了控 +[01:45.21] knowme： +[01:45.30]我不好意思 bad babe我心化成没结完的冰 +[01:48.09]我记得牵你手的时候好像粘人的病 +[01:50.64]你躺我怀里让我抱你 baby give me the kiss +[01:53.16]是你的挑剔使我焦虑让我没有了力 +[01:55.68]我喜欢背后蒙你眼睛是谁抓住你 +[01:58.23]我没能等到你的消息 i call it love maybe +[02:00.72]我真的没想离开 cause youdon't believe +[02:03.27]我真的动心不是让你 make love with me +[02:06.84]头顶上的雪花飞过我 +[02:09.27]你还逞强说你真没错过 +[02:11.88]好吧你可能真的没错 +[02:13.68]现在每分钟我都没有你的温度 +[02:16.95]带走我的所有温柔 +[02:20.55]雪堆它融化它需要多久 +[02:24.48]陈奕楠： +[02:24.81]这没你的冬天格外寂寞 +[02:29.97]与你的回忆够我留恋好久 +[02:34.92]也许我糊涂了 +[02:37.41]慌乱又无措了 +[02:40.59]奢望着你会停留 +[02:45.03]这一场雪刚好落在心头 +[02:50.04]这清冷季节怎么过得这么久 +[02:55.08]就找个借口 +[02:57.36]找个合适理由 +[03:00.81]不至于让自己 +[03:03.18]失了控 +[03:04.71]音频编辑：Sako8 +[03:05.01]混音：Sako8 +[03:05.19]母带：Sako8 +[03:05.37]和声：陈奕楠 +[03:05.67]录音：陈奕楠/ knowme/艾纳德 +[03:07.47]封面设计： JYT图图 +[03:07.95]监制： knowme/艾纳德 diff --git a/src/components/blogs/header/CarouselImg.vue b/src/components/blogs/header/CarouselImg.vue index 0f05c23..1e4b827 100644 --- a/src/components/blogs/header/CarouselImg.vue +++ b/src/components/blogs/header/CarouselImg.vue @@ -12,9 +12,9 @@ import { toRefs } from 'vue'; const { idShow } = homePageStore() const { show_carousel } = toRefs(idShow) const imgdatas: string[] = [ - "/src/assets/images/nav1.png", - "/src/assets/images/nav10.png", - "/src/assets/images/nav13.png" + "/src/assets/images/nav01.jpg", + "/src/assets/images/nav02.jpg", + "/src/assets/images/nav03.jpg" ] diff --git a/src/components/blogs/rightsite/AplayerComponent.vue b/src/components/blogs/rightsite/AplayerComponent.vue index 3f91dae..f92bcb2 100644 --- a/src/components/blogs/rightsite/AplayerComponent.vue +++ b/src/components/blogs/rightsite/AplayerComponent.vue @@ -28,22 +28,22 @@ onMounted(() => { listMaxHeight: 90, lrcType: 3, audio: [ - // { - // name: 'name1', - // artist: 'artist1', - // url: 'url1.mp3', - // cover: 'cover1.jpg', - // lrc: 'lrc1.lrc', - // theme: '#ebd0c2' - // }, - // { - // name: 'name2', - // artist: 'artist2', - // url: 'url2.mp3', - // cover: 'cover2.jpg', - // lrc: 'lrc2.lrc', - // theme: '#46718b' - // } + { + name: '故事中的你', + artist: '是你的垚', + url: 'http://www.wuruilin.cn/musics/故事中的你.mp3', + cover: 'http://www.wuruilin.cn/otherimg/musicImg.jpg', + lrc: 'http://www.wuruilin.cn/musics/故事中的你-是你的垚.lrc', + theme: '#ebd0c2' + }, + { + name: '整个冬天都是你', + artist: '陈奕楠,艾纳德', + url: 'http://www.wuruilin.cn/musics/整个冬天都是你.mp3', + cover: 'http://www.wuruilin.cn/otherimg/musicImg.jpg', + lrc: 'http://www.wuruilin.cn/musics/整个冬天都是你-陈奕楠,knowme,艾纳德.lrc', + theme: '#46718b' + } ] }); } diff --git a/src/stores/index.ts b/src/stores/index.ts index 85e203c..fc978b1 100644 --- a/src/stores/index.ts +++ b/src/stores/index.ts @@ -141,9 +141,6 @@ export const labelStore = defineStore("label", () => { }) return { addControl, delControl, editControl } }) - - - export const useAuthStore = defineStore("auth", () => { const tokenValue = ref("") function setToken(token: string) { diff --git a/src/views/admin/blogmanage/BlogManageView.vue b/src/views/admin/blogmanage/BlogManageView.vue index 18a2cd2..7063ff1 100644 --- a/src/views/admin/blogmanage/BlogManageView.vue +++ b/src/views/admin/blogmanage/BlogManageView.vue @@ -37,8 +37,7 @@ + left-toolbar="undo redo clear | h bold italic strikethrough quote | ul ol table hr | link image code | save | tip | emoji"> @@ -64,8 +63,7 @@

确认删除吗？

- {{ record.id - }}编辑 + 编辑 预览 @@ -105,12 +103,11 @@ const onChange = (date: string, dateString: string[]) => { searchlist.start_date = ''; searchlist.end_date = ''; } - console.log(dateString[0]); }; const search = async () => { try { - const response = await get("/blogs/list/search", { + const response = await get("/blogs/search", { blogtitle: searchlist.blogtitle, typename: searchlist.typename, start_date: searchlist.start_date, @@ -146,6 +143,19 @@ const formState = ref({ descr: '', imglink: "" }); +const resetForm = () => { + formState.value = { + // 初始化表单状态的默认值 + id: '', + blogtitle: '', + typeid: null, + blogcontent: "", + labelnames: [], + descr: '', + imglink: "" + // 如果你有其他字段，也需要在这里初始化 + } +} const labellist = ref([]) const labelList = async () => { try { @@ -171,7 +181,7 @@ const labelList = async () => { const typelist = ref([]) const typeList = async () => { try { - await get("/types/list").then(response => { + await get("/blogtypes/list").then(response => { if (response) { typelist.value = response.data.data.map((items: any) => ({ ...items @@ -197,24 +207,24 @@ const rules: Record = { ], }; -const formControl=ref({ - open:false, - ids:null +const formControl = ref({ + open: false, + ids: null }) const formRef = ref(); const addModal = () => { + resetForm() formControl.value.open = true - console.log(formControl.value.ids) } const editModal = (id: any) => { formControl.value.ids = id formControl.value.open = true get( - `/blogs/list/search/${id}` - ).then(response=>{ - formState.value=response.data.data + `/blogs/search/${id}` + ).then(response => { + formState.value = response.data.data }) console.log(formControl.value.ids) @@ -239,12 +249,12 @@ const onSubmit = () => { } if (formControl.value.ids) { await put(`/blogs/update/${formControl.value.ids}`, formdata) - formControl.value.open=false, - blogList() + formControl.value.open = false, + blogList() } else { await post('/blogs/add', formdata); - formControl.value.open=false, - blogList() + formControl.value.open = false, + blogList() } }) }; @@ -261,7 +271,7 @@ const blogList = async () => { try { const response = await get("/blogs/list"); if (response) { - bloglist.value = response.data.data.diarys.map((items: any, index: any) => ({ + bloglist.value = response.data.data.blogs.map((items: any, index: any) => ({ key: (index + 1).toString(), id: items.id, blogtitle: items.blogtitle, @@ -275,7 +285,7 @@ const blogList = async () => { typename: items.typename, labelnames: items.labelnames })) - console.log(`output->bloglist`,bloglist) + console.log(`output->bloglist`, bloglist) } else { console.log("bloglist is not exits") } diff --git a/src/views/blog/HomePageView.vue b/src/views/blog/HomePageView.vue index 2c1f6c1..66bff1c 100644 --- a/src/views/blog/HomePageView.vue +++ b/src/views/blog/HomePageView.vue @@ -84,7 +84,6 @@
-
阅读全文 @@ -95,15 +94,14 @@
-
- +
+ {{ loading ? '加载中...' : '加载更多' }}
- +
@@ -202,6 +200,14 @@ watch(() => homepageStore.homepagelist, () => { margin: 48px; } +.main .blog-content>:first-child { + padding: 4px; + border: 2px solid #ccc; + display: inline-block; + border-radius: 10px; + box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1); +} + .main .blog-content>:nth-child(2) { overflow: hidden; text-overflow: ellipsis; diff --git a/src/views/blog/diarycontent/DiaryListView.vue b/src/views/blog/diarycontent/DiaryListView.vue index addd252..4e6a26e 100644 --- a/src/views/blog/diarycontent/DiaryListView.vue +++ b/src/views/blog/diarycontent/DiaryListView.vue @@ -110,6 +110,11 @@ onMounted(() => { margin: 0 24px; } +/* .main h2 { + text-align: center; +} */ + + .main .mainContent { margin-bottom: 24px; }