diff --git a/assets/css/Carousel/index.scss b/assets/css/Carousel/index.scss index 725d790..db7ec76 100644 --- a/assets/css/Carousel/index.scss +++ b/assets/css/Carousel/index.scss @@ -3,6 +3,7 @@ } .Carousel-container{ + margin-top: 85px; .carousel-box{ .carousel-items{ color: var(--swipercolor); diff --git a/assets/css/Final/index.scss b/assets/css/Final/index.scss index b80ed9c..0674511 100644 --- a/assets/css/Final/index.scss +++ b/assets/css/Final/index.scss @@ -44,9 +44,10 @@ } .Final-container { - background: #ededed; + // 底部背景颜色 + background: #193066; position: relative; - color: black; + color: white; .Final-big-box { width: 100%; @@ -81,7 +82,7 @@ .items { margin-bottom: 10px; - color: black; + color: white; font-size: 15px; cursor: pointer; @@ -90,7 +91,7 @@ .items-title { font-size: 22px; margin-bottom: 20px; - color: black; + color: white; font-weight: 600; } } @@ -130,10 +131,11 @@ justify-content: center; align-items: center; padding: 30px 0; - color: black; + color: white; font-size: 15px; font-weight: bold; - background-color: #ededed; + // 底部版权颜色 + background-color:#193066; } } diff --git a/assets/css/Header/index.scss b/assets/css/Header/index.scss index 7c466e2..869a7a4 100644 --- a/assets/css/Header/index.scss +++ b/assets/css/Header/index.scss @@ -20,6 +20,7 @@ //Header.scss .Header{ + margin-top: -85px; position: relative; width: 100%; display: flex; diff --git a/assets/css/Header/nav.scss b/assets/css/Header/nav.scss index 479f2a0..a5cf6a1 100644 --- a/assets/css/Header/nav.scss +++ b/assets/css/Header/nav.scss @@ -49,7 +49,7 @@ a { display: flex; align-items: center; justify-content: center; - font-size: 18px; + font-size: 16px; font-weight: 600; // color: rgb(198, 198, 198); color: black; diff --git a/assets/css/business/news/index.scss b/assets/css/business/news/index.scss new file mode 100644 index 0000000..0bdf133 --- /dev/null +++ b/assets/css/business/news/index.scss @@ -0,0 +1,101 @@ +.news-container-box { + width: 100%; + // margin-top: 30px; + + .news-big-box { + width: 105%; + display: flex; + // justify-content: center; + // flex-wrap: wrap; + + + .news-box { + padding: 20px; + transition: 0.4s; + + .news-s-box { + height: 450px; + border-radius: 10px; + transition: 0.4s; + padding: 20px; + cursor: pointer; + + .jump { + text-decoration: dashed; + color: black; + } + + &:hover { + box-shadow: 0 0 15px 10px rgb(227, 225, 225); + } + + .news-img-box { + width: 100%; + height: 70%; + overflow: hidden; + + img { + width: 100%; + height: 100%; + object-fit: cover; + } + } + + .news-content-box { + width: 100%; + height: 30%; + display: flex; + flex-direction: column; + justify-content: space-around; + margin-top: 10px; + + .news-content-title { + font-size: 25px; + font-weight: bold; + } + + .news-content-line { + width: 100%; + height: 1px; + background: rgba(204, 204, 204, 1); + } + } + } + } + } + +} + +// ted栏 +.Top_navigation { + display: flex; + justify-content: center; + z-index: 9; + position: relative; +} + +// 分页 +.page-box { + width: 100%; + display: flex; + justify-content: center; + + .page { + margin-bottom: 80px; + } +} + +.news-content-sublevel { + display: flex; + justify-content: space-between; +} + +.jump { + text-decoration: dashed; + color: black; +} + +.ach-container { + float: left; + margin-top: 30px; +} \ No newline at end of file diff --git a/assets/css/business/news/media.scss b/assets/css/business/news/media.scss new file mode 100644 index 0000000..2f13539 --- /dev/null +++ b/assets/css/business/news/media.scss @@ -0,0 +1,41 @@ +//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) { + .ach-container{ + float: left; + margin-top: 120px; + } +} + +/*480px*/ +/*大于*/ +@media screen and (min-width: 480px) {} + +/*小于*/ +@media screen and (max-width: 480px) { + .news-box{ + padding: 0 !important; + } +} \ No newline at end of file diff --git a/assets/css/business/news/news_details/index.scss b/assets/css/business/news/news_details/index.scss new file mode 100644 index 0000000..c2c32fa --- /dev/null +++ b/assets/css/business/news/news_details/index.scss @@ -0,0 +1,45 @@ +.joint-details-pos-box { + padding-bottom: 15rem; +} + +// 标题 +.joint-details-title-box { + width: 100%; + display: flex; + align-items: center; + flex-direction: column; + padding: 0rem 0 2rem 0; + + .joint-details-title { + font-size: 30px; + font-weight: bold; + font-family: '阿里妈妈数黑体'; + } + + .joint-details-time { + margin-top: 2rem; + } +} + +.return { + width: 60px; + height: 50%; + // margin-left: 300px; + margin-top: 50px; + cursor: pointer; +} + +// 翻页 +.Turn-the-page { + line-height: 80px; + + .Turn-the-page-box { + display: flex; + justify-content: space-between; + + a { + text-decoration: dashed; + color: gray; + } + } +} \ No newline at end of file diff --git a/assets/css/business/news/news_details/media.scss b/assets/css/business/news/news_details/media.scss new file mode 100644 index 0000000..3c4b7c7 --- /dev/null +++ b/assets/css/business/news/news_details/media.scss @@ -0,0 +1,34 @@ +/*1440px*/ +/*大于*/ +@media screen and (min-width: 1440px) {} + +/*小于*/ +@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) { + .Turn-the-page-box{ + flex-direction: column; + } + .return { + display: none; + } +} \ No newline at end of file diff --git a/assets/css/index/index.scss b/assets/css/index/index.scss index e69de29..fd4c179 100644 --- a/assets/css/index/index.scss +++ b/assets/css/index/index.scss @@ -0,0 +1,116 @@ +.box{ + width: 100%; + // background-color: black; +} + + +// 米尔产品 +.product-big-box{ + background-color: #f8f8f8; + padding: 100px 0 100px 0; +} + +.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 { + overflow: hidden; + height: 300px; + width: 45%; + box-shadow: rgb(219, 219, 219) 0px 0px 10px 1px; + border-radius: 10px; + + // transform: translateY(-10px); +} + +.product-content-left-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; +} + +.product-content-btn-box { + margin-top: 30px; + display: flex; + justify-content: center; + align-items: center; +} \ No newline at end of file diff --git a/assets/css/poster/index.scss b/assets/css/poster/index.scss index b5475d9..d399495 100644 --- a/assets/css/poster/index.scss +++ b/assets/css/poster/index.scss @@ -4,6 +4,7 @@ position: relative; height: 30vw; width: 100%; + margin-top: 85px; .Poster-img{ height: 100%; width: 100%; @@ -11,7 +12,7 @@ left: 0 ; bottom: 0 ; object-fit: cover; - object-position: 0 40%; + // object-position: 0 40%; } .Poster-content-box{ position: relative; diff --git a/assets/css/root/root.scss b/assets/css/root/root.scss index d421c93..a8b57f3 100644 --- a/assets/css/root/root.scss +++ b/assets/css/root/root.scss @@ -1,12 +1,12 @@ - $rootColor : #2196f3; + $rootColor : #193066; body{ - background-color: #0a0a0a; + // background-color: #0a0a0a; font-family: Inter; } :root{ - --rootColor:#2196f3; + --rootColor:#193066; } .dNone{ display: None!important; diff --git a/components/Carousel/index.vue b/components/Carousel/index.vue index ab4629e..b9366ea 100644 --- a/components/Carousel/index.vue +++ b/components/Carousel/index.vue @@ -41,7 +41,7 @@ import 'swiper/css/navigation' // 获取轮播图列表 const banner_list = ref([ { - banner_img:`/img/loading.gif`, + // banner_img:`/img/loading.gif`, }, ]) const params = reactive({ @@ -62,20 +62,20 @@ const params = reactive({ // })() // }) // 获取海报 -useFetch('/api/banner/getBanner').then(res => { +useFetch('/api/banner/getBanner',{ params: { banner_location: 1 } }).then(res => { banner_list.value = JSON.parse(res.data.value).data }) /**整体轮播图样式*/ let styleContainer = reactive({ - height: '40vw' + height: '38vw', }) const modules = ref([Pagination, Navigation, Autoplay]) const swiperStyle = conversionStyleVal(reactive({ /**轮播图样式*/ color: '', //设置字体颜色 - height: '40vw', //设置高度 + height: '38vw', //设置高度 width: '100%', //设置高度 margin: '0', //设置margin 按照上 右 下 左 或 上下 左右 设置 padding: '0', //设置padding 按照上 右 下 左 或 上下 左右 设置 diff --git a/components/Final/index.vue b/components/Final/index.vue index 1475fc4..a039a96 100644 --- a/components/Final/index.vue +++ b/components/Final/index.vue @@ -95,7 +95,7 @@
-
全国报名热线
+
全国咨询热线
{{ item.consulting_hotline_user }} : {{ item.consulting_hotline_phone }} diff --git a/components/Header/index.vue b/components/Header/index.vue index d5183d2..f845dc9 100644 --- a/components/Header/index.vue +++ b/components/Header/index.vue @@ -81,8 +81,8 @@ let navList = [ { name: '新闻中心', children: [], - href: 'https://github.com/Abbh1/AerwenTool', - alias: 'GitHub' + href: '/news/1', + alias: 'news' }, { name: '关于我们', diff --git a/components/Poster/index.vue b/components/Poster/index.vue index edf82b7..619e20d 100644 --- a/components/Poster/index.vue +++ b/components/Poster/index.vue @@ -3,8 +3,8 @@
-
— {{ posterInfo.title }} —
-
{{ posterInfo.text }}
+ +
@@ -23,7 +23,7 @@ let posterInfo = ref({ // text: '' }), posterStyle = { - height: '40vw' + height: '23vw' } // 获取海报 diff --git a/nuxt.config.ts b/nuxt.config.ts index 1c09148..5446eab 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -8,16 +8,16 @@ export default defineNuxtConfig({ nitro: { devProxy: { "/api-v": { - target: "http://192.168.1.105/Aerwen/houde_web/houde_web_api/public/api.php/", // 文豪 + target: "http://192.168.1.102/zhiyun/.New/mr_web/mr_web_api/public/api.php/", // 文豪 // target: "http://192.168.1.18/ARW/houde_web/houde_web_api/public/api.php/", // 君豪 // target: "http://houde_web.back.aerwen.net/api", // 这里是线上接口地址 changeOrigin: true, prependPath: true, }, "/uploads": { - // target: "http://192.168.1.105/Aerwen/houde_web/houde_web_api/public/uploads", // 文豪 + target: "http://192.168.1.102/zhiyun/.New/mr_web/mr_web_api/public/uploads", // 文豪 // target: "http://192.168.1.18/ARW/houde_web/houde_web_api/public/uploads", // 君豪 - target: "https://houde.api.aerwen.net/uploads", // 这里是线上接口地址 + // target: "https://houde.api.aerwen.net/uploads", // 这里是线上接口地址 changeOrigin: true, prependPath: true, }, diff --git a/pages/index.vue b/pages/index.vue index e832fa1..64d49d1 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -3,18 +3,60 @@ - - - + {{ tdk.tdk_title }} + +
+ +
+ + + +
+
+
+

米尔产品

+
+
+
+ ARM开发工具 +
+
+
+
+
+
+
+ 米尔通过与ST,TI,NXP,全志,Microchip等芯片原厂保持深度密切合作,自主研发了系列应用于工业控制及物联网等相关领域的核心板和开发板等产品,帮助客户实现产品及方案的快速开发。 +
+
+
+
+ +
+
品质优良 性能卓越
+
+
+
+ 查看产品 +
+
+
+
+
+ + + +
+ -
+ @@ -51,12 +93,23 @@ function handleImg(v) { } +/** + * 接口对接 + */ + +// 获取Tdk +let tdk = ref({}) +useFetch('/api/tdk/getTdk', { params: { tdk_type: 1 } }).then(res => { + tdk.value = JSON.parse(res.data.value).data +}) + + /**onMounted**/ onMounted(() => { // imgList.value.push(openImg1.value) - // htmlAddAnimations() + htmlAddAnimations({ tagDom: 'Home-main', preload: 1.3 }) }) /**export**/ defineExpose({ diff --git a/pages/news/[page].vue b/pages/news/[page].vue new file mode 100644 index 0000000..79a4325 --- /dev/null +++ b/pages/news/[page].vue @@ -0,0 +1,145 @@ + + + + + + \ No newline at end of file diff --git a/pages/news/details/[id].vue b/pages/news/details/[id].vue new file mode 100644 index 0000000..5512bc1 --- /dev/null +++ b/pages/news/details/[id].vue @@ -0,0 +1,86 @@ + + + + + + + diff --git a/server/api/banner/getBanner.js b/server/api/banner/getBanner.js index 55d65e4..60df58b 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("https://houde.api.aerwen.net/api.php/Banner.Banner/getBannerList", { + const res = await $fetch( baseURL + "/Banners.Banner/getBannerList", { method, baseURL: event.context.baseUrl, headers: event.context.headers, diff --git a/server/api/poster/getPoster.js b/server/api/poster/getPoster.js new file mode 100644 index 0000000..1903e3c --- /dev/null +++ b/server/api/poster/getPoster.js @@ -0,0 +1,21 @@ +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(baseURL + "/Banners.Poster/getPoster", { + 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/tdk/getTdk.js b/server/api/tdk/getTdk.js index 619ff36..bb7af1f 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("https://houde.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, diff --git a/style/element/index.scss b/style/element/index.scss index db5644d..4e99768 100644 --- a/style/element/index.scss +++ b/style/element/index.scss @@ -2,7 +2,7 @@ @forward 'element-plus/theme-chalk/src/common/var.scss' with ( $colors: ( 'primary': ( - 'base': #a30000, + 'base': #193066, ), ), );