From 9c7fd1b69c13855d8cce3fce5d6d1bb918bd4ea4 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 13 Jan 2023 17:58:00 +0800
Subject: [PATCH] fix

---
 src/mixins/page/index.js            |  4 ++++
 src/pages/about/index.vue           | 26 +++++++++++++-------------
 src/pages/application/index.vue     |  8 ++++----
 src/pages/careers/index.vue         | 14 +++++++-------
 src/pages/edu/index.vue             | 11 +++++++----
 src/pages/exp/index.vue             |  2 +-
 src/pages/home/index.vue            | 10 +++++-----
 src/pages/news/index.vue            |  6 +++---
 src/pages/newsPress/index.vue       |  6 +++---
 src/pages/newsProcurement/index.vue |  6 +++---
 src/pages/research/index.vue        |  8 ++++----
 src/pages/science/index.vue         |  8 ++++----
 src/pages/sfel/index.vue            |  2 +-
 src/pages/survey/index.vue          |  2 +-
 src/pages/talent/index.vue          |  6 +++---
 src/pages/userSharing/index.vue     |  2 +-
 16 files changed, 64 insertions(+), 57 deletions(-)

diff --git a/src/mixins/page/index.js b/src/mixins/page/index.js
index a8c7099..a326f28 100644
--- a/src/mixins/page/index.js
+++ b/src/mixins/page/index.js
@@ -94,6 +94,10 @@ export default {
     // 关联栏目的查看全部跳转
     toAll(form) {
       this.$router.push(`/column?id=${form.column[form.column.length - 1]}&siteId=${form.site}`)
+    },
+    // 判断是否有添加链接
+    isLink(linkName) {
+      return linkName !== '无' && linkName !== ''
     }
   }
 };
\ No newline at end of file
diff --git a/src/pages/about/index.vue b/src/pages/about/index.vue
index cb30a8c..d13636c 100644
--- a/src/pages/about/index.vue
+++ b/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', {'cursor-pointer': item.link.linkName !== '无'}]" @click="openLink(item)">
+          <div :class="['banner-item', {'cursor-pointer': isLink(item.link.linkName)}]" @click="openLink(item)">
             <img :src="item.pic" alt="">
             <p class="banner-name">{{ item.title }}</p>
           </div>
@@ -12,7 +12,7 @@
     </el-carousel>
     
     <div class="block history gray">
-      <div :class="['inner', {'cursor-pointer': modules[1].form.link.linkName !== '无'}]" @click="openLink(modules[1].form)">
+      <div :class="['inner', {'cursor-pointer': isLink(modules[1].form.link.linkName)}]" @click="openLink(modules[1].form)">
         <h2 class="wow fadeInLeft" style="margin-left: 57px">{{ modules[1].form.title }}</h2>
         <div class="texts wow fadeInDown" data-wow-delay="0.5s">
           <div class="left">
@@ -30,19 +30,19 @@
         <h2 class="b-title wow fadeInUp">{{ modules[2].form.title }}</h2>
         <p class="intro wow fadeInUp" data-wow-delay="0.5s">{{ modules[2].form.des }}</p>
         <ul class="card">
