From 93f79476d6b94b30d62d10cea21d2cb42839b2b7 Mon Sep 17 00:00:00 2001 From: lwh <2679599887@qq.com> Date: Thu, 24 Aug 2023 21:42:27 +0800 Subject: [PATCH] =?UTF-8?q?fiexd=20=E4=BC=98=E5=8C=96=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/css/business/todo_list/index.scss | 59 ++++++++++ assets/css/business/todo_list/media.scss | 36 +++++++ assets/css/index/card.css | 6 +- assets/css/index/index.scss | 22 +--- assets/css/index/media.scss | 32 ++---- components/Carousel/index.vue | 1 - components/Header/index.vue | 4 +- pages/index.vue | 62 +++++++---- pages/love-story/[page].vue | 3 +- pages/love-story/details/[id].vue | 14 ++- pages/music.vue | 17 --- pages/test.vue | 33 ------ pages/todo-list.vue | 132 +++++++++++++---------- server/api/home/getHome.js | 2 +- server/api/wishList/getWishListList.js | 25 +++++ 15 files changed, 269 insertions(+), 179 deletions(-) create mode 100644 assets/css/business/todo_list/index.scss create mode 100644 assets/css/business/todo_list/media.scss delete mode 100644 pages/music.vue delete mode 100644 pages/test.vue create mode 100644 server/api/wishList/getWishListList.js diff --git a/assets/css/business/todo_list/index.scss b/assets/css/business/todo_list/index.scss new file mode 100644 index 0000000..4c51f0c --- /dev/null +++ b/assets/css/business/todo_list/index.scss @@ -0,0 +1,59 @@ +.todo-list-pos-box{ + padding: 100px 0; +} + +.todo-list-title-box{ + display: flex; + flex-direction: column; + align-items: center; + margin-bottom: 80px; +} + +.todo-list-title-box h4{ + margin-top: 10px; +} + +.todo-list-big-box { + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; +} + +.todo-list-box { + height: 120px; + width: 80%; + display: flex; + align-items: center; + margin: 0px 0px 0px 20px; + background-color: rgb(229, 229, 229); + border-radius: 40px; + margin-bottom: 25px; +} + +.todo-list-check-box { + height: 40px; + width: 40px; + margin: 0px 0px 0px 30px; + border-radius: 50%; + overflow: hidden; +} + +.todo-list-check-img { + height: 100%; + width: 100%; + object-fit: cover; +} + +.todo-list-text-box { + margin: 0px 0px 0px 20px; +} + +.todo-list-time { + margin: 5px 0px 0px; + font-size: 20px; +} + +.todo-list-text { + font-size: 25px; +} \ No newline at end of file diff --git a/assets/css/business/todo_list/media.scss b/assets/css/business/todo_list/media.scss new file mode 100644 index 0000000..0798732 --- /dev/null +++ b/assets/css/business/todo_list/media.scss @@ -0,0 +1,36 @@ +//media.scss +/*1440px*/ +/*大于*/ +@media screen and (min-width: 1440px) { + .container { + max-width: 1420px; + } +} + +/*小于*/ +@media screen and (min-width: 1440px) {} + +/*1200px*/ +/*大于*/ +@media screen and (min-width: 1200px) {} + +/*小于*/ +@media screen and (max-width: 1200px) {} + +/*880px*/ +/*大于*/ +@media screen and (min-width: 880px) {} + +/*小于*/ +@media screen and (max-width: 880px) { + +} + +/*480px*/ +/*大于*/ +@media screen and (min-width: 480px) {} + +/*小于*/ +@media screen and (max-width: 480px) { + +} \ No newline at end of file diff --git a/assets/css/index/card.css b/assets/css/index/card.css index e4cd3f8..e97149a 100644 --- a/assets/css/index/card.css +++ b/assets/css/index/card.css @@ -94,7 +94,7 @@ } .content .card1 .hover-wrapper .btn { width: 90%; - margin-top: 1.5vw; + margin-top: 30px; border-radius: 50px; background-color: rgb(67, 119, 216); border: 0; @@ -169,12 +169,12 @@ } .love-story-btn-box .btn { - margin-top: 0vw; + margin-top: 30px; border-radius: 50px; background-color: rgb(67, 119, 216); padding: 5px 100px; border: 0; - font-size: 1vw; + font-size: 20px; cursor: pointer; color: #fff; } \ No newline at end of file diff --git a/assets/css/index/index.scss b/assets/css/index/index.scss index 51c55d3..4580a58 100644 --- a/assets/css/index/index.scss +++ b/assets/css/index/index.scss @@ -31,25 +31,7 @@ display: flex; justify-content: center; } -// .cardiac-moment-big-box{ -// display: flex; -// flex-wrap: wrap; -// align-items: center; -// } -// .cardiac-moment-big-text-box{ -// width: 200px; -// } -// .cardiac-moment-big-img-box{ -// width: 300px; -// height: 450px; -// overflow: hidden; -// margin-left: 200px; -// } -// .cardiac-moment-big-img-box img{ -// width: 100%; -// height: 100%; -// object-fit: contain; -// } + .todo-list-big-box { display: flex; justify-content: center; @@ -59,7 +41,7 @@ .todo-list-box { height: 120px; - width: 50%; + width: 60%; display: flex; align-items: center; margin: 0px 0px 0px 20px; diff --git a/assets/css/index/media.scss b/assets/css/index/media.scss index 12c2f70..3e26646 100644 --- a/assets/css/index/media.scss +++ b/assets/css/index/media.scss @@ -1,44 +1,34 @@ //media.scss /*1440px*/ /*大于*/ -@media screen and (min-width: 1440px) { -} +@media screen and (min-width: 1440px) {} /*小于*/ -@media screen and (min-width: 1440px) { -} +@media screen and (min-width: 1440px) {} /*1200px*/ /*大于*/ -@media screen and (min-width: 1200px) { - -} +@media screen and (min-width: 1200px) {} /*小于*/ -@media screen and (max-width: 1200px) { - -} +@media screen and (max-width: 1200px) {} /*880px*/ /*大于*/ -@media screen and (min-width: 880px) { - -} +@media screen and (min-width: 880px) {} /*小于*/ -@media screen and (max-width: 880px) { - -} +@media screen and (max-width: 880px) {} /*480px*/ /*大于*/ -@media screen and (min-width: 480px) { - -} +@media screen and (min-width: 480px) {} /*小于*/ @media screen and (max-width: 480px) { - -} + .todo-list-box { + width: 90% !important; + } +} \ No newline at end of file diff --git a/components/Carousel/index.vue b/components/Carousel/index.vue index aaa5590..1a56a14 100644 --- a/components/Carousel/index.vue +++ b/components/Carousel/index.vue @@ -67,7 +67,6 @@ const params = reactive({ // }) // 获取海报 useFetch('/api/banner/getBanner',{ params: { banner_location: 1 } }).then(res => { - // console.log(JSON.parse(res.data.value),'asdasdasd'); banner_list.value = JSON.parse(res.data.value).data }) diff --git a/components/Header/index.vue b/components/Header/index.vue index 559a8a0..8760812 100644 --- a/components/Header/index.vue +++ b/components/Header/index.vue @@ -75,8 +75,8 @@ let navList = [ { name: '心愿单', children: [], - href: 'https://github.com/Abbh1/AerwenTool', - alias: 'GitHub' + href: '/todo-list', + alias: 'todo-list' }, { name: '留言', diff --git a/pages/index.vue b/pages/index.vue index ca11909..650e604 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -18,18 +18,19 @@
-
+

