fix

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 {

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) {
+        // const rule = scrollTop > h
-          if (this.isHome != !(scrollTop > h)) this.navShow = false
+        const rule = scrollTop > 120
-          this.isHome = !(scrollTop > h)
+        if (this.isHome == rule) {
-          this.isEstate = !(scrollTop > h) && this.$route.path === '/estate/index'
+          if (this.isHome != !(rule)) this.navShow = false
+          this.isHome = !(rule)
+          this.isEstate = !(rule) && this.$route.path === '/estate/index'
           this.$nextTick(() => {
             this.navShow = true
           })

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的语言包进行合并
+    'en': Object.assign(messages.en, enLocale),//将我们项目中的语言包与Element的语言包进行合并
-    'zh':Object.assign(messages.zh,zhLocale),
+    'zh': Object.assign(messages.zh, zhLocale),
   }
 });
 new Vue({

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 () {

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('/', '')}`

src/pages/course/index.vue

@@ -24,23 +24,23 @@
         <div class="right">
           <div class="filter">
             <dl>
-              <dt>课程分类：</dt>
+              <dt>课程类型：</dt>
               <dd :class="{ active: form.categoryId === '' }" @click="changeCategory('')">不限</dd>
               <dd v-for="(item, i) in categories" :key="i" :class="{ active: form.categoryId === item.categoryId }"
                 @click="changeCategory(item.categoryId)">{{ item.name }}</dd>
             </dl>
             <dl>
-              <dt>课程类型：</dt>
+              <dt>课程分类：</dt>
               <dd :class="{ active: form.classificationTagId === '' }" @click="changeType('')">不限</dd>
               <dd v-for="(item, i) in classifications" :key="i"
                 :class="{ active: form.classificationTagId === item.categoryId }" @click="changeType(item.categoryId)">
                 {{ item.name }}</dd>
             </dl>
-            <dl>
+            <!-- <dl>
               <dt>是否免费：</dt>
               <dd v-for="(item, i) in types" :key="i" :class="{ active: form.courseType === item.id }"
                 @click="changeCourseType(item.id)">{{ item.name }}</dd>
-            </dl>
+            </dl> -->
           </div>
 
           <div class="courses">

src/pages/index/list/index.vue

@@ -92,7 +92,7 @@
             </dl>
           </template>
           <dl v-if="curTab == 3">
-            <dt>产品标签</dt>
+            <dt>产品类型</dt>
             <div class="vals">
               <dd :class="{ active: form.classificationTagId === '' }" @click="filterChange('', 'classificationTagId')">
                 全部
@@ -102,7 +102,7 @@
             </div>
           </dl>
           <dl>
-            <dt>产品类型</dt>
+            <dt>产品标签</dt>
             <div class="vals">
               <dd :class="{ active: form.categoryId === '' }" @click="filterChange('', 'categoryId')">全部</dd>
               <dd v-for="(item, i) in types" :key="i" :class="{ active: form.categoryId === item.categoryId }"

src/pages/index/show/index.vue

@@ -92,7 +92,7 @@ import ScrollReveal from 'scrollreveal'
 export default {
   data () {
     return {
-      id: this.$route.query.id,
+      id: this.$route.query.articleId,
       loading: false,
       routes: {},
       curTab: 0,
@@ -116,7 +116,7 @@ export default {
   },
   computed: {
     site () {
-      return this.$route.query.siteId || this.$store.state.content.site
+      return this.$route.query.siteId || this.$store.getters.site
     }
   },
   components: {
@@ -253,7 +253,7 @@ export default {
     },
     // 跳转详情
     toDetail (id) {
-      this.$router.push(`/index/show?id=${id}`).catch(() => { })
+      this.$router.push(`/index/show?articleId=${id}&siteId=${this.site}`).catch(() => { })
       this.id = id
       this.getData()
     },

src/pages/shop/list/index.vue

@@ -1,5 +1,6 @@
 <template>
-  <div v-if="modules.length" class="wrap">
+  <div class="wrap">
+    <template v-if="modules.length">
       <el-carousel class="carousel fadeInUp" :interval="6000" height="354px"
         :arrow="(modules[0] && modules[0].list.filter(e => e.isEnable).length > 1) ? 'hover' : 'never'"
         :indicator-position="modules[0].list.filter(e => e.isEnable).length > 1 ? '' : 'none'">
@@ -45,7 +46,8 @@
               </div>
               <div class="tab-con">
                 <ul class="tab">
-                <li v-for="(tab, i) in tabs" :key="i" :class="{ active: curTab === tab.id }" @click="tabChange(tab)">{{
+                  <li v-for="(tab, i) in tabs" :key="i" :class="{ active: curTab === tab.id }" @click="tabChange(tab)">
+                    {{
                       tab.name }}</li>
                 </ul>
               </div>
@@ -176,6 +178,7 @@
           </div>
         </div>
       </div>
+    </template>
   </div>
 </template>
 

src/setting.js

@@ -8,14 +8,13 @@ let host = `${location.origin}/`
 if (isDev) {
   host = 'http://192.168.31.217:10000/'
   // host = 'https://huorantech.com'
-  // host = 'http://139.159.254.212/'
 }
 
 const Setting = {
   /**
   * 基础配置
   * */
-  titleSuffix: '深圳或然科技官网', // 网页标题的后缀
+  titleSuffix: location.href.includes('eduvessel') ? '慧教云舟' : '职站商城', // 网页标题的后缀
   routerMode: "hash", // 路由模式，可选值为 history 或 hash
   apiBaseURL: host, // 接口请求地址
   huoranApi: `https://occupationlab.com`,

src/store/getters.js

@@ -1,5 +1,6 @@
 const getters = {
-    getModelType:(state) => state.modelType,
+  getModelType: (state) => state.modelType,
-    getNavSum:(state) => state.navSum
+  getNavSum: (state) => state.navSum,
+  site: (state) => location.href.includes('eduvessel') ? 7 : 1,
 };
 export default getters;

src/store/modules/content.js

@@ -2,8 +2,8 @@
  * 内容管理
  * */
 
- import Router from '@/router'
+import Router from '@/router'
- export default {
+export default {
   namespaced: true,
   state: {
     site: 1,