diff --git a/src/assets/images/menu-gray.svg b/src/assets/images/menu-gray.svg
new file mode 100644
index 0000000..9e13d94
--- /dev/null
+++ b/src/assets/images/menu-gray.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index 0fa1bf9..d689891 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -50,7 +50,7 @@
-
+
@@ -72,6 +72,7 @@ export default {
data () {
return {
Util,
+ menuIcon: require(location.href.includes('eduvessel') ? '@/assets/images/menu-gray.svg' : '@/assets/images/menu.svg'),
isHome: true,
isEstate: false,
isIasf: false,
@@ -167,7 +168,7 @@ export default {
const h = this.height
let scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop
// const rule = scrollTop > h
- const rule = scrollTop > 120
+ const rule = scrollTop > 10
if (this.isHome == rule) {
if (this.isHome != !(rule)) this.navShow = false
this.isHome = !(rule)
diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue
index 53eaab4..deddd6d 100644
--- a/src/layouts/navbar/index.vue
+++ b/src/layouts/navbar/index.vue
@@ -189,6 +189,7 @@ $height: 89px;
span {
font-size: 1rem;
font-weight: 600;
+ text-shadow: 0px 2px 2px rgba(185, 185, 185, .6);
}
&:hover {
diff --git a/src/pages/column/index.vue b/src/pages/column/index.vue
index a98bfbc..1e13859 100644
--- a/src/pages/column/index.vue
+++ b/src/pages/column/index.vue
@@ -403,6 +403,7 @@ export default {
},
methods: {
init () {
+ this.columnBanner = ''
this.getInfo();
this.getColumn();
this.getNews();
@@ -448,14 +449,14 @@ export default {
}).catch(err => { })
}
},
- // 获取banner 规则:当前栏目有上传的,用当前的,没有上传的话,读取上级的(上级没有读上上级,以此类推)都没有的读取默认的
+ // 获取banner 规则:当前栏目有上传的,用当前的,没有上传的话,读取上级的(上级没有读上上级,以此类推)都没有的话读取默认的
getBanner (data) {
for (const e of data) {
- if (e.columnBanner) this.columnBanner = e.columnBanner;
+ if (e.columnBanner) this.columnBanner = e.columnBanner
if (e.id == this.info.id) {
- break;
+ break
} else if (e.children.length) {
- this.getBanner(e.children);
+ this.getBanner(e.children)
}
}
},
@@ -879,10 +880,6 @@ export default {
}
/deep/.columns {
- &+.detail {
- padding-left: 20px;
- }
-
width: 22%;
margin-right: 0.6rem;
overflow: auto;
@@ -1229,6 +1226,7 @@ export default {
.detail {
flex: 1;
max-width: 77%;
+ min-height: calc(100vh - 24rem - 90px);
padding: 20px;
background-color: #fff;
overflow: auto;
diff --git a/src/pages/iasf/index.vue b/src/pages/iasf/index.vue
index 2f70f61..b0897dc 100644
--- a/src/pages/iasf/index.vue
+++ b/src/pages/iasf/index.vue
@@ -188,7 +188,7 @@
{{ modules[12].form.subTitle }}
诚邀海内外人才加入我们 >
+ type="primary" round @click="openLink(modules[12].form)">前往查看 >
diff --git a/src/store/modules/content.js b/src/store/modules/content.js
index 0766f7b..5c7c470 100644
--- a/src/store/modules/content.js
+++ b/src/store/modules/content.js
@@ -6,7 +6,7 @@ import Router from '@/router'
export default {
namespaced: true,
state: {
- site: 1,
+ site: location.href.includes('eduvessel') ? 7 : 1,
keyword: '',
scrollTop: 0,
},