fix

src/mixins/page/index.js

@@ -3,6 +3,7 @@ import Util from '@/libs/util'
 export default {
   data() {
     return {
+      site: this.$store.state.content.site,
       id: this.$route.query.id,
       preview: this.$route.query.preview,
       modules: [],
@@ -13,18 +14,37 @@ export default {
     this.getInfo()
   },
   methods: {
-    // banner打开链接
+    // 打开链接
     openLink(item) {
       const { link } = item
+      if (link.linkName === '无') return false
+      console.log("🚀 ~ file: index.js ~ line 19 ~ openLink ~ link", link)
       let href = link.linkAddress
-      if (link.connectionType !== 2) {
-        
+      const type = link.connectionType
+      if (type === 1) {
+        if (link.articleId) { // 文章
+          href = '/article?id=' + link.articleId
+        } else { // 栏目
+          href = '/column?id=' + link.columnId[link.columnId.length - 1]
+        }
+        href = this.$router.resolve(href + '&siteId=' + (this.$route.query.siteId || this.site)).href
+      } else if (type === 3) {
+        if (link.otherArticleId) { // 文章
+          href = '/article?id=' + link.otherArticleId
+        } else { // 栏目
+          href = '/column?id=' + link.otherColumnId[link.otherColumnId.length - 1]
+        }
+        href = this.$router.resolve(href + '&siteId=' + link.site).href
       }
       if (link.isOpen) {
         window.open(href)
       } else {
         location.href = href
       }
+    },
+    // 跳转文章页面
+    toArtice(item) {
+      this.$router.push(`/article?id=${item.id}&site=${this.$route.query.siteId || this.site}`)
     }
   }
 };

src/pages/about/index.vue

@@ -3,7 +3,7 @@
     <el-carousel height="480px" :interval="6000" :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'">
       <template v-for="(item, i) in modules[0].list">
         <el-carousel-item v-if="item.pic && item.isEnable" :key="i">
-          <div class="banner-item" @click="openLink(item)">
+          <div :class="['banner-item', {'cursor-pointer': item.link.linkName !== '无'}]" @click="openLink(item)">
             <img :src="item.pic" alt="">
             <p class="banner-name">ABOUT</p>
           </div>
@@ -12,7 +12,7 @@
     </el-carousel>
     
     <div class="block history gray">
-      <div class="inner cursor-pointer" @click="openLink(modules[1].form)">
+      <div :class="['inner', {'cursor-pointer': modules[1].form.link.linkName !== '无'}]" @click="openLink(modules[1].form)">
         <h2 style="margin-left: 57px">{{ modules[1].form.title }}</h2>
         <div class="texts">
           <div class="left">
@@ -30,19 +30,19 @@
         <h2 class="b-title">{{ modules[2].form.title }}</h2>
         <p class="intro">{{ modules[2].form.des }}</p>
         <ul class="card">
-          <li class="item1" @click="openLink(modules[3].form)">
+          <li :class="['item1', {'cursor-pointer': modules[3].form.link.linkName !== '无'}]" @click="openLink(modules[3].form)">
             <h6>{{ modules[3].form.title }}</h6>
             <div class="des" v-html="modules[3].form.des"></div>
           </li>
-          <li class="item2" @click="openLink(modules[4].form)">
+          <li :class="['item2', {'cursor-pointer': modules[4].form.link.linkName !== '无'}]" @click="openLink(modules[4].form)">
             <h6>{{ modules[4].form.title }}</h6>
             <div class="des" v-html="modules[4].form.des"></div>
           </li>
-          <li class="item3" @click="openLink(modules[5].form)">
+          <li :class="['item3', {'cursor-pointer': modules[5].form.link.linkName !== '无'}]" @click="openLink(modules[5].form)">
             <h6>{{ modules[5].form.title }}</h6>
             <div class="des" v-html="modules[5].form.des"></div>
           </li>
-          <li class="item4" @click="openLink(modules[6].form)">
+          <li :class="['item4', {'cursor-pointer': modules[6].form.link.linkName !== '无'}]" @click="openLink(modules[6].form)">
             <h6>{{ modules[6].form.title }}</h6>
             <div class="des" v-html="modules[6].form.des"></div>
           </li>
@@ -84,7 +84,7 @@
     </div>
 
     <div class="plan">
-      <div class="inner cursor-pointer" @click="openLink(modules[14].form)">
+      <div :class="['inner', {'cursor-pointer': modules[14].form.link.linkName !== '无'}]" @click="openLink(modules[14].form)">
         <img class="pic" :src="modules[14].form.pic" alt="">
         <div class="texts">
           <h6>{{ modules[14].form.title }}</h6>
@@ -106,7 +106,7 @@
                 <p class="sub">{{ item.title }}</p>
                 <h6>{{ item.subTitle }}</h6>
                 <p class="des">{{ item.des }}</p>
-                <img class="arrow" src="@/assets/images/arrow.png" alt="" @click="openLink(item)">
+                <img :class="{'arrow': item.link.linkName !== '无'}" src="@/assets/images/arrow.png" alt="" @click="openLink(item)">
               </div>
             </li>
           </template>
@@ -119,17 +119,17 @@
         <h2 class="b-title">{{ modules[17].form.title }}</h2>
         <p class="intro">{{ modules[17].form.des }}</p>
         <ul class="list">
-          <li @click="openLink(modules[18].form)">
+          <li :class="{'cursor-pointer': modules[18].form.link.linkName !== '无'}" @click="openLink(modules[18].form)">
             <img class="pic" :src="modules[18].form.pic" alt="">
             <h6>{{ modules[18].form.title }}</h6>
             <p class="des">{{ modules[18].form.des }}</p>
           </li>
-          <li @click="openLink(modules[19].form)">
+          <li :class="{'cursor-pointer': modules[19].form.link.linkName !== '无'}" @click="openLink(modules[19].form)">
             <img class="pic" :src="modules[19].form.pic" alt="">
             <h6>{{ modules[19].form.title }}</h6>
             <p class="des">{{ modules[19].form.des }}</p>
           </li>
-          <li @click="openLink(modules[20].form)">
+          <li :class="{'cursor-pointer': modules[20].form.link.linkName !== '无'}" @click="openLink(modules[20].form)">
             <img class="pic" :src="modules[20].form.pic" alt="">
             <h6>{{ modules[20].form.title }}</h6>
             <p class="des">{{ modules[20].form.des }}</p>
@@ -142,7 +142,7 @@
       <div class="inner">
         <h2 class="b-title">{{ modules[21].form.title }}</h2>
         <p class="intro">{{ modules[21].form.des }}</p>
-        <div class="staff" @click="openLink(modules[22].form)">
+        <div :class="['staff', {'cursor-pointer': modules[22].form.link.linkName !== '无'}]" @click="openLink(modules[22].form)">
           <div class="left">
             <h6>{{ modules[22].form.title }}</h6>
             <div class="des">{{ modules[22].form.des }}</div>
@@ -229,7 +229,6 @@ export default {
     padding: 70px 67px 20px;
     margin-bottom: 28px;
     color: #fff;
-    cursor: pointer;
     &:nth-child(odd) {
       margin-right: 28px;
     }
@@ -327,7 +326,6 @@ export default {
     margin-right: 28px;
     text-align: center;
     background-color: #F5F5F5;
-    cursor: pointer;
     &:last-child {
       margin-right: 0;
     }
@@ -350,7 +348,6 @@ export default {
   display: flex;
   justify-content: space-between;
   background: #F8F8F8;
-  cursor: pointer;
   .left {
     width: 658px;
     margin: 50px 0 0 46px;

src/pages/application/index.vue

@@ -3,7 +3,7 @@
     <el-carousel height="480px" :interval="6000" :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'">
       <template v-for="(item, i) in modules[0].list">
         <el-carousel-item v-if="item.pic && item.isEnable" :key="i">
-          <div class="banner-item" @click="openLink(item)">
+          <div :class="['banner-item', {'cursor-pointer': item.link.linkName !== '无'}]" @click="openLink(item)">
             <img :src="item.pic" alt="">
             <p class="banner-name">APPLICATION</p>
           </div>
@@ -19,7 +19,7 @@
             <h2>{{ modules[1].form.subTitle }}</h2>
             <div class="line"></div>
             <div class="des">{{ modules[1].form.des }}</div>
-            <img src="@/assets/images/arrow.png" alt="">
+            <img :class="{'arrow': modules[1].form.link.linkName !== '无'}" src="@/assets/images/arrow.png" alt="" @click="openLink(modules[1].form)">
           </div>
           <img class="bg" width="562" height="506" :src="modules[1].form.pic" alt="">
         </div>
@@ -31,7 +31,7 @@
         <h2 class="b-title">{{ modules[2].form.title }}</h2>
         <p class="intro">{{ modules[2].form.des }}</p>
         <ul class="app">
-          <li v-for="(item, i) in modules[3].list" :key="i">
+          <li v-for="(item, i) in modules[3].list" :key="i" :class="{'cursor-pointer': item.link.linkName !== '无'}" @click="openLink(item)">
             <img class="bg" :src="require('@/assets/images/application/app' + (i + 1) + '.png')" alt="">
             <img class="icon" :src="require('@/assets/images/application/app' + (i + 1) + '-1.png')" alt="">
             <p class="text">{{ item.title }}</p>
@@ -45,7 +45,7 @@
         <h2 class="b-title">{{ modules[4].form.title }}</h2>
         <p class="intro">{{ modules[4].form.des }}</p>
         <ul class="group">
-          <li v-for="(item, i) in modules[5].list" :key="i">
+          <li v-for="(item, i) in modules[5].list" :key="i" :class="{'cursor-pointer': item.link.linkName !== '无'}" @click="openLink(item)">
             <img :src="item.pic" alt="">
             <p class="text">{{ item.title }}</p>
           </li>
@@ -58,7 +58,7 @@
         <h2 class="b-title">{{ modules[6].form.title }}</h2>
         <p class="intro">{{ modules[6].form.des }}</p>
         <ul class="news">
-          <li v-for="(item, i) in articles" :key="i">
+          <li v-for="(item, i) in articles" :key="i" @click="toArtice(item)">
             <img src="@/assets/images/channel1.png" alt="">
             <div class="texts">
               <h6>{{ item.columnName }}</h6>
@@ -192,12 +192,17 @@ export default {
   display: flex;
   flex-wrap: wrap;
   li {
+    position: relative;
     width: 448px;
     margin: 0 28px 39px 0;
     &:nth-child(3n) {
       margin-right: 0;
     }
   }
+  img {
+    width: 100%;
+    height: 353px;
+  }
   .text {
     font-size: 30px;
     font-family: SFProDisplay-Bold, SFProDisplay;
@@ -205,13 +210,14 @@ export default {
     line-height: 143px;
     color: #272727;
     text-align: center;
-    background-color: #F5F5F5;
+    background-color: #fff;
   }
 }
 .news-block {
   background: url(../../assets/images/info-bg.png) 0 0/100% 100% no-repeat;
 }
 .news {
+  position: relative;
   display: flex;
   flex-wrap: wrap;
   li {
@@ -220,6 +226,7 @@ export default {
     padding: 34px;
     margin-bottom: 28px;
     background-color: #fff;
+    cursor: pointer;
     &:nth-child(odd) {
       margin-right: 28px;
     }

src/pages/article/index.vue

@@ -9,6 +9,7 @@
         <div class="left">
           <h2>{{ form.title }}</h2>
           <div class="meta">{{ form.createTime }} | {{ form.source && form.source + '|' }} {{ form.author && form.author + ' | ' }} {{ form.totalBrowsing }} 浏览</div>
+          <div class="meta">{{ form.edit && '编辑：' + form.edit }} {{ form.audit && ' | 审核：' + form.audit }} {{ form.label && ' | 标签：' + form.label }}</div>
           <p class="brief">{{ form.summary }}</p>
           <div v-html="form.mainBody"></div>
           <div v-if="files.length" class="annex">
@@ -88,7 +89,7 @@ export default {
   },
   methods: {
     // 获取文章详情
-    getInfo() {
+    getInfo() { 
       this.$post(`${this.api.findArticle}?id=${this.id}`).then(({ data }) => {
         this.form = data
         this.columnId = data.columnId

src/pages/careers/index.vue

@@ -3,7 +3,7 @@
     <el-carousel height="480px" :interval="6000" :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'">
       <template v-for="(item, i) in modules[0].list">
         <el-carousel-item v-if="item.pic && item.isEnable" :key="i">
-          <div class="banner-item" @click="openLink(item)">
+          <div :class="['banner-item', {'cursor-pointer': item.link.linkName !== '无'}]" @click="openLink(item)">
             <img :src="item.pic" alt="">
             <p class="banner-name">CAREERS</p>
           </div>
@@ -21,7 +21,7 @@
               <p class="text">{{ modules[1].form.des }}</p>
             </div>
             <div class="arrow">
-              <img src="@/assets/images/arrow-white.png" alt="" @click="openLink(modules[1].form)">
+              <img src="@/assets/images/arrow-white.png" alt="" :class="{'cursor-pointer': modules[1].form.link.linkName !== '无'}" @click="openLink(modules[1].form)">
             </div>
           </li>
           <li>
@@ -31,7 +31,7 @@
               <p class="text">{{ modules[2].form.des }}</p>
             </div>
             <div class="arrow">
-              <img src="@/assets/images/arrow-white.png" alt="" @click="openLink(modules[2].form)">
+              <img src="@/assets/images/arrow-white.png" alt="" :class="{'cursor-pointer': modules[2].form.link.linkName !== '无'}" @click="openLink(modules[2].form)">
             </div>
           </li>
           <li>
@@ -41,7 +41,7 @@
               <p class="text">{{ modules[3].form.des }}</p>
             </div>
             <div class="arrow">
-              <img src="@/assets/images/arrow-white.png" alt="" @click="openLink(modules[3].form)">
+              <img src="@/assets/images/arrow-white.png" alt="" :class="{'cursor-pointer': modules[3].form.link.linkName !== '无'}" @click="openLink(modules[3].form)">
             </div>
           </li>
           <li>
@@ -51,7 +51,7 @@
               <p class="text">{{ modules[4].form.des }}</p>
             </div>
             <div class="arrow">
-              <img src="@/assets/images/arrow-white.png" alt="" @click="openLink(modules[4].form)">
+              <img src="@/assets/images/arrow-white.png" alt="" :class="{'cursor-pointer': modules[4].form.link.linkName !== '无'}" @click="openLink(modules[4].form)">
             </div>
           </li>
         </ul>
@@ -64,7 +64,7 @@
         <p class="intro">{{ modules[5].form.des }}</p>
         <ul class="people">
           <template v-for="(item, i) in modules[6].list">
-            <li v-if="item.isEnable" :key="i">
+            <li v-if="item.isEnable" :key="i" :class="{'cursor-pointer': item.link.linkName !== '无'}" @click="openLink(item)">
               <img class="comma" src="@/assets/images/comma.png" alt="">
               <div class="left">
                 <h6>{{ item.title }}</h6>
@@ -84,7 +84,7 @@
             <h6>{{ item.title }}</h6>
             <div class="sub">{{ item.subTitle }}</div>
             <div class="des">{{ item.des }}</div>
-            <img class="arrow" src="@/assets/images/arrow-white.png" alt="" @click="openLink(item)">
+            <img src="@/assets/images/arrow-white.png" alt="" :class="{'arrow': item.link.linkName !== '无'}" @click="openLink(item)">
           </div>
           <img class="pic" :src="item.pic" alt="">
         </li>
@@ -173,7 +173,7 @@ export default {
       background: #36404A;
       opacity: 0;
       transition: .3s;
-      cursor: pointer;
+      cursor: default;
     }
   }
 }

src/pages/column/index.vue

@@ -25,7 +25,7 @@
                 <el-option
                   v-for="item in labels"
                   :key="item.id"
-                  :label="item.name"
+                  :label="item.labelName"
                   :value="item.id">
                 </el-option>
               </el-select>

src/pages/edu/index.vue

@@ -3,7 +3,7 @@
     <el-carousel height="480px" :interval="6000" :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'">
       <template v-for="(item, i) in modules[0].list">
         <el-carousel-item v-if="item.pic && item.isEnable" :key="i">
-          <div class="banner-item" @click="openLink(item)">
+          <div :class="['banner-item', {'cursor-pointer': item.link.linkName !== '无'}]" @click="openLink(item)">
             <img :src="item.pic" alt="">
             <p class="banner-name">NEWS & EVENTS</p>
           </div>
@@ -15,7 +15,7 @@
       <div class="inner">
         <h2 class="b-title">{{ modules[1].form.title }}</h2>
         <p class="intro">{{ modules[1].form.des }}</p>
-        <img :class="{'cursor-pointer': modules[1].form.link}" width="100%" height="536" :src="modules[1].form.pic" alt="" @click="openLink(modules[1].form)">
+        <img :class="{'cursor-pointer': modules[1].form.link.linkName !== '无'}" width="100%" height="536" :src="modules[1].form.pic" alt="" @click="openLink(modules[1].form)">
       </div>
     </div>
     
@@ -23,7 +23,7 @@
       <div class="inner">
         <h2 class="b-title">{{ modules[2].form.title }}</h2>
         <p class="intro">{{ modules[2].form.des }}</p>
-        <img :class="{'cursor-pointer': modules[2].form.link}" width="100%" height="536" :src="modules[2].form.pic" alt="" @click="openLink(modules[2].form)">
+        <img :class="{'cursor-pointer': modules[2].form.link.linkName !== '无'}" width="100%" height="536" :src="modules[2].form.pic" alt="" @click="openLink(modules[2].form)">
       </div>
     </div>
     
@@ -34,7 +34,7 @@
         <ul class="list">
           <template v-for="(item, i) in modules[4].list">
             <li v-if="item.isEnable" :key="i">
-              <img class="pic" :src="item.pic" alt="" @click="openLink(item)">
+              <img class="pic" :src="item.pic" alt="" :class="{'cursor-pointer': item.link.linkName !== '无'}" @click="openLink(item)">
               <div class="texts">
                 <h6>{{ item.title }}</h6>
                 <p class="sub">{{ item.subTitle }}</p>
@@ -96,7 +96,6 @@ export default {
   .pic {
     width: 650px;
     height: 730px;
-    cursor: pointer;
   }
   .texts {
     position: absolute;

src/pages/home/index.vue

@@ -3,7 +3,7 @@
     <el-carousel height="959px" :interval="6000" :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'">
       <template v-for="(item, i) in modules[0].list">
         <el-carousel-item v-if="item.pic && item.isEnable" :key="i">
-          <img class="cursor-pointer" width="100%" height="959" :src="item.pic" alt="" @click="openLink(item)">
+          <img :class="[{'cursor-pointer': item.link.linkName !== '无'}]" width="100%" height="959" :src="item.pic" alt="" @click="openLink(item)">
         </el-carousel-item>
       </template>
     </el-carousel>
@@ -18,7 +18,7 @@
             <div class="texts">
               <h6>{{ modules[2].form.title }}</h6>
               <p class="des">{{ modules[2].form.des }}</p>
-              <img class="arrow" src="@/assets/images/arrow.png" alt="" @click="openLink(modules[2].form)">
+              <img src="@/assets/images/arrow.png" alt="" :class="{'arrow': modules[2].form.link.linkName !== '无'}" @click="openLink(modules[2].form)">
             </div>
           </li>
           <li>
@@ -26,7 +26,7 @@
             <div class="texts">
               <h6>{{ modules[3].form.title }}</h6>
               <p class="des">{{ modules[3].form.des }}</p>
-              <img class="arrow" src="@/assets/images/arrow.png" alt="" @click="openLink(modules[3].form)">
+              <img src="@/assets/images/arrow.png" alt="" :class="{'arrow': modules[3].form.link.linkName !== '无'}" @click="openLink(modules[3].form)">
             </div>
           </li>
         </ul>
@@ -38,7 +38,7 @@
         <h2 class="b-title">{{ modules[4].form.title }}</h2>
         <p class="intro">{{ modules[4].form.des }}</p>
         <ul class="news">
-          <li v-for="(item, i) in articles" :key="i">
+          <li v-for="(item, i) in articles" :key="i" @click="toArtice(item)">
             <img src="@/assets/images/channel1.png" alt="">
             <div class="texts">
               <h6>{{ item.columnName }}</h6>
@@ -61,7 +61,7 @@
               <div class="texts">
                 <h6>{{ item.title }}</h6>
                 <p class="des">{{ item.des }}</p>
-                <img class="arrow" src="@/assets/images/arrow.png" alt="" @click="openLink(item)">
+                <img src="@/assets/images/arrow.png" alt="" :class="{'arrow': item.link.linkName !== '无'}" @click="openLink(item)">
               </div>
             </li>
           </template>
@@ -69,7 +69,7 @@
       </div>
     </div>
 
-    <div class="about" @click="openLink(modules[8].form)">
+    <div class="about" :class="{'cursor-pointer': modules[8].form.link.linkName !== '无'}" @click="openLink(modules[8].form)">
       <div class="inner">
         <img src="@/assets/images/about.png" alt="">
         <div class="line"></div>
@@ -199,6 +199,7 @@ export default {
     padding: 34px;
     margin-bottom: 28px;
     background-color: #fff;
+    cursor: pointer;
     &:nth-child(odd) {
       margin-right: 28px;
     }
@@ -257,6 +258,9 @@ export default {
 .glance {
   padding-bottom: 50px;
   font-size: 45px;
+  font-weight: bold;
+  font-family: SFProDisplay-Bold, SFProDisplay;
+  text-align: center;
   border-bottom: 1px solid #DEDEDE;
 }
 .stat {
@@ -282,7 +286,6 @@ export default {
 .about {
   padding: 77px 0 198px;
   background: url(../../assets/images/about-bg.png) 0 0/100% 100% no-repeat;
-  cursor: pointer;
   .line {
     display: flex;
     align-items: center;

src/pages/news/index.vue

@@ -3,7 +3,7 @@
     <el-carousel height="480px" :interval="6000" :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'">
       <template v-for="(item, i) in modules[0].list">
         <el-carousel-item v-if="item.pic && item.isEnable" :key="i">
-          <div class="banner-item" @click="openLink(item)">
+          <div :class="['banner-item', {'cursor-pointer': item.link.linkName !== '无'}]" @click="openLink(item)">
             <img :src="item.pic" alt="">
             <p class="banner-name">NEWS & EVENTS</p>
           </div>
@@ -34,7 +34,7 @@
               <div class="texts">
                 <p class="meta">{{ item.createTime }} {{ item.author && ' | ' + item.author }}</p>
                 <div class="des">{{ item.title }}</div>
-                <img class="arrow" src="@/assets/images/arrow.png" alt="">
+                <img class="arrow" src="@/assets/images/arrow.png" alt="" @click="toArtice(item)">
               </div>
             </li>
           </template>
@@ -57,11 +57,11 @@
           </div>
           <div class="right">
             <ul class="show-card">
-              <li v-if="articles[1]">
+              <li v-if="articles[1]" @click="toArtice(articles[1])">
                 <img class="pic" :src="articles[1].titleImg" alt="">
                 <div class="des">{{ articles[1].title }}</div>
               </li>
-              <li v-if="articles[2]">
+              <li v-if="articles[2]" @click="toArtice(articles[2])">
                 <img class="pic" :src="articles[2].titleImg" alt="">
                 <div class="des">{{ articles[2].title }}</div>
               </li>
@@ -74,7 +74,7 @@
                     <h6>{{ item.title }}</h6>
                     <div class="des" v-html="item.mainBody"></div>
                   </div>
-                  <img class="arrow" src="@/assets/images/arrow.png" alt="">
+                  <img class="arrow" src="@/assets/images/arrow.png" alt="" @click="toArtice(item)">
                 </li>
               </template>
             </ul>
@@ -103,7 +103,7 @@
           </div>
           <ul class="card-list">
             <template v-for="(item, i) in articles1">
-              <li v-if="i" :key="i">
+              <li v-if="i" :key="i" @click="toArtice(item)">
                 <img class="pic" :src="item.titleImg" alt="">
                 <div class="texts">
                   <h6>{{ item.title }}</h6>
@@ -236,6 +236,7 @@ export default {
 }
 .banner {
   display: flex;
+  cursor: pointer;
   .pic {
     width: 700px;
     height: 380px;
@@ -360,6 +361,7 @@ export default {
       align-items: center;
       padding-right: 124px;
       margin-bottom: 38px;
+      cursor: pointer;
       &:last-child {
         margin-bottom: 0;
       }
@@ -440,6 +442,7 @@ export default {
       padding: 24px;
       margin-bottom: 13px;
       background-color: #fff;
+      cursor: pointer;
     }
     .pic {
       width: 188px;

src/pages/newsPress/index.vue

@@ -3,7 +3,7 @@
     <el-carousel height="480px" :interval="6000" :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'">
       <template v-for="(item, i) in modules[0].list">
         <el-carousel-item v-if="item.pic && item.isEnable" :key="i">
-          <div class="banner-item" @click="openLink(item)">
+          <div :class="['banner-item', {'cursor-pointer': item.link.linkName !== '无'}]" @click="openLink(item)">
             <img :src="item.pic" alt="">
             <p class="banner-name">NEWS & EVENTS</p>
           </div>
@@ -21,7 +21,7 @@
                 <h6>{{ item.title }}</h6>
                 <p class="sub">{{ item.subTitle }}</p>
                 <div class="des">{{ item.des }}</div>
-                <img class="arrow" src="@/assets/images/arrow.png" alt="" @click="openLink(item)">
+                <img src="@/assets/images/arrow.png" alt="" :class="{'arrow': item.link.linkName !== '无'}" @click="openLink(item)">
               </div>
             </li>
           </template>

src/pages/newsProcurement/index.vue

@@ -3,7 +3,7 @@
     <el-carousel height="480px" :interval="6000" :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'">
       <template v-for="(item, i) in modules[0].list">
         <el-carousel-item v-if="item.pic && item.isEnable" :key="i">
-          <div class="banner-item" @click="openLink(item)">
+          <div :class="['banner-item', {'cursor-pointer': item.link.linkName !== '无'}]" @click="openLink(item)">
             <img :src="item.pic" alt="">
             <p class="banner-name">NEWS & EVENTS</p>
           </div>
@@ -21,7 +21,7 @@
                 <h6>{{ item.title }}</h6>
                 <p class="sub">{{ item.subTitle }}</p>
                 <div class="des">{{ item.des }}</div>
-                <img class="arrow" src="@/assets/images/arrow.png" alt="" @click="openLink(item)">
+                <img src="@/assets/images/arrow.png" alt="" :class="{'arrow': item.link.linkName !== '无'}" @click="openLink(item)">
               </div>
             </li>
           </template>

src/pages/research/index.vue

@@ -3,7 +3,7 @@
     <el-carousel height="480px" :interval="6000" :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'">
       <template v-for="(item, i) in modules[0].list">
         <el-carousel-item v-if="item.pic && item.isEnable" :key="i">
-          <div class="banner-item" @click="openLink(item)">
+          <div :class="['banner-item', {'cursor-pointer': item.link.linkName !== '无'}]" @click="openLink(item)">
             <img :src="item.pic" alt="">
             <p class="banner-name">RESEARCH</p>
           </div>
@@ -15,7 +15,7 @@
       <h2 class="b-title">{{ modules[1].form.title }}</h2>
       <p class="intro">{{ modules[1].form.des }}</p>
       <ul class="area">
-        <li v-for="(item, i) in modules[2].list" :key="i">
+        <li v-for="(item, i) in modules[2].list" :key="i" :class="{'cursor-pointer': item.link.linkName !== '无'}" @click="openLink(item)">
           <img :src="item.pic" alt="" class="pic">
           <div class="texts">
             <img :src="require('@/assets/images/research/res' + (i + 1) + '-1.png')" alt="" class="icon">
@@ -31,7 +31,7 @@
         <h2 class="b-title">{{ modules[3].form.title }}</h2>
         <p class="intro">{{ modules[3].form.des }}</p>
         <ul class="group">
-          <li v-for="(item, i) in modules[4].list" :key="i">
+          <li v-for="(item, i) in modules[4].list" :key="i" :class="{'cursor-pointer': item.link.linkName !== '无'}" @click="openLink(item)">
             <img :src="item.pic" alt="">
             <p class="text">{{ item.title }}</p>
           </li>
@@ -44,7 +44,7 @@
         <h2 class="b-title">{{ modules[5].form.title }}</h2>
         <p class="intro">{{ modules[5].form.des }}</p>
         <ul class="news">
-          <li v-for="(item, i) in modules[6].list" :key="i">
+          <li v-for="(item, i) in modules[6].list" :key="i" :class="{'cursor-pointer': item.link.linkName !== '无'}" @click="openLink(item)">
             <img :src="item.pic" alt="">
             <div class="texts">
               <h6>{{ item.title }}</h6>

src/styles/common.scss

@@ -5,6 +5,10 @@
   font-family: PingFang;
   src: url('font/PingFang-Regular.otf');
 }
+@font-face {
+  font-family: SFProDisplay-Bold;
+  src: url('font/SF-Pro-Display-Bold.otf');
+}
 
 [v-cloak] {
   display: none;

src/styles/page/page.scss

@@ -5,7 +5,10 @@
     position: relative;
     margin-bottom: 50px;
     font-size: 50px;
-    line-height: 59px;
+    font-family: SFProDisplay-Bold, SFProDisplay;
+    font-weight: bold;
+    color: #333333;
+    line-height: 60px;
     text-align: center;
     color: #1F1F1F;
     &:after {
@@ -39,7 +42,6 @@
   position: relative;
   width: 100%;
   height: 100%;
-  cursor: pointer;
   img {
     width: 100%;
     height: 100%;