-          <li :class="['item1 wow fadeInLeft', {'cursor-pointer': modules[3].form.link.linkName !== '无'}]" data-wow-delay="0.7s" @click="openLink(modules[3].form)">
+          <li :class="['item1 wow fadeInLeft', {'cursor-pointer': isLink(modules[3].form.link.linkName)}]" data-wow-delay="0.7s" @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 wow fadeInRight', {'cursor-pointer': modules[4].form.link.linkName !== '无'}]" data-wow-delay="0.9s" @click="openLink(modules[4].form)">
+          <li :class="['item2 wow fadeInRight', {'cursor-pointer': isLink(modules[4].form.link.linkName)}]" data-wow-delay="0.9s" @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 wow fadeInLeft', {'cursor-pointer': modules[5].form.link.linkName !== '无'}]" data-wow-delay="1.1s" @click="openLink(modules[5].form)">
+          <li :class="['item3 wow fadeInLeft', {'cursor-pointer': isLink(modules[5].form.link.linkName)}]" data-wow-delay="1.1s" @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 wow fadeInRight', {'cursor-pointer': modules[6].form.link.linkName !== '无'}]" data-wow-delay="1.3s" @click="openLink(modules[6].form)">
+          <li :class="['item4 wow fadeInRight', {'cursor-pointer': isLink(modules[6].form.link.linkName)}]" data-wow-delay="1.3s" @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': modules[14].form.link.linkName !== '无'}]" @click="openLink(modules[14].form)">
+      <div :class="['inner', {'cursor-pointer': isLink(modules[14].form.link.linkName)}]" @click="openLink(modules[14].form)">
         <img class="pic wow fadeInLeft" :src="modules[14].form.pic" alt="">
         <div class="texts wow fadeInRight">
           <h6>{{ modules[14].form.title }}</h6>
@@ -106,7 +106,7 @@
                 <p class="sub">{{ item.subTitle }}</p>
                 <h6>{{ item.title }}</h6>
                 <p class="des">{{ item.des }}</p>
-                <img :class="{'arrow': item.link.linkName !== '无'}" src="@/assets/images/arrow.png" alt="" @click="openLink(item)">
+                <img :class="{'arrow': isLink(item.link.linkName)}" src="@/assets/images/arrow.png" alt="" @click="openLink(item)">
               </div>
             </li>
           </template>
@@ -119,17 +119,17 @@
         <h2 class="b-title wow fadeInUp">{{ modules[17].form.title }}</h2>
         <p class="intro wow fadeInUp" data-wow-delay="0.5s">{{ modules[17].form.des }}</p>
         <ul class="list">
-          <li class="wow fadeInDown" data-wow-delay="0.6s" :class="{'cursor-pointer': modules[18].form.link.linkName !== '无'}" @click="openLink(modules[18].form)">
+          <li class="wow fadeInDown" data-wow-delay="0.6s" :class="{'cursor-pointer': isLink(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 class="wow fadeInDown" data-wow-delay="0.8s" :class="{'cursor-pointer': modules[19].form.link.linkName !== '无'}" @click="openLink(modules[19].form)">
+          <li class="wow fadeInDown" data-wow-delay="0.8s" :class="{'cursor-pointer': isLink(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 class="wow fadeInDown" data-wow-delay="1s" :class="{'cursor-pointer': modules[20].form.link.linkName !== '无'}" @click="openLink(modules[20].form)">
+          <li class="wow fadeInDown" data-wow-delay="1s" :class="{'cursor-pointer': isLink(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 staff-inner">
         <h2 class="b-title wow fadeInUp">{{ modules[21].form.title }}</h2>
         <p class="intro wow fadeInUp" data-wow-delay="0.5s">{{ modules[21].form.des }}</p>
-        <div :class="['staff wow fadeInDown', {'cursor-pointer': modules[22].form.link.linkName !== '无'}]" data-wow-delay="0.7s" @click="openLink(modules[22].form)">
+        <div :class="['staff wow fadeInDown', {'cursor-pointer': isLink(modules[22].form.link.linkName)}]" data-wow-delay="0.7s" @click="openLink(modules[22].form)">
           <div class="left">
             <h6>{{ modules[22].form.title }}</h6>
             <div class="des">{{ modules[22].form.des }}</div>
@@ -180,7 +180,7 @@ export default {
             data :
             data[data.length - 1][data[data.length - 1].state ? 'theEditedJson' : 'jsonBeforeEditing'])
           this.modules = json
-          console.log("🚀 ~ file: index.vue ~ line 180 ~ this.$post ~ json", json[0])
+          console.log("🚀 ~ file: index.vue ~ line 180 ~ this.$post ~ json", json)
         }
       }).catch(err => {})
     },
