fix

src/layouts/header/index.vue

@@ -10,17 +10,17 @@
     </a>
     <navbar ref="nav" :isHome.sync="isHome"></navbar>
     <div class="tools">
-      <img class="search" :src="require('@/assets/images/search' + (isHome ? '-white' : '') + '.png')" alt="" @click="showSearch = !showSearch">
+      <img class="search" :src="require('@/assets/images/search' + (isHome ? '-white' : '') + '.png')" alt="" @click="toggleSearch">
-      <img :src="require('@/assets/images/cn' + (isHome ? '-white' : '') + '.png')" alt="" @click="showSearch = !showSearch">
+      <img :src="require('@/assets/images/cn' + (isHome ? '-white' : '') + '.png')" alt="" @click="toggleSearch">
       <div v-if="showSearch" class="search-wrap">
         <i class="el-icon-search icon"></i>
-        <input type="text" placeholder="请输入文章标题" v-model="title">
+        <input ref="search" type="text" placeholder="请输入文章标题" v-model="title">
       </div>
     </div>
   </div>
 </template>
 <script>
-import { mapState, mapMutations, mapActions } from 'vuex'
+import { mapMutations } from 'vuex'
 import Setting from '@/setting'
 import util from '@/libs/util'
 import navbar from '../navbar'
