From fa4d149b7956bf7692ab9abb99df533036dcc095 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Wed, 18 Jan 2023 10:42:46 +0800
Subject: [PATCH] fix

---
 src/layouts/footer/index.vue    |  1 -
 src/layouts/home/index.vue      |  2 +-
 src/layouts/navbar/index.vue    |  1 +
 src/mixins/page/index.js        |  2 +-
 src/pages/about/index.vue       |  6 +++---
 src/pages/article/index.vue     |  3 ++-
 src/pages/careers/index.vue     |  2 +-
 src/pages/news/index.vue        |  9 ++++++++-
 src/pages/sfel/index.vue        | 13 -------------
 src/pages/talent/index.vue      |  8 +++++---
 src/pages/userSharing/index.vue |  6 +++---
 11 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/src/layouts/footer/index.vue b/src/layouts/footer/index.vue
index 56a9295..b7279ca 100644
--- a/src/layouts/footer/index.vue
+++ b/src/layouts/footer/index.vue
@@ -92,7 +92,6 @@ export default {
   overflow: hidden;
   .info {
     display: flex;
-    margin-bottom: 100px;
   }
   .meta {
     margin-bottom: 10px;
diff --git a/src/layouts/home/index.vue b/src/layouts/home/index.vue
index cc72cbf..b2c7658 100644
--- a/src/layouts/home/index.vue
+++ b/src/layouts/home/index.vue
@@ -41,7 +41,7 @@ export default {
       'setSite'
     ]),
     handleClass() {
-      return this.enSite.includes(this.$route.query.siteId || this.$store.state.content.site)
+      return this.enSite.includes(+this.$route.query.siteId || this.$store.state.content.site)
     },
     // 长时间未操作,自动退出登录
     autoLogout() {
diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue
index 2123c57..022e270 100644
--- a/src/layouts/navbar/index.vue
+++ b/src/layouts/navbar/index.vue
@@ -124,6 +124,7 @@ $height: 90px;
     line-height: $height;
     span {
       font-size: 14px;
+      font-weight: 600;
     }
     &:hover {
       background-color: transparent !important;
diff --git a/src/mixins/page/index.js b/src/mixins/page/index.js
index a326f28..ee48ad0 100644
--- a/src/mixins/page/index.js
+++ b/src/mixins/page/index.js
@@ -17,7 +17,7 @@ export default {
     // 打开链接
     async openLink(item) {
       const { link } = item
-      if (link.linkName === '无') return false
+      if (link.linkName === '无' || link.linkName === '') return false
       let href = link.linkAddress
       const type = link.connectionType
       if (type === 1) { // 站内链接
diff --git a/src/pages/about/index.vue b/src/pages/about/index.vue
index d13636c..bd298d1 100644
--- a/src/pages/about/index.vue
+++ b/src/pages/about/index.vue
@@ -353,7 +353,7 @@ export default {
     background-color: #F5F5F5;
     transition: .3s;
     &:hover {
-      background-color: #ff8b1d;
+      background-color: #1f5793;
       h6, .des {
         color: #fff;
       }
@@ -385,7 +385,7 @@ export default {
   transition: .3s;
   &:hover {
     transform: scale(1.05);
-    background-color: #c993ff;
+    background-color: #165191;
     h6, .des {
       color: #fff;
     }
@@ -401,7 +401,7 @@ export default {
     margin-bottom: 30px;
     font-size: 30px;
     color: #333;
-  transition: .3s;
+    transition: .3s;
     @include mul-ellipsis(3);
   }
   .des {
diff --git a/src/pages/article/index.vue b/src/pages/article/index.vue
index 810015b..ed1ebe8 100644
--- a/src/pages/article/index.vue
+++ b/src/pages/article/index.vue
@@ -180,6 +180,7 @@ export default {
   height: 280px;
   padding: 123px 0 0 243px;
   font-size: 48px;
+  font-weight: 600;
   color: #fff;
   background: url(../../assets/images/intro-bg.png) 0 0/100% 100% no-repeat;
 }
@@ -202,7 +203,7 @@ export default {
     padding-bottom: 30px;
     margin-bottom: 30px;
     font-size: 24px;
-    line-height: 40px;
+    line-height: 1.33;
     color: #606060;
     border-bottom: 1px solid #D8D8D8;
   }
diff --git a/src/pages/careers/index.vue b/src/pages/careers/index.vue
index 8e97049..1976d40 100644
--- a/src/pages/careers/index.vue
+++ b/src/pages/careers/index.vue
@@ -262,7 +262,7 @@ export default {
   .left {
     position: relative;
     z-index: 1;
-    width: 43.3%;
+    width: 43.333%;
     height: 100%;
     padding: 138px 30px 30px 103px;
     background-color: rgba(54, 54, 54, .65);
diff --git a/src/pages/news/index.vue b/src/pages/news/index.vue
index a6d0c16..d36fd7a 100644
--- a/src/pages/news/index.vue
+++ b/src/pages/news/index.vue
@@ -96,7 +96,7 @@
         <p class="intro wow fadeInUp" data-wow-delay="0.5s">{{ modules[4].form.des }}</p>
         <div class="shows" v-if="articles1.length">
           <div class="left wow fadeInLeft" data-wow-delay="0.5s" @click="toArtice(articles1[0], modules[5].form)">
-            <img width="100%" height="558" :src="articles1[0].titleImg" alt="" onerror="javascript:this.src='./images/1.png';">
+            <img class="pic" width="100%" height="558" :src="articles1[0].titleImg" alt="" onerror="javascript:this.src='./images/1.png';">
             <div class="texts">
               <div class="meta">
                 <p class="date">09</p>
@@ -535,7 +535,14 @@ export default {
     width: 718px;
     margin-right: 20px;
     background-color: #fff;
+    overflow: hidden;
     cursor: pointer;
+    .pic {
+      transition: .3s;
+      &:hover {
+        transform: scale(1.05);
+      }
+    }
     .texts {
       display: flex;
       padding: 40px 30px;
diff --git a/src/pages/sfel/index.vue b/src/pages/sfel/index.vue
index bf33bd9..cb844d9 100644
--- a/src/pages/sfel/index.vue
+++ b/src/pages/sfel/index.vue
@@ -289,7 +289,6 @@ export default {
   },
   mounted() {
     new WOW().init()
-    this.getColumn()
   },
   methods: {
     // 获取文章详情
@@ -399,18 +398,6 @@ export default {
         this.curColumn = i
       }
     },
-    // 资讯
-    getColumn() {
-      this.$post(this.api.listWithTreeMenuVisible, {
-        siteId: this.$route.query.siteId || this.$store.state.content.site,
-        columnName: '',
-        templateId: '',
-        typeId	: '',
-        isSort: 1
-      }).then(({ data }) => {
-        this.columns = data
-      }).catch(err => {})
-    },
   }
 };
 </script>
diff --git a/src/pages/talent/index.vue b/src/pages/talent/index.vue
index d8c9d7a..e083ade 100644
--- a/src/pages/talent/index.vue
+++ b/src/pages/talent/index.vue
@@ -52,7 +52,7 @@
             <p class="type">{{ modules[5].form.subTitle }}</p>
             <h6>{{ modules[5].form.title }}</h6>
             <div class="des">{{ modules[5].form.des }}</div>
-            <el-button type="primary" @click="openLink(modules[5].form)">查看更多</el-button>
+            <el-button v-if="isLink(modules[5].form.link.linkName)" type="primary" @click="openLink(modules[5].form)">查看更多</el-button>
           </div>
         </div>
         <div class="item">
@@ -61,7 +61,7 @@
             <p class="type">{{ modules[6].form.subTitle }}</p>
             <h6>{{ modules[6].form.title }}</h6>
             <div class="des">{{ modules[6].form.des }}</div>
-            <el-button type="primary" @click="openLink(modules[6].form)">查看更多</el-button>
+            <el-button v-if="isLink(modules[6].form.link.linkName)" type="primary" @click="openLink(modules[6].form)">查看更多</el-button>
           </div>
         </div>
       </div>
@@ -119,11 +119,11 @@ export default {
   }
   .item {
     display: flex;
-    justify-content: space-between;
     padding: 42px;
     margin-bottom: 36px;
     background: #fff;
     &:nth-child(even) {
+      justify-content: space-between;
       flex-direction: row-reverse;
       .texts {
         padding-left: 0;
@@ -161,6 +161,8 @@ export default {
   }
   .item {
     position: relative;
+    width: 100%;
+    height: 510px;
   }
   img {
     width: 100%;
diff --git a/src/pages/userSharing/index.vue b/src/pages/userSharing/index.vue
index 929dc1a..3501810 100644
--- a/src/pages/userSharing/index.vue
+++ b/src/pages/userSharing/index.vue
@@ -28,17 +28,17 @@
 
     <div class="block gray">
       <ul class="group">
-        <li>
+        <li :class="{'cursor-pointer': isLink(modules[2].form.link.linkName)}" @click="openLink(modules[2].form)">
           <img src="@/assets/images/userSharing/2.png" alt="">
           <h6>{{ modules[2].form.title }}</h6>
           <div class="des">{{ modules[2].form.des }}</div>
         </li>
-        <li>
+        <li :class="{'cursor-pointer': isLink(modules[3].form.link.linkName)}" @click="openLink(modules[3].form)">
           <img src="@/assets/images/userSharing/3.png" alt="">
           <h6>{{ modules[3].form.title }}</h6>
           <div class="des">{{ modules[3].form.des }}</div>
         </li>
-        <li>
+        <li :class="{'cursor-pointer': isLink(modules[4].form.link.linkName)}" @click="openLink(modules[4].form)">
           <img src="@/assets/images/userSharing/4.png" alt="">
           <h6>{{ modules[4].form.title }}</h6>
           <div class="des">{{ modules[4].form.des }}</div>