diff --git a/src/assets/images/iasf1.png b/src/assets/images/iasf1.png
new file mode 100644
index 0000000..9f580ea
Binary files /dev/null and b/src/assets/images/iasf1.png differ
diff --git a/src/assets/images/iasf2.png b/src/assets/images/iasf2.png
new file mode 100644
index 0000000..afbe153
Binary files /dev/null and b/src/assets/images/iasf2.png differ
diff --git a/src/layouts/footer/index.vue b/src/layouts/footer/index.vue
index 2e1f5c2..080aea8 100644
--- a/src/layouts/footer/index.vue
+++ b/src/layouts/footer/index.vue
@@ -254,6 +254,7 @@ export default {
margin-right: 100px;
}
.footer {
+ z-index: 2;
position: relative;
padding: 64px 20% 25px;
color: #fff;
@@ -404,40 +405,40 @@ export default {
}
}
}
-@media (max-width: 1500px) {
- .footer {
- padding: 64px 10% 25px;
- }
-}
-@media (max-width: 1350px) {
- .inner {
- width: 100% !important;
- .title {
- width: 100%;
- text-align: center;
- }
- .region {
- top: 300px;
- left: 50%;
- }
- .info {
- margin-top: 90px;
- }
- }
- .footer {
- .info {
- flex-direction: column;
- .column {
- margin-top: 20px;
- margin-left: 0;
- }
- }
- }
- .entry {
- flex-direction: column;
- li {
- margin-bottom: 30px;
- }
- }
-}
+// @media (max-width: 1500px) {
+// .footer {
+// padding: 64px 10% 25px;
+// }
+// }
+// @media (max-width: 1350px) {
+// .inner {
+// width: 100% !important;
+// .title {
+// width: 100%;
+// text-align: center;
+// }
+// .region {
+// top: 300px;
+// left: 50%;
+// }
+// .info {
+// margin-top: 90px;
+// }
+// }
+// .footer {
+// .info {
+// flex-direction: column;
+// .column {
+// margin-top: 20px;
+// margin-left: 0;
+// }
+// }
+// }
+// .entry {
+// flex-direction: column;
+// li {
+// margin-bottom: 30px;
+// }
+// }
+// }
\ No newline at end of file
diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index fbbb302..1a63f13 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -7,7 +7,12 @@
alt="">
-
+
@@ -177,9 +182,9 @@ export default {
this.showMoreBtns = type
},
// 获取页面滚动距离(home长页专用)
- handleScroll () {
+ handleScroll (e) {
if (Util.isIndex()) {
- const h = this.height
+ const h = this.isIasf ? 50 : this.height
let scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop
if (this.isHome == scrollTop > h) {
if (this.isHome != !(scrollTop > h)) this.navShow = false
@@ -254,7 +259,7 @@ $height: 90px;
background-color: rgba(0, 0, 0, 0.15);
}
.logo {
- font-size: 1.428rem;
+ font-size: 1.4rem;
color: #333330;
line-height: $height;
cursor: pointer;
@@ -263,6 +268,7 @@ $height: 90px;
}
}
.tools {
+ white-space: nowrap;
img {
cursor: pointer;
}
diff --git a/src/layouts/home/index.vue b/src/layouts/home/index.vue
index b25095a..3b0f9a3 100644
--- a/src/layouts/home/index.vue
+++ b/src/layouts/home/index.vue
@@ -66,7 +66,7 @@ export default {
\ No newline at end of file
diff --git a/src/store/index.js b/src/store/index.js
index 154cac2..1b82cff 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -20,7 +20,7 @@ const modules = modulesFiles.keys().reduce((modules, modulePath) => {
const store = new Vuex.Store({
state: {
modelType: false, //true为PC端,false为手机端
- navSum: sessionStorage.getItem('navPageSize') || 10, // 导航栏显示的条目数量
+ navSum: sessionStorage.getItem('navPageSize') || 8, // 导航栏显示的条目数量
},
mutations: {
// 根据屏幕尺寸分别移动或者pc