diff --git a/src/pages/application/index.vue b/src/pages/application/index.vue
index cec52a6..9535a27 100644
--- a/src/pages/application/index.vue
+++ b/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', {'cursor-pointer': item.link.linkName !== '无'}]" @click="openLink(item)">
+          <div :class="['banner-item', {'cursor-pointer': isLink(item.link.linkName)}]" @click="openLink(item)">
             <img :src="item.pic" alt="">
             <p class="banner-name">{{ item.title }}</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 :class="{'arrow': modules[1].form.link.linkName !== '无'}" src="@/assets/images/arrow.png" alt="" @click="openLink(modules[1].form)">
+            <img :class="{'arrow': isLink(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 wow fadeInUp">{{ modules[2].form.title }}</h2>
         <p class="intro wow fadeInUp" data-wow-delay="0.5s">{{ modules[2].form.des }}</p>
         <ul class="app">
-          <li v-for="(item, i) in modules[3].list" :key="i" class="wow fadeInDown" :data-wow-delay="(0.2 * i).toFixed(1) + 's'" :class="{'cursor-pointer': item.link.linkName !== '无'}" @click="openLink(item)">
+          <li v-for="(item, i) in modules[3].list" :key="i" class="wow fadeInDown" :data-wow-delay="(0.2 * i).toFixed(1) + 's'" :class="{'cursor-pointer': isLink(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 wow fadeInUp">{{ modules[4].form.title }}</h2>
         <p class="intro wow fadeInUp" data-wow-delay="0.5s">{{ modules[4].form.des }}</p>
         <ul class="group">
-          <li v-for="(item, i) in modules[5].list" :key="i" class="wow fadeInDown" :data-wow-delay="(0.2 * i).toFixed(1) + 's'" :class="{'cursor-pointer': item.link.linkName !== '无'}" @click="openLink(item)">
+          <li v-for="(item, i) in modules[5].list" :key="i" class="wow fadeInDown" :data-wow-delay="(0.2 * i).toFixed(1) + 's'" :class="{'cursor-pointer': isLink(item.link.linkName)}" @click="openLink(item)">
             <img :src="item.pic" alt="">
             <p class="text">{{ item.title }}</p>
           </li>
diff --git a/src/pages/careers/index.vue b/src/pages/careers/index.vue
index 8f4806c..8e97049 100644
--- a/src/pages/careers/index.vue
+++ b/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', {'cursor-pointer': item.link.linkName !== '无'}]" @click="openLink(item)">
+          <div :class="['banner-item', {'cursor-pointer': isLink(item.link.linkName)}]" @click="openLink(item)">
             <img :src="item.pic" alt="">
             <p class="banner-name">{{ item.title }}</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="" :class="{'cursor-pointer': modules[1].form.link.linkName !== '无'}" @click="openLink(modules[1].form)">
+              <img src="@/assets/images/arrow-white.png" alt="" :class="{'cursor-pointer': isLink(modules[1].form.link.linkName)}" @click="openLink(modules[1].form)">
             </div>
           </li>
           <li class="wow fadeInDown" data-wow-delay="0.3s">
@@ -31,7 +31,7 @@
               <p class="text">{{ modules[2].form.des }}</p>
             </div>
             <div class="arrow">
-              <img src="@/assets/images/arrow-white.png" alt="" :class="{'cursor-pointer': modules[2].form.link.linkName !== '无'}" @click="openLink(modules[2].form)">
+              <img src="@/assets/images/arrow-white.png" alt="" :class="{'cursor-pointer': isLink(modules[2].form.link.linkName)}" @click="openLink(modules[2].form)">
             </div>
           </li>
           <li class="wow fadeInDown" data-wow-delay="0.5s">
@@ -41,7 +41,7 @@
               <p class="text">{{ modules[3].form.des }}</p>
             </div>
             <div class="arrow">
