diff --git a/public/nav/index.js b/public/nav/index.js index f45ea8d..9e3bce8 100644 --- a/public/nav/index.js +++ b/public/nav/index.js @@ -1,7 +1,26 @@ window.nav = { header: [ {id: 1, label: '首页', url: '/', hasChildren: false}, - {id: 2, label: '产品中心', url: '/product', hasChildren: false}, + { + id: 2, + label: '产品中心', + url: '/product', + hasChildren: true, + children: [ + { + id: 2.1, + label: '低空监管体系', + url: '/product/monitorSystem', + hasChildren: false, + }, + { + id: 2.2, + label: '低空远程识别设备', + url: '/product/remoteDevice', + hasChildren: false, + }, + ], + }, {id: 3, label: '服务与支撑', url: '/services', hasChildren: false}, {id: 4, label: '新闻中心', url: '/news', hasChildren: false}, {id: 5, label: '关于我们', url: '/about', hasChildren: false}, @@ -10,41 +29,37 @@ window.nav = { footer: [ { id: 1, - headerId: 2, label: '产品中心', url: '', hasChildren: true, children: [ - {id: 1.1, headerId: 2, label: '智能加载服务', url: '/product'}, - {id: 1.2, headerId: 2, label: '智能加载服务', url: '/product'}, - {id: 1.3, headerId: 2, label: '智能加载服务', url: '/product'}, - {id: 1.4, headerId: 2, label: '智能加载服务', url: '/product'}, + {id: 1.1, label: '低空监管体系', url: '/product/monitorSystem'}, + {id: 1.2, label: '低空远程识别设备', url: '/product/remoteDevice'}, + {id: 1.3, label: '智能加载服务', url: '/product'}, + {id: 1.4, label: '智能加载服务', url: '/product'}, ], }, { id: 2, - headerId: 3, label: '服务与支撑', url: '/services', hasChildren: false, }, { id: 3, - headerId: 0, label: '软件下载', url: '/download', hasChildren: false, }, - {id: 4, headerId: 4, label: '新闻中心', url: '/news', hasChildren: false}, + {id: 4, label: '新闻中心', url: '/news', hasChildren: false}, { id: 5, - headerId: 0, label: '关于燃谷', url: '', hasChildren: true, children: [ - {id: 5.1, headerId: 5, label: '公司简介', url: '/about'}, - {id: 5.2, headerId: 6, label: '联系我们', url: '/link'}, + {id: 5.1, label: '公司简介', url: '/about'}, + {id: 5.2, label: '联系我们', url: '/link'}, ], }, ], diff --git a/public/static/images/banner/about.png b/public/static/images/banner/about.png new file mode 100644 index 0000000..6882afb Binary files /dev/null and b/public/static/images/banner/about.png differ diff --git a/public/static/images/banner/link.png b/public/static/images/banner/link.png new file mode 100644 index 0000000..a71ef87 Binary files /dev/null and b/public/static/images/banner/link.png differ diff --git a/public/static/images/banner/news.png b/public/static/images/banner/news.png new file mode 100644 index 0000000..9df6d8f Binary files /dev/null and b/public/static/images/banner/news.png differ diff --git a/public/static/images/banner/product.png b/public/static/images/banner/product.png new file mode 100644 index 0000000..f89867b Binary files /dev/null and b/public/static/images/banner/product.png differ diff --git a/public/static/images/banner/services.png b/public/static/images/banner/services.png new file mode 100644 index 0000000..79f60b6 Binary files /dev/null and b/public/static/images/banner/services.png differ diff --git a/public/static/images/footer/logo.png b/public/static/images/footer/logo.png index 9000cdb..422f296 100644 Binary files a/public/static/images/footer/logo.png and b/public/static/images/footer/logo.png differ diff --git a/public/static/images/footer/logo_label_CN.png b/public/static/images/footer/logo_label_CN.png deleted file mode 100644 index 15c9594..0000000 Binary files a/public/static/images/footer/logo_label_CN.png and /dev/null differ diff --git a/public/static/images/footer/logo_lable_EN.png b/public/static/images/footer/logo_lable_EN.png deleted file mode 100644 index dc5efd3..0000000 Binary files a/public/static/images/footer/logo_lable_EN.png and /dev/null differ diff --git a/public/static/images/header/logo.png b/public/static/images/header/logo.png index ef5a396..4bae3d1 100644 Binary files a/public/static/images/header/logo.png and b/public/static/images/header/logo.png differ diff --git a/public/static/images/main/map.png b/public/static/images/main/map.png new file mode 100644 index 0000000..cc92ecf Binary files /dev/null and b/public/static/images/main/map.png differ diff --git a/public/static/images/main/rangu.png b/public/static/images/main/rangu.png new file mode 100644 index 0000000..05a0fb5 Binary files /dev/null and b/public/static/images/main/rangu.png differ diff --git a/public/static/images/news/1.png b/public/static/images/news/1.png new file mode 100644 index 0000000..8535915 Binary files /dev/null and b/public/static/images/news/1.png differ diff --git a/public/static/images/news/2.png b/public/static/images/news/2.png new file mode 100644 index 0000000..6c5a6eb Binary files /dev/null and b/public/static/images/news/2.png differ diff --git a/public/static/images/news/3.png b/public/static/images/news/3.png new file mode 100644 index 0000000..b857d8c Binary files /dev/null and b/public/static/images/news/3.png differ diff --git a/public/static/images/news/4.png b/public/static/images/news/4.png new file mode 100644 index 0000000..dc5cee7 Binary files /dev/null and b/public/static/images/news/4.png differ diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index d55882d..827f2f7 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -15,11 +15,10 @@ body { overflow-y: auto; } -.placeholder { +.banner { width: 100%; height: 600px; - background-color: #d9d9d9; - font-size: 40px; + margin-bottom: 50px; } .page { width: 100%; diff --git a/src/assets/styles/variable.scss b/src/assets/styles/variable.scss index fefac9b..f4a75af 100644 --- a/src/assets/styles/variable.scss +++ b/src/assets/styles/variable.scss @@ -4,4 +4,9 @@ $bg_color: #081314; $white: #ffffff; $black: #000000; +$nav_font_size: 18px; + $border: 2px solid red; + +// header nav +$header_nav_height: 80px; diff --git a/src/components/Banner/index.vue b/src/components/Banner/index.vue new file mode 100644 index 0000000..edae95e --- /dev/null +++ b/src/components/Banner/index.vue @@ -0,0 +1,24 @@ + + + + + diff --git a/src/components/swiper/index.vue b/src/components/swiper/index.vue index 359d550..40c23c8 100644 --- a/src/components/swiper/index.vue +++ b/src/components/swiper/index.vue @@ -68,9 +68,7 @@ const translate = (page) => { * @param {number} page - 目标页码 */ const goToPage = (page) => { - console.log('page===>', page) currentPage.value = Number(page) - console.log('currentPage.value===>', currentPage.value, page) } /** @@ -247,8 +245,8 @@ onUnmounted(stopAutoPlay) .carousel-title { font-family: 'PingFang SC'; font-weight: 600; - font-size: 38px; - color: #333; + font-size: 24px; + color: #333333; } .carousel-pagination { diff --git a/src/home.vue b/src/home.vue index 8398af0..b184203 100644 --- a/src/home.vue +++ b/src/home.vue @@ -6,7 +6,13 @@ import Footer from './views/layout/pc/footer/index.vue' @@ -19,19 +25,19 @@ import Footer from './views/layout/pc/footer/index.vue' flex-direction: column; #header { width: 100%; - height: 100px; + height: $header_nav_height; position: fixed; z-index: 99; } #main { - margin-top: 100px; + margin-top: $header_nav_height; width: 100%; flex: 1; background-color: $white; } #footer { width: 100%; - height: 681px; + height: 500px; } } diff --git a/src/router/index.js b/src/router/index.js index 4680d77..0dea76e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -4,22 +4,36 @@ import HomeView from '@/views/homepage/index.vue' const routes = [ {path: '/', component: HomeView}, + // ============================================ 产品中心 ============================================ { - path: '/product', - component: () => import('@/views/product/index.vue'), + path: '/product/monitorSystem', + name: 'monitorSystem', + component: () => import('@/views/product/monitorSystem.vue'), meta: { - title: '产品中心', + title: '低空监管体系', }, }, + { + path: '/product/remoteDevice', + name: 'remoteDevice', + component: () => import('@/views/product/remoteDevice.vue'), + meta: { + title: '低空远程识别设备', + }, + }, + // ============================================ 服务与支撑 ============================================ { path: '/services', + name: 'Services', component: () => import('@/views/services/index.vue'), meta: { title: '服务与支撑', }, }, + // ============================================ 新闻中心 ============================================ { path: '/news', + name: 'News', component: () => import('@/views/news/index.vue'), meta: { title: '新闻中心', @@ -29,24 +43,32 @@ const routes = [ path: '/news/detail', name: 'Detail', component: () => import('@/views/news/detail.vue'), + meta: { + title: '新闻详情', + }, }, + // ============================================ 关于我们 ============================================ { path: '/about', + name: 'About', component: () => import('@/views/about/index.vue'), meta: { title: '关于我们', }, }, - + // ============================================ 联系我们 ============================================ { path: '/link', + name: 'Link', component: () => import('@/views/link/index.vue'), meta: { title: '联系我们', }, }, + // ============================================ 下载中心 ============================================ { path: '/download', + name: 'Download', component: () => import('@/views/download/index.vue'), meta: { title: '下载中心', diff --git a/src/store/nav.js b/src/store/nav.js index f9f901c..c48c840 100644 --- a/src/store/nav.js +++ b/src/store/nav.js @@ -11,7 +11,6 @@ export const useNavStore = defineStore( return } else { navIndex.value = id - console.log(localStorage.getItem('nav')) } } diff --git a/src/views/about/index.vue b/src/views/about/index.vue index cd8aaa2..25ee8cf 100644 --- a/src/views/about/index.vue +++ b/src/views/about/index.vue @@ -1,19 +1,22 @@ diff --git a/src/views/news/detail.vue b/src/views/news/detail.vue index 70a7c16..9daef8e 100644 --- a/src/views/news/detail.vue +++ b/src/views/news/detail.vue @@ -1,23 +1,80 @@ - + diff --git a/src/views/news/index.vue b/src/views/news/index.vue index 0fee65e..862c070 100644 --- a/src/views/news/index.vue +++ b/src/views/news/index.vue @@ -1,71 +1,62 @@