@@ -29,7 +29,8 @@ export default {
     return {
       isHome: this.$route.path === '/home',
       showSearch: false,
-      title: ''
+      title: '',
+      searchTimer: null
     };
   },
   components: {
@@ -38,15 +39,25 @@ export default {
   watch: {
     '$route'() {
       this.isHome = this.$route.path === '/home'
+    },
+    title: function(val) {
+      clearTimeout(this.searchTimer)
+      this.searchTimer = setTimeout(() => {
+        this.handleSearch()
+      }, 500)
     }
   },
   beforeDestroy () {
     window.removeEventListener('scroll', this.handleScroll)
   },
   mounted() {
+    this.setKeyword('')
     window.addEventListener('scroll', this.handleScroll) // 监听页面滚动
   },
   methods: {
+    ...mapMutations('content', [
+      'setKeyword'
+    ]),
     toIndex() {
       this.$refs.nav.jump({
           index: '/index/list'
@@ -61,6 +72,18 @@ export default {
         }
       }
     },
+    // 切换显示搜索
+    toggleSearch() {
+      this.showSearch = !this.showSearch
+      this.$nextTick(() => {
+        this.$refs.search.focus()
+      })
+    },
+    // 全局搜索
+    handleSearch() {
+      this.setKeyword(this.title)
+      this.title && this.$router.push(`/column`)
+    }
   }
 };
 </script>

src/layouts/navbar/index.vue

@@ -59,7 +59,6 @@ export default {
             const menu = document.querySelectorAll('.el-submenu')
             for (let i = 0; i < menu.length; i++) {
               menu[i].onclick = e => {
-                console.log(33, e.target)
                 // 获取栏目id
                 let id = e.target.getAttribute('id')
                 if (!id) {

src/pages/article/activity.vue

@@ -82,7 +82,7 @@ export default {
         this.routes = [
           {
             name: columnName || data.columnName,
-            path: '/' + path,
+            path: path ? '/' + path : '',
             query: {
               id: id || data.columnId
             }
@@ -172,7 +172,7 @@ export default {
   }
   .meta {
     margin: 10px 0;
-    font-size: 14px;
+    font-size: 16px;
     font-weight: 600;
     color: #333;
   }

src/pages/article/index.vue

@@ -92,7 +92,7 @@ export default {
         this.routes = [
           {
             name: columnName || data.columnName,
-            path: '/' + path,
+            path: path ? '/' + path : '',
             query: {
               id: id || data.columnId
             }
@@ -105,7 +105,7 @@ export default {
           this.$router.back()
         } else {
           if (data.articleTemplate === 25) { // 会议活动
-            this.$router.replace(`/article/activity?articleId=${this.id}&id=${id}&columnName=${columnName}&path=${path}`)
+            this.$router.replace(`/article/activity?articleId=${this.id}&id=${id}&columnName=${columnName || ''}&path=${path || ''}`)
           } else {
             this.form = data
             this.columnId = data.columnId

src/pages/column/index.vue

@@ -115,6 +115,7 @@
 </template>
 
 <script>
+import { mapState } from 'vuex'
 import Setting from '@/setting'
 import Util from '@/libs/util'
 import Breadcrumb from '@/components/breadcrumb'
@@ -151,7 +152,6 @@ export default {
       classifications: [],
       labels: [],
       columns: [],
-      all: null,
       infoColumns: [],
       sameStyle: 1,
       allColumnId: [],
@@ -170,6 +170,11 @@ export default {
       hots: []
     }
   },
+  computed: {
+    ...mapState('content', [
+      'keyword'
+    ])
+  },
   components: {
     Breadcrumb
   },
@@ -183,6 +188,9 @@ export default {
       this.searchTimer = setTimeout(() => {
         this.filter()
       }, 500)
+    },
+    keyword() {
+      this.init()
     }
   },
   mounted() {
@@ -190,8 +198,17 @@ export default {
   },
   methods: {
     init() {
+      // 全局搜索
+      if (this.keyword) {
+        this.form = {
+          classificationId: null,
+          title: this.keyword,
+          convokeType: null
+        }
+      } else {
         this.getLeftColumn()
         this.getInfo()
+      }
         this.getColumn()
         this.getNews()
         this.getLabel()
@@ -316,12 +333,26 @@ export default {
         // 长页栏目直接获取path
         this.$router.push(`/${to.path}?id=${to.id}`).catch(err => {})
       } else if (left && (typeId === 1 || (typeId === 4 && !to.children.length))) {
-        // 常规栏目跳转到column页
+        // 常规栏目，或者没有子级的子级优先栏目，跳转到column页
-        this.$router.push(`/column?id=${to.id + (left && (to.level !== 1 || !this.sameStyle) ? '&column=1' : '')}`).catch(err => {})
+        this.$router.push(`/column?id=${to.id + ((to.level !== 1 || !this.sameStyle) ? '&column=1' : '')}`).catch(err => {})
+      } else if (left && typeId === 4 && to.children.length) {
+        // 子级优先栏目，并且有子级
+        const el = this.$refs.leftColumn
+        if (el) {
+          this.$refs.leftColumn.store.nodesMap[to.id].expanded = !this.$refs.leftColumn.store.nodesMap[to.id].expanded // 
+          this.getArticle([to.children[0].id])
+        }
       }
     },
     // 查询文章列表
     getArticle(columnIds) {
+      // 全局搜索只需要传关键字和站点id
+      if (this.keyword) {
+        this.loaded = true
+        this.page = 1
+        columnIds = []
+        this.labelId = []
+      }
       const labelName = []
       // 获取标签名称
       this.labels.map(e => {
@@ -329,13 +360,14 @@ export default {
       })
       this.$post(this.api.newlyPublishedArticles, {
         siteId: this.$route.query.siteId || this.site,
-        columnIds: columnIds.length ? columnIds : [this.id],
+        columnIds,
         pageNum: this.page,
         pageSize: this.pageSize,
         labelName,
         ...this.form
       }).then(({ data }) => {
         this.articles = Util.removeTag(data.records)
+        console.log("🚀 ~ file: index.vue:369 ~ getArticle ~ this.articles", this.articles)
         this.total = +data.total
         // 如果栏目那勾选了“只有一篇文章时，以详情方式展示”，并且只有一篇文章，则跳转到详情页
         // this.total == 1 && this.info.showWithDetails && this.$router.push(`/article?articleId=${this.articles[0].id}&id=${this.articles[0].columnId}`)
@@ -351,9 +383,9 @@ export default {
     // 筛选
     filter() {
       this.page = 1
-      this.isFilter = !!(this.form.classificationId || this.form.title || this.form.convokeType || this.lableId.length)
+      this.isFilter = !!(this.form.classificationId || this.form.title || this.form.convokeType || this.lableId.length) // 是否在筛选
       let id = []
-      if (this.isFilter || this.all) {
+      if (this.isFilter) {
         this.getIds(this.columns, id)
       } else if (this.columns.length) {
         id = [this.columns[0].id]
@@ -364,7 +396,7 @@ export default {
       this.page = val
       this.isFilter = !!(this.form.classificationId || this.form.title || this.form.convokeType || this.lableId.length)
       let id = []
-      if (this.isFilter || this.all) {
+      if (this.isFilter) {
         this.getIds(this.columns, id)
       } else if (this.columns.length) {
         id = [this.$refs.leftColumn.getCurrentKey()]

src/pages/edu/index.vue

@@ -98,6 +98,7 @@ export default {
       text-align: right;
       .texts {
         left: 0;
+        text-align: left;
       }
     }
   }

src/pages/news/index.vue

@@ -118,15 +118,15 @@
                 <div class="texts">
                   <h6>{{ item.title }}</h6>
                   <p v-if="item.keynoteSpeaker" class="text">
-                    <i class="el-icon-user icon"></i>
+                    <img class="icon" src="@/assets/images/mine.png" alt="">
                     {{ item.keynoteSpeaker }}
                   </p>
                   <p v-if="item.activityStartTime" class="text">
-                    <i class="el-icon-alarm-clock icon"></i>
+                    <img class="icon" src="@/assets/images/time.png" alt="">
                     Time: {{ item.activityStartTime + ' ~ ' + item.activityEndTime }}
                   </p>
                   <p v-if="item.onlineLocation" class="text">
-                    <i class="el-icon-position icon"></i>
+                    <img class="icon" src="@/assets/images/online.png" alt="">
                     Address: {{ item.onlineLocation }}
                   </p>
                 </div>
@@ -476,14 +476,16 @@ export default {
       margin-right: 60px;
     }
     h6 {
+      margin-bottom: 10px;
       font-size: 20px;
       color: #272727;
     }
     .des {
-      margin-top: 15px;
       font-size: 14px;
       color: #666;
       line-height: 24px;
+      text-shadow: 0px 0px 30px rgba(48,48,48,0.08);
+      -webkit-line-clamp: 2;
     }
     .arrow {
       width: 36px;
@@ -544,6 +546,9 @@ export default {
       background-color: #fff;
       cursor: pointer;
       transition: .3s;
+      &:last-child {
+        margin-bottom: 0;
+      }
       &:hover {
         transform: translateX(20px);
       }
@@ -564,9 +569,7 @@ export default {
       margin: 10px 0;
     }
     .icon {
-      width: 15px;
       margin-right: 5px;
-      color: #1583FF;
     }
   }
 }

src/pages/newsPress/index.vue

@@ -135,11 +135,15 @@ export default {
   }
   h6 {
     font-size: 40px;
+    font-family: SFProDisplay-Bold, SFProDisplay;
+    font-weight: bold;
     color: #3C3C3C;
   }
   .sub {
     margin: 20px 0;
     font-size: 24px;
+    font-weight: 600;
+    font-family: PingFangSC-Semibold, PingFang SC;
     color: #1C1C1C;
     line-height: 33px;
   }

src/pages/newsProcurement/index.vue

@@ -131,11 +131,15 @@ export default {
   }
   h6 {
     font-size: 40px;
+    font-family: SFProDisplay-Bold, SFProDisplay;
+    font-weight: bold;
     color: #3C3C3C;
   }
   .sub {
     margin: 20px 0;
     font-size: 24px;
+    font-weight: 600;
+    font-family: PingFangSC-Semibold, PingFang SC;
     color: #1C1C1C;
     line-height: 33px;
   }

src/pages/research/index.vue

@@ -187,7 +187,7 @@ export default {
     line-height: 40px;
     text-align: center;
     color: #272727;
-    background-color: #F5F5F5;
+    background-color: #fff;
   }
 }
 .news-inner {

src/store/modules/content.js

@@ -7,6 +7,7 @@
   namespaced: true,
   state: {
     site: 1,
+    keyword: ''
   },
   getters: {
     site: state => {
@@ -17,6 +18,9 @@
     setSite: (state, site) => {
       state.site = +site
     },
+    setKeyword: (state, keyword) => {
+      state.keyword = keyword
+    },
   },
   actions: {
     

src/styles/common.scss

@@ -9,6 +9,10 @@
   font-family: PingFangSC-Medium;
   src: url('font/PingFangSC-Medium.otf');
 }
+@font-face {
+  font-family: PingFangSC-Semibold;
+  src: url('font/PingFangTC-Semibold.ttf');
+}
 @font-face {
   font-family: SFProDisplay-Bold;
   src: url('font/SF-Pro-Display-Bold.otf');