-              <img src="@/assets/images/arrow-white.png" alt="" :class="{'cursor-pointer': modules[3].form.link.linkName !== '无'}" @click="openLink(modules[3].form)">
+              <img src="@/assets/images/arrow-white.png" alt="" :class="{'cursor-pointer': isLink(modules[3].form.link.linkName)}" @click="openLink(modules[3].form)">
             </div>
           </li>
           <li class="wow fadeInDown" data-wow-delay="0.7s">
@@ -51,7 +51,7 @@
               <p class="text">{{ modules[4].form.des }}</p>
             </div>
             <div class="arrow">
-              <img src="@/assets/images/arrow-white.png" alt="" :class="{'cursor-pointer': modules[4].form.link.linkName !== '无'}" @click="openLink(modules[4].form)">
+              <img src="@/assets/images/arrow-white.png" alt="" :class="{'cursor-pointer': isLink(modules[4].form.link.linkName)}" @click="openLink(modules[4].form)">
             </div>
           </li>
         </ul>
@@ -64,7 +64,7 @@
         <p class="intro wow fadeInUp" data-wow-delay="0.5s">{{ modules[5].form.des }}</p>
         <ul class="people">
           <template v-for="(item, i) in modules[6].list">
-            <li v-if="item.isEnable" :key="i" class="wow fadeInDown" data-wow-delay="0.5s" :class="{'cursor-pointer': item.link.linkName !== '无'}" @click="openLink(item)">
+            <li v-if="item.isEnable" :key="i" class="wow fadeInDown" data-wow-delay="0.5s" :class="{'cursor-pointer': isLink(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 src="@/assets/images/arrow-white.png" alt="" class="icon" :class="{'arrow': item.link.linkName !== '无'}" @click="openLink(item)">
+            <img src="@/assets/images/arrow-white.png" alt="" class="icon" :class="{'arrow': isLink(item.link.linkName)}" @click="openLink(item)">
           </div>
           <img class="pic" :src="item.pic" alt="">
         </li>
diff --git a/src/pages/edu/index.vue b/src/pages/edu/index.vue
index 4d10a27..a15d7ea 100644
--- a/src/pages/edu/index.vue
+++ b/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', {'cursor-pointer': item.link.linkName !== '无'}]" @click="openLink(item)">
+          <div :class="['banner-item', {'cursor-pointer': isLink(item.link.linkName)}]" @click="openLink(item)">
             <img :src="item.pic" alt="">
             <p class="banner-name">{{ item.title }}</p>
           </div>
@@ -15,7 +15,7 @@
       <div class="inner">
         <h2 class="b-title wow fadeInUp">{{ modules[1].form.title }}</h2>
         <p class="intro wow fadeInUp" data-wow-delay="0.8s">{{ modules[1].form.des }}</p>
-        <img class="block-pic wow fadeInLeft" data-wow-delay="0.8s" :class="{'cursor-pointer': modules[1].form.link.linkName !== '无'}" width="100%" height="536" :src="modules[1].form.pic" alt="" @click="openLink(modules[1].form)">
+        <img class="block-pic br wow fadeInLeft" data-wow-delay="0.8s" :class="{'cursor-pointer': isLink(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 wow fadeInUp">{{ modules[2].form.title }}</h2>
         <p class="intro wow fadeInUp" data-wow-delay="0.8s">{{ modules[2].form.des }}</p>
-        <img class="block-pic wow fadeInRight" data-wow-delay="0.8s" :class="{'cursor-pointer': modules[2].form.link.linkName !== '无'}" width="100%" height="536" :src="modules[2].form.pic" alt="" @click="openLink(modules[2].form)">
+        <img class="block-pic wow fadeInRight" data-wow-delay="0.8s" :class="{'cursor-pointer': isLink(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" class="wow fadeInUp" data-wow-delay="0.5s">
-              <img class="pic" :src="item.pic" alt="" :class="{'cursor-pointer': item.link.linkName !== '无'}" @click="openLink(item)">
+              <img class="pic" :src="item.pic" alt="" :class="{'cursor-pointer': isLink(item.link.linkName)}" @click="openLink(item)">
               <div class="texts">
                 <h6>{{ item.title }}</h6>
                 <p class="sub">{{ item.subTitle }}</p>
