From f01ab6e255194769debfc06fc21521f99bd5a1f2 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Mon, 29 Jul 2024 14:26:30 +0800
Subject: [PATCH] fix

---
 src/assets/images/menu-gray.svg |  1 +
 src/layouts/header/index.vue    |  5 +++--
 src/layouts/navbar/index.vue    |  1 +
 src/pages/column/index.vue      | 14 ++++++--------
 src/pages/iasf/index.vue        |  2 +-
 src/store/modules/content.js    |  2 +-
 6 files changed, 13 insertions(+), 12 deletions(-)
 create mode 100644 src/assets/images/menu-gray.svg

diff --git a/src/assets/images/menu-gray.svg b/src/assets/images/menu-gray.svg
new file mode 100644
index 0000000..9e13d94
--- /dev/null
+++ b/src/assets/images/menu-gray.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1721981483704" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="11612" width="26" height="26" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M751.281231 352.078769h-478.523077a39.384615 39.384615 0 0 1-39.384616-39.384615 39.384615 39.384615 0 0 1 39.384616-39.384616h478.523077a39.384615 39.384615 0 0 1 39.384615 39.384616 39.384615 39.384615 0 0 1-39.384615 39.384615z" fill="#4c4c4d" p-id="11613"></path><path d="M751.281231 750.690462h-478.523077a39.384615 39.384615 0 0 1-39.384616-39.384616 39.384615 39.384615 0 0 1 39.384616-39.384615h478.523077a39.384615 39.384615 0 0 1 39.384615 39.384615 39.384615 39.384615 0 0 1-39.384615 39.384616z" fill="#4c4c4d" p-id="11614"></path><path d="M751.281231 551.384615h-478.523077a39.384615 39.384615 0 0 1-39.384616-39.384615 39.384615 39.384615 0 0 1 39.384616-39.384615h478.523077a39.384615 39.384615 0 0 1 39.384615 39.384615 39.384615 39.384615 0 0 1-39.384615 39.384615z" fill="#4c4c4d" p-id="11615"></path></svg>
\ No newline at end of file
diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index 0fa1bf9..d689891 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -50,7 +50,7 @@
         </el-popover>
       </div>
 
-      <img class="menu-icon" src="@/assets/images/menu.svg" alt="" @click.stop="updateType(!modelType)">
+      <img class="menu-icon" :src="menuIcon" alt="" @click.stop="updateType(!modelType)">
       <div class="contentBox" v-show="modelType">
         <navbar ref="nav" :isHome.sync="isHome" @updateModelType="updateType"></navbar>
       </div>
@@ -72,6 +72,7 @@ export default {
   data () {
     return {
       Util,
+      menuIcon: require(location.href.includes('eduvessel') ? '@/assets/images/menu-gray.svg' : '@/assets/images/menu.svg'),
       isHome: true,
       isEstate: false,
       isIasf: false,
@@ -167,7 +168,7 @@ export default {
         const h = this.height
         let scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop
         // const rule = scrollTop > h
-        const rule = scrollTop > 120
+        const rule = scrollTop > 10
         if (this.isHome == rule) {
           if (this.isHome != !(rule)) this.navShow = false
           this.isHome = !(rule)
diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue
index 53eaab4..deddd6d 100644
--- a/src/layouts/navbar/index.vue
+++ b/src/layouts/navbar/index.vue
@@ -189,6 +189,7 @@ $height: 89px;
     span {
       font-size: 1rem;
       font-weight: 600;
+      text-shadow: 0px 2px 2px rgba(185, 185, 185, .6);
     }
 
     &:hover {
diff --git a/src/pages/column/index.vue b/src/pages/column/index.vue
index a98bfbc..1e13859 100644
--- a/src/pages/column/index.vue
+++ b/src/pages/column/index.vue
@@ -403,6 +403,7 @@ export default {
   },
   methods: {
     init () {
+      this.columnBanner = ''
       this.getInfo();
       this.getColumn();
       this.getNews();
@@ -448,14 +449,14 @@ export default {
         }).catch(err => { })
       }
     },
-    // 获取banner 规则：当前栏目有上传的，用当前的，没有上传的话，读取上级的（上级没有读上上级，以此类推）都没有的读取默认的
+    // 获取banner 规则：当前栏目有上传的，用当前的，没有上传的话，读取上级的（上级没有读上上级，以此类推）都没有的话读取默认的
     getBanner (data) {
       for (const e of data) {
-        if (e.columnBanner) this.columnBanner = e.columnBanner;
+        if (e.columnBanner) this.columnBanner = e.columnBanner
         if (e.id == this.info.id) {
-          break;
+          break
         } else if (e.children.length) {
-          this.getBanner(e.children);
+          this.getBanner(e.children)
         }
       }
     },
@@ -879,10 +880,6 @@ export default {
   }
 
   /deep/.columns {
-    &+.detail {
-      padding-left: 20px;
-    }
-
     width: 22%;
     margin-right: 0.6rem;
     overflow: auto;
@@ -1229,6 +1226,7 @@ export default {
 .detail {
   flex: 1;
   max-width: 77%;
+  min-height: calc(100vh - 24rem - 90px);
   padding: 20px;
   background-color: #fff;
   overflow: auto;
diff --git a/src/pages/iasf/index.vue b/src/pages/iasf/index.vue
index 2f70f61..b0897dc 100644
--- a/src/pages/iasf/index.vue
+++ b/src/pages/iasf/index.vue
@@ -188,7 +188,7 @@
                 <p class="sub-title">{{ modules[12].form.subTitle }}</p>
                 <div class="text" v-html="modules[12].form.des"></div>
                 <el-button v-if="isLink(modules[12].form.link.linkName)" style="background-color: #026BE1;"
-                  type="primary" round @click="openLink(modules[12].form)">诚邀海内外人才加入我们 ></el-button>
+                  type="primary" round @click="openLink(modules[12].form)">前往查看 ></el-button>
               </div>
               <img :src="modules[12].form.pic" alt="" class="pic">
             </div>
diff --git a/src/store/modules/content.js b/src/store/modules/content.js
index 0766f7b..5c7c470 100644
--- a/src/store/modules/content.js
+++ b/src/store/modules/content.js
@@ -6,7 +6,7 @@ import Router from '@/router'
 export default {
   namespaced: true,
   state: {
-    site: 1,
+    site: location.href.includes('eduvessel') ? 7 : 1,
     keyword: '',
     scrollTop: 0,
   },