diff --git a/.env b/.env index 1255ede..bc2a01b 100644 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ # 后台接口地址(仅开发/预览环境生效) -NUXT_PROXY_API=http://localhost/AERWEN/houde_web/houde_web_api/public/admin.php/ +NUXT_PROXY_API=http://localhost/Aerwen/aerwen_web/aerwen_web_api/public/admin.php/ # 后台图片地址(仅开发/预览环境生效) -NUXT_PROXY_UPLOADS=http://localhost/AERWEN/houde_web/houde_web_api/public/uploads/ +NUXT_PROXY_UPLOADS=http://localhost/Aerwen/aerwen_web/aerwen_web_api/public/uploads/ # 后台富文本上传地址(仅开发/预览环境生效) NUXT_PROXY_WEB_API=http://localhost:3003/api-v \ No newline at end of file diff --git a/assets/css/Final/index.scss b/assets/css/Final/index.scss index 0674511..8b65866 100644 --- a/assets/css/Final/index.scss +++ b/assets/css/Final/index.scss @@ -44,98 +44,66 @@ } .Final-container { + width: 100%; // 底部背景颜色 - background: #193066; + background: #232323; position: relative; color: white; - .Final-big-box { - width: 100%; + .Final-title-box{ display: flex; - justify-content: space-evenly; - flex-direction: column; - margin: 0 auto; + justify-content: center; - .Final-icon-box { - height: 60px; - width: 120px; - - .icon-img { - height: 100%; - width: 100%; - object-fit: contain; - } + .Final-title{ + font-size: 28px; + font-weight: bold; + color: #A7A7A7; + text-align: center; } - .Final-middle-box { - display: flex; - justify-content: center; - align-items: flex-start; - - .Final-middle-items { - margin: 0 30px; - text-align: center; - - .title-head { - font-size: 20px !important; - } - - .items { - margin-bottom: 10px; - color: white; - - font-size: 15px; - cursor: pointer; - } - - .items-title { - font-size: 22px; - margin-bottom: 20px; - color: white; - font-weight: 600; - } - } - } - - - - .Final-code-box { - display: none; - justify-content: center; - align-items: center; - flex-direction: column; - height: 100%; - width: 100%; - margin-top: 50px; - overflow: hidden; - - .code-text { - font-size: 20px; - margin-bottom: 10px; - font-weight: bold; - } - - img { - width: 50%; - height: 50%; - } - } } + + .Final-bottom-line{ + margin: 30px auto; + width: 30%; + height: 1px; + background-color: #343434; + } + + .Final-link-box{ + display: flex; + justify-content: center; + margin-top: 15px; + + .items{ + margin: 0 10px; + font-size: 19px; + color: #888888; + } + } } .Final-bottom-box { width: 100%; display: flex; + flex-direction: column; justify-content: center; align-items: center; - padding: 30px 0; + // padding: 30px 0; + padding-bottom: 30px; color: white; - font-size: 15px; + font-size: 13px; font-weight: bold; // 底部版权颜色 - background-color:#193066; + background-color:#232323; + + + div{ + color: #888888; + margin-top: 10px; + } } } diff --git a/assets/css/Header/icon.scss b/assets/css/Header/icon.scss index cbec288..e9eb122 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: 250px; margin-top: 0; display: flex; justify-content: center; diff --git a/assets/css/Header/nav.scss b/assets/css/Header/nav.scss index a5cf6a1..5a3c8cf 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: 16px; + font-size: 18px; font-weight: 600; // color: rgb(198, 198, 198); color: black; @@ -76,7 +76,7 @@ a { // border-color: transparent transparent black!important; // } span { - color: #f9b54c !important; + color: #109DEA !important; } } } diff --git a/components/Carousel/index.vue b/components/Carousel/index.vue index c19f26f..18a1a9e 100644 --- a/components/Carousel/index.vue +++ b/components/Carousel/index.vue @@ -69,13 +69,13 @@ useFetch('/api/banner/getBanner',{ params: { banner_location: 1 } }).then(res => /**整体轮播图样式*/ let styleContainer = reactive({ - height: '33vw', + height: '46vw', }) const modules = ref([Pagination, Navigation, Autoplay]) const swiperStyle = conversionStyleVal(reactive({ /**轮播图样式*/ color: '', //设置字体颜色 - height: '33vw', //设置高度 + height: '46vw', //设置高度 width: '100%', //设置高度 margin: '0', //设置margin 按照上 右 下 左 或 上下 左右 设置 padding: '0', //设置padding 按照上 右 下 左 或 上下 左右 设置 diff --git a/components/Final/index.vue b/components/Final/index.vue index a039a96..c8e41db 100644 --- a/components/Final/index.vue +++ b/components/Final/index.vue @@ -4,110 +4,34 @@ +
- +
-
- -
-
-
关于我们
- -
厚德简介
-
- -
教学环境
-
- -
发展历程
-
-
-
-
招生报名
- -
招生简介
-
- -
班型介绍
-
- -
招生回答
-
- -
报名方式
-
-
-
-
师资力量
- -
教师列表
-
-
-
-
荣誉成绩
- -
录取院校
-
- -
联考成绩
-
-
-
-
作品欣赏
- -
作品列表
-
-
-
-
艺考资讯
- -
资讯列表
-
-
-
-
联系我们
- -
联系方式
-
- -
在线报名
-
- -
用户留言
-
- -
合作加盟
-
-
-
+
+
专业的网站建设、微信小程序、公众号开发
+
+ -
-
-
全国咨询热线
-
-
- {{ item.consulting_hotline_user }} : {{ item.consulting_hotline_phone }} -
-
-
+
+ +
+
© 2023-2033 佛山市昂迩文科技中心 版权所有 粤ICP备:16050845号-2
+
京公网安备 11010602007212号
- -
©2023 米尔科技有限公司 版权所有
diff --git a/components/Header/index.vue b/components/Header/index.vue index 18847c3..2f826b2 100644 --- a/components/Header/index.vue +++ b/components/Header/index.vue @@ -67,39 +67,33 @@ let navList = [ alias: 'index' }, { - name: '产品中心', + name: '案例展示', children: [], - href: 'https://gitee.com/zhi-lan_0/aerowen-toolbox', - alias: 'Gitee' + href: '', + alias: '' }, { - name: '服务与支持', + name: '关于我们', children: [], - href: 'https://github.com/Abbh1/AerwenTool', - alias: 'GitHub' + href: '', + alias: '' }, { - name: '新闻中心', + name: '新闻咨询', children: [], href: '/news/1-1', alias: 'news' }, { - name: '关于我们', + name: '联系我们', children: [], - href: 'https://github.com/Abbh1/AerwenTool', - alias: 'GitHub' + href: '', + alias: '' }, ] -// [ -// { -// txt:'123', -// href:'' -// } -// ] let searchRes = ref(null) const showSearchBox = function () { diff --git a/nuxt.config.ts b/nuxt.config.ts index 5446eab..27c5d74 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -8,15 +8,13 @@ export default defineNuxtConfig({ nitro: { devProxy: { "/api-v": { - 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://localhost/Aerwen/aerwen_web/aerwen_web_api/public/api.php/", // 文豪 // target: "http://houde_web.back.aerwen.net/api", // 这里是线上接口地址 changeOrigin: true, prependPath: true, }, "/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: "http://localhost/Aerwen/aerwen_web/aerwen_web_api/public/uploads", // 文豪 // target: "https://houde.api.aerwen.net/uploads", // 这里是线上接口地址 changeOrigin: true, prependPath: true, diff --git a/package-lock.json b/package-lock.json index 6b9adeb..e510a50 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "mr_web_nuxt", + "name": "aerwen_web_nuxt", "lockfileVersion": 3, "requires": true, "packages": { @@ -21,7 +21,7 @@ }, "devDependencies": { "@nuxtjs/style-resources": "^1.2.1", - "node-sass": "^8.0.0", + "node-sass": "8.0", "nuxt": "^3.2.2", "sass-loader": "^13.2.0", "unplugin-auto-import": "^0.10.3", @@ -2816,9 +2816,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001458", - "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001458.tgz", - "integrity": "sha512-lQ1VlUUq5q9ro9X+5gOEyH7i3vm+AYVT1WDCVB69XOZ17KZRhnZ9J0Sqz7wTHQaLBJccNCHq8/Ww5LlOIZbB0w==" + "version": "1.0.30001559", + "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001559.tgz", + "integrity": "sha512-cPiMKZgqgkg5LY3/ntGeLFUpi6tzddBNS58A4tnTgQw1zON7u2sZMU7SzOeVH4tj20++9ggL+V6FDOFMTaFFYA==" }, "node_modules/chalk": { "version": "2.4.2", @@ -9043,20 +9043,23 @@ } }, "node_modules/sass-loader": { - "version": "13.2.0", - "resolved": "https://registry.npmmirror.com/sass-loader/-/sass-loader-13.2.0.tgz", - "integrity": "sha512-JWEp48djQA4nbZxmgC02/Wh0eroSUutulROUusYJO9P9zltRbNN80JCBHqRGzjd4cmZCa/r88xgfkjGD0TXsHg==", + "version": "13.3.2", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.3.2.tgz", + "integrity": "sha512-CQbKl57kdEv+KDLquhC+gE3pXt74LEAzm+tzywcA0/aHZuub8wTErbjAoNI57rPUWRYRNC5WUnNl8eGJNbDdwg==", "dev": true, "dependencies": { - "klona": "^2.0.4", "neo-async": "^2.6.2" }, "engines": { "node": ">= 14.15.0" }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, "peerDependencies": { "fibers": ">= 3.1.0", - "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0", + "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0", "sass": "^1.3.0", "sass-embedded": "*", "webpack": "^5.0.0" diff --git a/package.json b/package.json index aeabb49..e52fdad 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ }, "devDependencies": { "@nuxtjs/style-resources": "^1.2.1", - "node-sass": "^8.0.0", + "node-sass": "8.0", "nuxt": "^3.2.2", "sass-loader": "^13.2.0", "unplugin-auto-import": "^0.10.3", diff --git a/public/img/icon/logo.png b/public/img/icon/logo.png index 980edca..524759d 100644 Binary files a/public/img/icon/logo.png and b/public/img/icon/logo.png differ