@@ -87,6 +87,9 @@ export default {
 @import "../../styles/page/page.scss";
 .block-pic {
   transition: .3s;
+  &.br {
+    border-radius: 270px;
+  }
   &:hover {
     transform: scale(1.05);
   }
diff --git a/src/pages/exp/index.vue b/src/pages/exp/index.vue
index 0d9b7d8..894e4ca 100644
--- a/src/pages/exp/index.vue
+++ b/src/pages/exp/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', {'cursor-pointer': item.link.linkName !== '无'}]" @click="openLink(item)">
+          <div :class="['banner-item', {'cursor-pointer': isLink(item.link.linkName)}]" @click="openLink(item)">
             <img :src="item.pic" alt="">
             <p class="banner-name">{{ item.title }}</p>
           </div>
diff --git a/src/pages/home/index.vue b/src/pages/home/index.vue
index edf9c47..ec5284d 100644
--- a/src/pages/home/index.vue
+++ b/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': item.link.linkName !== '无'}]" width="100%" height="959" :src="item.pic" alt="" @click="openLink(item)">
+          <img :class="[{'cursor-pointer': isLink(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 src="@/assets/images/arrow.png" alt="" :class="{'arrow': modules[2].form.link.linkName !== '无'}" @click="openLink(modules[2].form)">
+              <img src="@/assets/images/arrow.png" alt="" :class="{'arrow': isLink(modules[2].form.link.linkName)}" @click="openLink(modules[2].form)">
             </div>
           </li>
           <li class="wow fadeInDown" data-wow-delay="0.6s">
@@ -26,7 +26,7 @@
             <div class="texts">
               <h6>{{ modules[3].form.title }}</h6>
               <p class="des">{{ modules[3].form.des }}</p>
-              <img src="@/assets/images/arrow.png" alt="" :class="{'arrow': modules[3].form.link.linkName !== '无'}" @click="openLink(modules[3].form)">
+              <img src="@/assets/images/arrow.png" alt="" :class="{'arrow': isLink(modules[3].form.link.linkName)}" @click="openLink(modules[3].form)">
             </div>
           </li>
         </ul>
@@ -64,7 +64,7 @@
               <div class="texts">
                 <h6>{{ item.title }}</h6>
                 <p class="des">{{ item.des }}</p>
-                <img src="@/assets/images/arrow.png" alt="" :class="{'arrow': item.link.linkName !== '无'}" @click="openLink(item)">
+                <img src="@/assets/images/arrow.png" alt="" :class="{'arrow': isLink(item.link.linkName)}" @click="openLink(item)">
               </div>
             </li>
           </template>
@@ -72,7 +72,7 @@
       </div>
     </div>
 
-    <div class="about" :class="{'cursor-pointer': modules[8].form.link.linkName !== '无'}" @click="openLink(modules[8].form)">
+    <div class="about" :class="{'cursor-pointer': isLink(modules[8].form.link.linkName)}" @click="openLink(modules[8].form)">
       <div class="inner">
         <img class="wow fadeInUp" src="@/assets/images/about.png" alt="">
         <div class="line wow fadeInUp" data-wow-delay="0.4s"></div>
diff --git a/src/pages/news/index.vue b/src/pages/news/index.vue
index 046a214..a6d0c16 100644
--- a/src/pages/news/index.vue
+++ b/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', {'cursor-pointer': item.link.linkName !== '无'}]" @click="openLink(item)">
+          <div :class="['banner-item', {'cursor-pointer': isLink(item.link.linkName)}]" @click="openLink(item)">
             <img :src="item.pic" alt="">
             <p class="banner-name">{{ item.title }}</p>
           </div>
@@ -218,14 +218,14 @@ export default {
       this.timer = setInterval(() => {
         this.curInd++
         if (this.curInd > 2) this.curInd = 0
-        this.curArticle = this.modules[1].list[this.curColumn].articles[this.curInd]
+        this.curArticle = this.modules[1].list[this.curColumn].articles[this.curInd] || {}
       }, 5000)
     },
     // 手动轮播切换
     switchCarousel(i) {
       if (this.curInd !== i) {
         this.curInd = i
-        this.curArticle = this.modules[1].list[this.curColumn].articles[i]
+        this.curArticle = this.modules[1].list[this.curColumn].articles[i] || {}
       }
     },
     // tab回调
diff --git a/src/pages/newsPress/index.vue b/src/pages/newsPress/index.vue
index e74d847..17266b0 100644
--- a/src/pages/newsPress/index.vue
+++ b/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', {'cursor-pointer': item.link.linkName !== '无'}]" @click="openLink(item)">
+          <div :class="['banner-item', {'cursor-pointer': isLink(item.link.linkName)}]" @click="openLink(item)">
             <img :src="item.pic" alt="">
             <p class="banner-name">{{ item.title }}</p>
           </div>
@@ -21,7 +21,7 @@
               <h6>{{ item.title }}</h6>
               <p class="sub">{{ item.subTitle }}</p>
               <div class="des">{{ item.des }}</div>
-              <img src="@/assets/images/arrow.png" alt="" :class="{'arrow': item.link.linkName !== '无'}" @click="openLink(item)">
+              <img src="@/assets/images/arrow.png" alt="" :class="{'arrow': isLink(item.link.linkName)}" @click="openLink(item)">
             </div>
           </li>
         </template>
@@ -89,7 +89,7 @@ export default {
     },
     // 获取上级面包屑
     getColumn() {
-      this.$post(`${this.api.oneLevelChecksThemAll}?id=${this.id}`).then(({ data }) => {
+      this.$post(`${this.api.oneLevelChecksThemAll}?id=${this.id}&isSort=1`).then(({ data }) => {
         this.getParent(data, this.id)
       }).catch(err => {})
     },
diff --git a/src/pages/newsProcurement/index.vue b/src/pages/newsProcurement/index.vue
index 42bdcfc..100e33f 100644
--- a/src/pages/newsProcurement/index.vue
+++ b/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', {'cursor-pointer': item.link.linkName !== '无'}]" @click="openLink(item)">
+          <div :class="['banner-item', {'cursor-pointer': isLink(item.link.linkName)}]" @click="openLink(item)">
             <img :src="item.pic" alt="">
             <p class="banner-name">{{ item.title }}</p>
           </div>
@@ -21,7 +21,7 @@
               <h6>{{ item.title }}</h6>
               <p class="sub">{{ item.subTitle }}</p>
               <div class="des">{{ item.des }}</div>
-              <img src="@/assets/images/arrow.png" alt="" :class="{'arrow': item.link.linkName !== '无'}" @click="openLink(item)">
+              <img src="@/assets/images/arrow.png" alt="" :class="{'arrow': isLink(item.link.linkName)}" @click="openLink(item)">
             </div>
           </li>
         </template>
@@ -89,7 +89,7 @@ export default {
     },
     // 获取上级面包屑
     getColumn() {
-      this.$post(`${this.api.oneLevelChecksThemAll}?id=${this.id}`).then(({ data }) => {
+      this.$post(`${this.api.oneLevelChecksThemAll}?id=${this.id}&isSort=1`).then(({ data }) => {
         this.getParent(data, this.id)
       }).catch(err => {})
     },
diff --git a/src/pages/research/index.vue b/src/pages/research/index.vue
index 6566019..392786e 100644
--- a/src/pages/research/index.vue
+++ b/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', {'cursor-pointer': item.link.linkName !== '无'}]" @click="openLink(item)">
+          <div :class="['banner-item', {'cursor-pointer': isLink(item.link.linkName)}]" @click="openLink(item)">
             <img :src="item.pic" alt="">
             <p class="banner-name">{{ item.title }}</p>
           </div>
@@ -15,7 +15,7 @@
       <h2 class="b-title wow fadeInUp">{{ modules[1].form.title }}</h2>
       <p class="intro wow fadeInUp" data-wow-delay="0.5s">{{ modules[1].form.des }}</p>
       <ul class="area">
-        <li v-for="(item, i) in modules[2].list" :key="i" class="wow fadeInDown" :data-wow-delay="(0.2 * i).toFixed(1) + 's'" :class="{'cursor-pointer': item.link.linkName !== '无'}" @click="openLink(item)">
+        <li v-for="(item, i) in modules[2].list" :key="i" class="wow fadeInDown" :data-wow-delay="(0.2 * i).toFixed(1) + 's'" :class="{'cursor-pointer': isLink(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 wow fadeInUp">{{ modules[3].form.title }}</h2>
         <p class="intro wow fadeInUp" data-wow-delay="0.5s">{{ modules[3].form.des }}</p>
         <ul class="group">
-          <li v-for="(item, i) in modules[4].list" :key="i" class="wow fadeInDown" :data-wow-delay="(0.2 * i).toFixed(1) + 's'" :class="{'cursor-pointer': item.link.linkName !== '无'}" @click="openLink(item)">
+          <li v-for="(item, i) in modules[4].list" :key="i" class="wow fadeInDown" :data-wow-delay="(0.2 * i).toFixed(1) + 's'" :class="{'cursor-pointer': isLink(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 wow fadeInUp">{{ modules[5].form.title }}</h2>
         <p class="intro wow fadeInUp" data-wow-delay="0.5s">{{ modules[5].form.des }}</p>
         <ul class="news">
-          <li v-for="(item, i) in modules[6].list" :key="i" class="wow fadeInDown" :data-wow-delay="(0.2 * i).toFixed(1) + 's'" :class="{'cursor-pointer': item.link.linkName !== '无'}" @click="openLink(item)">
+          <li v-for="(item, i) in modules[6].list" :key="i" class="wow fadeInDown" :data-wow-delay="(0.2 * i).toFixed(1) + 's'" :class="{'cursor-pointer': isLink(item.link.linkName)}" @click="openLink(item)">
             <img :src="item.pic" alt="">
             <div class="texts">
               <h6>{{ item.title }}</h6>
diff --git a/src/pages/science/index.vue b/src/pages/science/index.vue
index 56c8a53..0d4454a 100644
--- a/src/pages/science/index.vue
+++ b/src/pages/science/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', {'cursor-pointer': item.link.linkName !== '无'}]" @click="openLink(item)">
+          <div :class="['banner-item', {'cursor-pointer': isLink(item.link.linkName)}]" @click="openLink(item)">
             <img :src="item.pic" alt="">
             <p class="banner-name">{{ item.title }}</p>
           </div>
@@ -13,21 +13,21 @@
 
     <div class="block">
       <div class="inner">
-        <div class="item" :class="{'cursor-pointer': modules[1].form.link.linkName !== '无'}" @click="openLink(modules[1].form)">
+        <div class="item" :class="{'cursor-pointer': isLink(modules[1].form.link.linkName)}" @click="openLink(modules[1].form)">
           <img src="@/assets/images/science/1.png" alt="">
           <div class="texts">
             <h6>{{ modules[1].form.title }}</h6>
             <div class="des">{{ modules[1].form.des }}</div>
           </div>
         </div>
-        <div class="item" :class="{'cursor-pointer': modules[2].form.link.linkName !== '无'}" @click="openLink(modules[2].form)">
+        <div class="item" :class="{'cursor-pointer': isLink(modules[2].form.link.linkName)}" @click="openLink(modules[2].form)">
           <img src="@/assets/images/science/2.png" alt="">
           <div class="texts">
             <h6>{{ modules[2].form.title }}</h6>
             <div class="des">{{ modules[2].form.des }}</div>
           </div>
         </div>
-        <div class="item" :class="{'cursor-pointer': modules[3].form.link.linkName !== '无'}" @click="openLink(modules[3].form)">
+        <div class="item" :class="{'cursor-pointer': isLink(modules[3].form.link.linkName)}" @click="openLink(modules[3].form)">
           <img src="@/assets/images/science/3.png" alt="">
           <div class="texts">
             <h6>{{ modules[3].form.title }}</h6>
diff --git a/src/pages/sfel/index.vue b/src/pages/sfel/index.vue
index a48843b..bf33bd9 100644
--- a/src/pages/sfel/index.vue
+++ b/src/pages/sfel/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', {'cursor-pointer': item.link.linkName !== '无'}]" @click="openLink(item)">
+          <div :class="['banner-item', {'cursor-pointer': isLink(item.link.linkName)}]" @click="openLink(item)">
             <img :src="item.pic" alt="">
             <p class="banner-name">{{ item.title }}</p>
           </div>
diff --git a/src/pages/survey/index.vue b/src/pages/survey/index.vue
index b797c05..78229b7 100644
--- a/src/pages/survey/index.vue
+++ b/src/pages/survey/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', {'cursor-pointer': item.link.linkName !== '无'}]" @click="openLink(item)">
+          <div :class="['banner-item', {'cursor-pointer': isLink(item.link.linkName)}]" @click="openLink(item)">
             <img :src="item.pic" alt="">
             <p class="banner-name">{{ item.title }}</p>
           </div>
diff --git a/src/pages/talent/index.vue b/src/pages/talent/index.vue
index a5e6814..d8c9d7a 100644
--- a/src/pages/talent/index.vue
+++ b/src/pages/talent/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', {'cursor-pointer': item.link.linkName !== '无'}]" @click="openLink(item)">
+          <div :class="['banner-item', {'cursor-pointer': isLink(item.link.linkName)}]" @click="openLink(item)">
             <img :src="item.pic" alt="">
             <p class="banner-name">{{ item.title }}</p>
           </div>
@@ -13,14 +13,14 @@
 
     <div class="block talent">
       <div class="inner">
-        <div class="item" :class="{'cursor-pointer': modules[1].form.link.linkName !== '无'}" @click="openLink(modules[1].form)">
+        <div class="item" :class="{'cursor-pointer': isLink(modules[1].form.link.linkName)}" @click="openLink(modules[1].form)">
           <img class="pic" :src="modules[1].form.pic" alt="">
           <div class="texts">
             <h6>{{ modules[1].form.title }}</h6>
             <div class="des">{{ modules[1].form.des }}</div>
           </div>
         </div>
-        <div class="item" :class="{'cursor-pointer': modules[2].form.link.linkName !== '无'}" @click="openLink(modules[2].form)">
+        <div class="item" :class="{'cursor-pointer': isLink(modules[2].form.link.linkName)}" @click="openLink(modules[2].form)">
           <img class="pic" :src="modules[2].form.pic" alt="">
           <div class="texts">
             <h6>{{ modules[2].form.title }}</h6>
diff --git a/src/pages/userSharing/index.vue b/src/pages/userSharing/index.vue
index 2534bb7..929dc1a 100644
--- a/src/pages/userSharing/index.vue
+++ b/src/pages/userSharing/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', {'cursor-pointer': item.link.linkName !== '无'}]" @click="openLink(item)">
+          <div :class="['banner-item', {'cursor-pointer': isLink(item.link.linkName)}]" @click="openLink(item)">
             <img :src="item.pic" alt="">
             <p class="banner-name">{{ item.title }}</p>
           </div>