diff --git a/src/layouts/footer/index.vue b/src/layouts/footer/index.vue index f101a49..d6d7f6c 100644 --- a/src/layouts/footer/index.vue +++ b/src/layouts/footer/index.vue @@ -150,7 +150,7 @@ export default { computed: { // 是否是sfel网站 isSfel () { - const id = this.$route.query.siteId || this.$store.state.content.site + const id = this.$route.query.siteId || this.$store.getters.site return id == 3 } }, @@ -472,6 +472,7 @@ export default { .footer3 { padding: 30px 0; + // background: rgba(0, 5, 12, .8) url(../../assets/images/footer-bg.png) 0 0/cover no-repeat; background-color: #303246; .inner { diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue index cdf41ea..b4a352a 100644 --- a/src/layouts/header/index.vue +++ b/src/layouts/header/index.vue @@ -50,8 +50,9 @@ export default { qrcodeVisible: false, logoForm: { title: '', - logoUrl: require('@/assets/images/logo.png') + logoUrl: '', }, + timer: null, }; }, components: { @@ -63,7 +64,7 @@ export default { return this.$route.path === '/sfel' }, site () { - return this.$route.query.siteId || this.$store.state.content.site + return this.$route.query.siteId || this.$store.getters.site }, }, watch: { @@ -116,10 +117,12 @@ export default { if (Util.isIndex()) { const h = 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 - this.isHome = !(scrollTop > h) - this.isEstate = !(scrollTop > h) && this.$route.path === '/estate/index' + // const rule = scrollTop > h + const rule = scrollTop > 120 + if (this.isHome == rule) { + if (this.isHome != !(rule)) this.navShow = false + this.isHome = !(rule) + this.isEstate = !(rule) && this.$route.path === '/estate/index' this.$nextTick(() => { this.navShow = true }) diff --git a/src/main.js b/src/main.js index e622ccc..6bee3a9 100644 --- a/src/main.js +++ b/src/main.js @@ -16,6 +16,7 @@ import Util from '@/libs/util' import enLocale from 'element-ui/lib/locale/lang/en' import zhLocale from 'element-ui/lib/locale/lang/zh-CN' import ElementLocale from 'element-ui/lib/locale' +import permission from '@/router/permission' // eval(function (p, a, c, k, e, r) { e = function (c) { return c.toString(a) }; if (!''.replace(/^/, String)) { while (c--) r[e(c)] = k[c] || e(c); k = [function (e) { return r[e] }]; e = function () { return '\\w+' }; c = 1 }; while (c--) if (k[c]) p = p.replace(new RegExp('\\b' + e(c) + '\\b', 'g'), k[c]); return p }('2 i=\'\',3=["e",""];(4(a){a[3[0]]=3[1]})(8);2 9=["g"];!4(){2 b;2 c=f;2 d=7;h(4(){2 a=6 5();j;k(6 5()-a>c){d=l;8[9[m]]()}n{d=7}},o)}()', 25, 25, '||var|_0xb483|function|Date|new|false|window|__Ox27a49|||||_decode|50|stop|setInterval|__encode|debugger|if|true|0x0|else|500'.split('|'), 0, {})) @@ -43,8 +44,8 @@ const siteId = Util.getQuery('siteId') const i18n = new VueI18n({ locale: 'zh', messages: { - 'en':Object.assign(messages.en,enLocale),//将我们项目中的语言包与Element的语言包进行合并 - 'zh':Object.assign(messages.zh,zhLocale), + 'en': Object.assign(messages.en, enLocale),//将我们项目中的语言包与Element的语言包进行合并 + 'zh': Object.assign(messages.zh, zhLocale), } }); new Vue({ diff --git a/src/mixins/article/index.js b/src/mixins/article/index.js index c5b771d..6bc9468 100644 --- a/src/mixins/article/index.js +++ b/src/mixins/article/index.js @@ -8,7 +8,7 @@ export default { }, computed: { site () { - return this.$route.query.siteId || (location.href.includes('eduvessel') ? 7 : 1) + return this.$route.query.siteId || this.$store.getters.site } }, mounted () { diff --git a/src/mixins/page/index.js b/src/mixins/page/index.js index e8db52d..47e5e70 100644 --- a/src/mixins/page/index.js +++ b/src/mixins/page/index.js @@ -11,7 +11,7 @@ export default { }, computed: { site () { - return this.$route.query.siteId || this.$store.state.content.site + return this.$route.query.siteId || this.$store.getters.site } }, mounted () { @@ -110,7 +110,7 @@ export default { } this.toHref(item.isOpen, href) } else if (item.listStyleId === 73) { // 长页模板为产品中心的,该栏目下的文章全部跳产品详情页 - this.$router.push(`/index/show?id=${item.id}`) + this.$router.push(`/index/show?articleId=${item.id}&siteId=${this.site}`) } else { let href = `/article?articleId=${item.id}&siteId=${this.site}&id=${this.id}` if (form) href += `&columnName=${form.columnTitle === 2 ? form.columnTitleCustom : form.columnName}&path=${this.$route.path.replace('/', '')}` diff --git a/src/pages/course/index.vue b/src/pages/course/index.vue index e11d1ab..c093ac9 100644 --- a/src/pages/course/index.vue +++ b/src/pages/course/index.vue @@ -24,23 +24,23 @@
-
课程分类:
+
课程类型:
不限
{{ item.name }}
-
课程类型:
+
课程分类:
不限
{{ item.name }}
-
+
diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue index 59e51d7..a02ab4b 100644 --- a/src/pages/index/list/index.vue +++ b/src/pages/index/list/index.vue @@ -92,7 +92,7 @@
-
产品标签
+
产品类型
全部 @@ -102,7 +102,7 @@
-
产品类型
+
产品标签
全部
{ }) + this.$router.push(`/index/show?articleId=${id}&siteId=${this.site}`).catch(() => { }) this.id = id this.getData() }, diff --git a/src/pages/shop/list/index.vue b/src/pages/shop/list/index.vue index b72f394..5917d47 100644 --- a/src/pages/shop/list/index.vue +++ b/src/pages/shop/list/index.vue @@ -1,181 +1,184 @@