diff --git a/assets/css/Carousel/index.scss b/assets/css/Carousel/index.scss index db7ec76..be335e4 100644 --- a/assets/css/Carousel/index.scss +++ b/assets/css/Carousel/index.scss @@ -15,7 +15,7 @@ & > img{ height: 100%; width: 100%; - object-fit: cover; + object-fit: fill; } } } diff --git a/assets/css/Final/index.scss b/assets/css/Final/index.scss index 0674511..31e593e 100644 --- a/assets/css/Final/index.scss +++ b/assets/css/Final/index.scss @@ -45,7 +45,7 @@ .Final-container { // 底部背景颜色 - background: #193066; + background: pink; position: relative; color: white; @@ -135,7 +135,7 @@ font-size: 15px; font-weight: bold; // 底部版权颜色 - background-color:#193066; + background-color:#313131; } } diff --git a/assets/css/Header/icon.scss b/assets/css/Header/icon.scss index cbec288..6a9501e 100644 --- a/assets/css/Header/icon.scss +++ b/assets/css/Header/icon.scss @@ -3,7 +3,7 @@ .HeaderIcon-container { height: 100%; width: 100%; - max-width: 280px; + max-width: 220px; margin-top: 0; display: flex; justify-content: center; diff --git a/assets/css/Header/index.scss b/assets/css/Header/index.scss index 869a7a4..e6350e6 100644 --- a/assets/css/Header/index.scss +++ b/assets/css/Header/index.scss @@ -20,7 +20,8 @@ //Header.scss .Header{ - margin-top: -85px; + top: 0; + // margin-bottom: 85px; position: relative; width: 100%; display: flex; @@ -28,8 +29,10 @@ align-items: center; flex-direction: column; position: fixed; - z-index: 99999; - background: #fff; + z-index: 999999; + background-color: #fff; + border-bottom: rgba($color: #000000, $alpha: .2) 1px solid; + // background: rgba(255, 188, 199,.3); // background: rgba($color: #000000, $alpha: .2); .Header-container{ display: flex; diff --git a/assets/css/Header/nav.scss b/assets/css/Header/nav.scss index a5cf6a1..6f31de1 100644 --- a/assets/css/Header/nav.scss +++ b/assets/css/Header/nav.scss @@ -76,7 +76,7 @@ a { // border-color: transparent transparent black!important; // } span { - color: #f9b54c !important; + color: pink !important; } } } diff --git a/assets/css/business/news/index.scss b/assets/css/business/love_story/index.scss similarity index 99% rename from assets/css/business/news/index.scss rename to assets/css/business/love_story/index.scss index 6718b81..8724078 100644 --- a/assets/css/business/news/index.scss +++ b/assets/css/business/love_story/index.scss @@ -128,4 +128,5 @@ .jump { text-decoration: dashed; color: black; -} \ No newline at end of file +} + diff --git a/assets/css/business/news/news_details/index.scss b/assets/css/business/love_story/love_story_details/index.scss similarity index 75% rename from assets/css/business/news/news_details/index.scss rename to assets/css/business/love_story/love_story_details/index.scss index c2c32fa..bbb7195 100644 --- a/assets/css/business/news/news_details/index.scss +++ b/assets/css/business/love_story/love_story_details/index.scss @@ -1,5 +1,5 @@ .joint-details-pos-box { - padding-bottom: 15rem; + padding: 10rem 0 15rem 0; } // 标题 @@ -21,6 +21,10 @@ } } +.back-btn{ + cursor: pointer; +} + .return { width: 60px; height: 50%; @@ -42,4 +46,15 @@ color: gray; } } +} + +.music-box{ + position: fixed; + right: 10%; + top: 15%; + .music-name{ + display: flex; + justify-content: center; + margin-bottom: 10px; + } } \ No newline at end of file diff --git a/assets/css/business/news/news_details/media.scss b/assets/css/business/love_story/love_story_details/media.scss similarity index 100% rename from assets/css/business/news/news_details/media.scss rename to assets/css/business/love_story/love_story_details/media.scss diff --git a/assets/css/business/news/media.scss b/assets/css/business/love_story/media.scss similarity index 100% rename from assets/css/business/news/media.scss rename to assets/css/business/love_story/media.scss diff --git a/assets/css/index/card.css b/assets/css/index/card.css index 0624b4f..e4cd3f8 100644 --- a/assets/css/index/card.css +++ b/assets/css/index/card.css @@ -1,17 +1,33 @@ +.card-pos-box{ + /* background-color: #f8f8f8; */ +} +.love-story-title-box{ + display: flex; + flex-direction: column; + align-items: center; + margin-bottom: 80px; +} + +.love-story-title-box h4{ + margin-top: 10px; +} + .card-pos-box{ width: 100%; - margin: 150px 0; + /* margin: 150px 0; */ + padding: 100px 0; + /* background-color: #f8f8f8; */ } .content { width: 100%; position: relative; display: flex; + flex-wrap: wrap; justify-content: center; } .content .card1 { position: relative; - cursor: pointer; height: 500px; margin: 0 80px; } @@ -28,6 +44,7 @@ width: 100%; height: 100%; border-radius: 20px; + object-fit: cover; } .content .card1 .show-wrapper .title { margin: 10px 0; @@ -50,13 +67,14 @@ align-items: center; opacity: 1; transition: 0.5s; + /* margin-top: 10px; */ } .content .card1 .hover-wrapper .hover-info { display: flex; flex-direction: row; justify-content: center; height: 100%; - font-size: 2vw; + font-size: 25px; } .content .card1 .hover-wrapper .hover-info .info-item { display: flex; @@ -65,22 +83,22 @@ align-items: center; } .content .card1 .hover-wrapper .hover-info .info-item .info-item-title { - font-size: 0.8vw; + font-size: 20px; color: #cccccc; } .content .card1 .hover-wrapper .hover-info .line { width: 2px; - height: 4vh; - margin: 0 1vw; + height: 2vw; + margin: 20px 1vw 0 1vw; background: #cccccc; } .content .card1 .hover-wrapper .btn { width: 90%; - margin-top: 1.5vh; + margin-top: 1.5vw; border-radius: 50px; background-color: rgb(67, 119, 216); border: 0; - font-size: 1vw; + font-size: 20px; cursor: pointer; color: #fff; } @@ -143,4 +161,20 @@ 100% { opacity: 1; } -}/*# sourceMappingURL=style.css.map */ \ No newline at end of file +}/*# sourceMappingURL=style.css.map */ + +.love-story-btn-box{ + display: flex; + justify-content: center; +} + +.love-story-btn-box .btn { + margin-top: 0vw; + border-radius: 50px; + background-color: rgb(67, 119, 216); + padding: 5px 100px; + border: 0; + font-size: 1vw; + 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 fd4c179..51c55d3 100644 --- a/assets/css/index/index.scss +++ b/assets/css/index/index.scss @@ -3,114 +3,94 @@ // background-color: black; } - -// 米尔产品 -.product-big-box{ - background-color: #f8f8f8; - padding: 100px 0 100px 0; +// 心愿清单 +.cardiac-moment-pos-box{ + width: 100%; + // height: 600px; + // display: flex; + // justify-content: center; + position: relative; + margin-top: 5vw; + padding-bottom: 2vw; } -.product-pos-box { - margin: 0 auto; - width: 85%; - display: flex; - justify-content: center; - align-items: center; - flex-direction: column; - -} - -.product-title-box {} - -.product-title { - letter-spacing: 3px; - font-size: 35px; - font-weight: bold; -} - -.product-type-box { - padding: 10px; - margin: 30px 0px; - display: flex; - justify-content: space-around; - align-items: center; -} - -.product-typ-item { - font-size: 18px; - margin: 0px 50px 0px 0px; - cursor: pointer; -} - -.product-content-box { - width: 72%; - display: flex; - justify-content: space-around; - align-items: center; - margin-top: 20px; -} - -.product-content-left-box { +.cardiac-moment-img-box{ + width: 65%; + height: 70%; overflow: hidden; - height: 300px; - width: 45%; - box-shadow: rgb(219, 219, 219) 0px 0px 10px 1px; - border-radius: 10px; - - // transform: translateY(-10px); + position: absolute; + bottom: 0; + z-index: -1; } - -.product-content-left-box img { +.cardiac-moment-img-box img{ width: 100%; height: 100%; -} - -.product-content-right-box { - height: 300px; - width: 50%; -} - -.product-content-right-intro { - font-size: 16px; - color: rgb(155, 155, 155); -} - -.product-advantage-pos-box { - display: flex; - justify-content: space-around; - align-items: center; - margin: 50px 0 0 0px; -} - -.product-advantage-box { - display: flex; - justify-content: center; - align-items: center; - flex-direction: column; -} - -.product-advantage-img-box { - height: 45px; - width: 45px; - margin: 0px 0px 10px; -} - -.product-advantage-img-box img { - height: 100%; - width: 100%; object-fit: contain; } - -.product-advantage-text { - width: 70px; - font-size: 16px; - color: rgb(130, 130, 130); - text-align: center; +.cardiac-moment-big-box{ + display: flex; + justify-content: center; } - -.product-content-btn-box { - margin-top: 30px; +// .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; align-items: center; + flex-direction: column; +} + +.todo-list-box { + height: 120px; + width: 50%; + 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/components/Carousel/index.vue b/components/Carousel/index.vue index c19f26f..aaa5590 100644 --- a/components/Carousel/index.vue +++ b/components/Carousel/index.vue @@ -9,13 +9,17 @@ loop：循环 swiperStyle：自定义样式 --> + + { + // console.log(JSON.parse(res.data.value),'asdasdasd'); banner_list.value = JSON.parse(res.data.value).data }) /**整体轮播图样式*/ let styleContainer = reactive({ - height: '33vw', + height: '35vw', }) const modules = ref([Pagination, Navigation, Autoplay]) const swiperStyle = conversionStyleVal(reactive({ /**轮播图样式*/ color: '', //设置字体颜色 - height: '33vw', //设置高度 + height: '35vw', //设置高度 width: '100%', //设置高度 margin: '0', //设置margin 按照上 右 下 左 或 上下 左右 设置 padding: '0', //设置padding 按照上 右 下 左 或 上下 左右 设置 diff --git a/components/Final/index.vue b/components/Final/index.vue index c577626..5d18a02 100644 --- a/components/Final/index.vue +++ b/components/Final/index.vue @@ -16,10 +16,10 @@ -->
-
- +
关于我们
@@ -91,23 +91,17 @@
-
+ --> -
+ -
©2023 米尔科技有限公司 版权所有
+
©2023年8月15日 纪念青春，愿有情人终成眷属，珍惜眼前人。
@@ -115,7 +109,7 @@ diff --git a/pages/index.vue b/pages/index.vue index 80a9e1f..ca11909 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -15,15 +15,21 @@
- +
+ +
+

爱情故事

+

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

+
+
-
+
- +
-

Mario

+

暑假初见

- 132k -
-
- - - - 12k + 2023/08/10
- 13k - Loveing -
-
-
- 14k - Watching + + 容桂站 + 2023/08/10
- +
+ +
+ +
+
- -
-
-
-

米尔产品

-
-
-
- ARM开发工具 + +
+
+ +
+ +
+

心愿清单

+

听我许下与你有关的心愿

+
+ +
+
+
+
-
-
-
-
-
-
- 米尔通过与ST，TI，NXP，全志，Microchip等芯片原厂保持深度密切合作，自主研发了系列应用于工业控制及物联网等相关领域的核心板和开发板等产品，帮助客户实现产品及方案的快速开发。 -
-
-
-
- -
-
品质优良 性能卓越
-
-
-
- 查看产品 -
+
+
一起去川西！
+
2023-02-07
+ +
+ +
+
- - -
@@ -178,4 +168,4 @@ defineExpose({ - \ No newline at end of file + \ No newline at end of file diff --git a/pages/love-story/[page].vue b/pages/love-story/[page].vue new file mode 100644 index 0000000..74cfb73 --- /dev/null +++ b/pages/love-story/[page].vue @@ -0,0 +1,156 @@ + + + + + + + diff --git a/pages/love-story/details/[id].vue b/pages/love-story/details/[id].vue new file mode 100644 index 0000000..ded7fac --- /dev/null +++ b/pages/love-story/details/[id].vue @@ -0,0 +1,100 @@ + + + + + + + diff --git a/pages/music.vue b/pages/music.vue new file mode 100644 index 0000000..74bc0ae --- /dev/null +++ b/pages/music.vue @@ -0,0 +1,17 @@ + + + + + + + \ No newline at end of file diff --git a/pages/news/[idx]-[page].vue b/pages/news/[idx]-[page].vue deleted file mode 100644 index 640a8ef..0000000 --- a/pages/news/[idx]-[page].vue +++ /dev/null @@ -1,167 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/pages/news/details/[id].vue b/pages/news/details/[id].vue deleted file mode 100644 index daf2671..0000000 --- a/pages/news/details/[id].vue +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - diff --git a/pages/todo-list.vue b/pages/todo-list.vue new file mode 100644 index 0000000..3de765e --- /dev/null +++ b/pages/todo-list.vue @@ -0,0 +1,65 @@ + + + + + + diff --git a/public/favicon.ico b/public/favicon.ico index c3592ad..9999788 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/img/home/icons8-github.gif b/public/img/home/icons8-github.gif deleted file mode 100644 index bc39b36..0000000 Binary files a/public/img/home/icons8-github.gif and /dev/null differ diff --git a/public/img/home/monment-img.jpg b/public/img/home/monment-img.jpg new file mode 100644 index 0000000..9c6898c Binary files /dev/null and b/public/img/home/monment-img.jpg differ diff --git a/public/img/home/monment.png b/public/img/home/monment.png new file mode 100644 index 0000000..8526834 Binary files /dev/null and b/public/img/home/monment.png differ diff --git a/public/img/icon/logo.png b/public/img/icon/logo.png index 980edca..0100978 100644 Binary files a/public/img/icon/logo.png and b/public/img/icon/logo.png differ diff --git a/public/img/icon/logo_black.png b/public/img/icon/logo_black.png deleted file mode 100644 index 1c5b4fd..0000000 Binary files a/public/img/icon/logo_black.png and /dev/null differ diff --git a/public/img/icon/logo_cyan.png b/public/img/icon/logo_cyan.png deleted file mode 100644 index f46006d..0000000 Binary files a/public/img/icon/logo_cyan.png and /dev/null differ diff --git a/public/img/icon/logo_white.png b/public/img/icon/logo_white.png deleted file mode 100644 index 1465195..0000000 Binary files a/public/img/icon/logo_white.png and /dev/null differ diff --git a/server/api/banner/getBanner.js b/server/api/banner/getBanner.js index 76a7a68..dfb5fdd 100644 --- a/server/api/banner/getBanner.js +++ b/server/api/banner/getBanner.js @@ -10,7 +10,7 @@ export default defineEventHandler(async (event) => { const method = getMethod(event).toUpperCase() let body if (method !== 'GET') body = await readRawBody(event) - const res = await $fetch( "http://mr.api.aerwen.net/api.php/Banners.Banner/getBannerList", { + const res = await $fetch(baseURL + "/Banners.Banner/getBannerList", { method, baseURL: event.context.baseUrl, headers: event.context.headers, diff --git a/server/api/flow/addFlowRecord.js b/server/api/flow/addFlowRecord.js index 9e4836f..c579fe6 100644 --- a/server/api/flow/addFlowRecord.js +++ b/server/api/flow/addFlowRecord.js @@ -10,7 +10,7 @@ export default defineEventHandler(async (event) => { const method = getMethod(event).toUpperCase() let body if (method !== 'GET') body = await readRawBody(event) - const res = await $fetch("http://mr.api.aerwen.net/api.php/Flow.Flow/AddFlowRecord", { + const res = await $fetch(baseURL + "/Flow.Flow/AddFlowRecord", { method, baseURL: event.context.baseUrl, headers: event.context.headers, diff --git a/server/api/home/getHome.js b/server/api/home/getHome.js index c513473..09e266c 100644 --- a/server/api/home/getHome.js +++ b/server/api/home/getHome.js @@ -13,7 +13,7 @@ export default defineEventHandler(async (event) => { const method = getMethod(event).toUpperCase() let body if (method !== 'GET') body = await readRawBody(event) - const res = await $fetch("http://mr.api.aerwen.net/api.php/Home.Home/getHome", { + const res = await $fetch(baseURL + "/Home.Home/getHome", { method, baseURL: event.context.baseUrl, headers: event.context.headers, diff --git a/server/api/news/getNewsInfo.js b/server/api/loveStory/getLoveStoryInfo.js similarity index 81% rename from server/api/news/getNewsInfo.js rename to server/api/loveStory/getLoveStoryInfo.js index edd2a3c..200f089 100644 --- a/server/api/news/getNewsInfo.js +++ b/server/api/loveStory/getLoveStoryInfo.js @@ -5,7 +5,7 @@ import { } from 'h3' /** - * 获取新闻详情 + * 获取爱情故事详情 */ export default defineEventHandler(async (event) => { // 基础url @@ -13,7 +13,7 @@ export default defineEventHandler(async (event) => { const method = getMethod(event).toUpperCase() let body if (method !== 'GET') body = await readRawBody(event) - const res = await $fetch("http://mr.api.aerwen.net/api.php/News.News/getinfoNews", { + const res = await $fetch(baseURL + "/LoveStory.LoveStory/getLoveStoryInfo", { method, baseURL: event.context.baseUrl, headers: event.context.headers, diff --git a/server/api/news/getNewsList.js b/server/api/loveStory/getLoveStoryList.js similarity index 81% rename from server/api/news/getNewsList.js rename to server/api/loveStory/getLoveStoryList.js index bd17e2a..66d213e 100644 --- a/server/api/news/getNewsList.js +++ b/server/api/loveStory/getLoveStoryList.js @@ -5,7 +5,7 @@ import { } from 'h3' /** - * 获取新闻列表 + * 获取爱情故事列表 */ export default defineEventHandler(async (event) => { @@ -14,7 +14,7 @@ export default defineEventHandler(async (event) => { const method = getMethod(event).toUpperCase() let body if (method !== 'GET') body = await readRawBody(event) - const res = await $fetch("http://mr.api.aerwen.net/api.php/News.News/getNewsList", { + const res = await $fetch(baseURL + "/LoveStory.LoveStory/getLoveStoryList", { method, baseURL: event.context.baseUrl, headers: event.context.headers, diff --git a/server/api/news/getNewsType.js b/server/api/news/getNewsType.js deleted file mode 100644 index 8f958c3..0000000 --- a/server/api/news/getNewsType.js +++ /dev/null @@ -1,24 +0,0 @@ -import { - readRawBody, - getQuery, - getMethod -} from 'h3' - -/** - * 获取新闻类型列表 - */ -export default defineEventHandler(async (event) => { - // 基础url - const baseURL = process.env.NUXT_PROXY_WEB_API - const method = getMethod(event).toUpperCase() - let body - if (method !== 'GET') body = await readRawBody(event) - const res = await $fetch("http://mr.api.aerwen.net/api.php/News.News/getNewsType", { - method, - baseURL: event.context.baseUrl, - headers: event.context.headers, - params: getQuery(event), - body - }) - return res -}) \ No newline at end of file diff --git a/server/api/poster/getPoster.js b/server/api/poster/getPoster.js index 0616f0a..1903e3c 100644 --- a/server/api/poster/getPoster.js +++ b/server/api/poster/getPoster.js @@ -10,7 +10,7 @@ export default defineEventHandler(async (event) => { const method = getMethod(event).toUpperCase() let body if (method !== 'GET') body = await readRawBody(event) - const res = await $fetch("http://mr.api.aerwen.net/api.php/Banners.Poster/getPoster", { + const res = await $fetch(baseURL + "/Banners.Poster/getPoster", { method, baseURL: event.context.baseUrl, headers: event.context.headers, diff --git a/server/api/tdk/getTdk.js b/server/api/tdk/getTdk.js index e801c52..58c43ec 100644 --- a/server/api/tdk/getTdk.js +++ b/server/api/tdk/getTdk.js @@ -10,7 +10,7 @@ export default defineEventHandler(async (event) => { const method = getMethod(event).toUpperCase() let body if (method !== 'GET') body = await readRawBody(event) - const res = await $fetch( "http://mr.api.aerwen.net/api.php/Tdk.Tdk/getTdkInfo", { + const res = await $fetch(baseURL + "/Tdk.Tdk/getTdkInfo", { method, baseURL: event.context.baseUrl, headers: event.context.headers,