爱情故事

记录生活，分享喜悦，快乐相随

-
-
+
+ +
- +
-

暑假初见

+

{{ item.love_story_title }}

- 2023/08/10 + {{ item.love_story_date }}
@@ -52,48 +53,57 @@
- 容桂站 - 2023/08/10 + {{ item.love_story_place }} + {{ item.love_story_date }}
- + +
查看
+
- + + 查看更多 +
- +
-
+

心愿清单

听我许下与你有关的心愿

-
-
+
+
- + +
-
一起去川西！
-
2023-02-07
+
{{ item.wish_list_name }}
+
{{ item.wish_list_create_time }}
+
- + + 查看更多 +
@@ -119,7 +129,6 @@ let ImgDetailRef = ref(null) /**预对接的数据**/ -let openImg1 = ref("/img/home/open/open1.png") /**js常量的定义**/ @@ -140,11 +149,24 @@ function handleImg(v) { imgIdx.value = v } +const getLink = function (item) { + if (item.love_story_link) { + return item.love_story_link; + } else { + return "/love-story/details/" + item.love_story_id; + } +} + /** * 接口对接 */ +let homeData = ref({}) +useFetch('/api/home/getHome').then(res => { + homeData.value = JSON.parse(res.data.value).data +}) + // 获取Tdk let tdk = ref({}) useFetch('/api/tdk/getTdk', { params: { tdk_type: 1 } }).then(res => { @@ -167,5 +189,5 @@ defineExpose({ + - \ No newline at end of file diff --git a/pages/love-story/[page].vue b/pages/love-story/[page].vue index 74cfb73..3e9d759 100644 --- a/pages/love-story/[page].vue +++ b/pages/love-story/[page].vue @@ -1,6 +1,6 @@