From a8edf21d72367e5742f3e03f83fc267fc9cea040 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 1 Mar 2022 10:14:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=B4=E5=83=8F=E7=AD=89=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/header/index.vue      |  7 ++++++-
 src/layouts/navbar/index.vue      | 30 ++++++++++++++++++++++--------
 src/pages/match/details/index.vue |  3 ---
 src/setting.js                    |  3 +++
 4 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index d51db98..f4d4127 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -72,7 +72,12 @@ export default {
             }).catch(err => {})
         },
         toPersonal() {
-            this.customerName || this.$router.push("/setting/person")
+            // 如果在官网页面，则打开新窗口去到职站个人中心
+            if (this.isIndex) {
+                window.open(this.$router.resolve('/setting/person').href)
+            } else {
+                this.customerName || this.$router.push("/setting/person") // 如果有客户名称，是不能进个人中心的
+            }
         },
         toIndex() {
             this.$refs.nav.jump({
diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue
index 40417e1..e50966d 100644
--- a/src/layouts/navbar/index.vue
+++ b/src/layouts/navbar/index.vue
@@ -51,6 +51,10 @@ export default {
                     index: "/index/list",
                     title: "首页"
                 },
+                {
+                    index: 'data',
+                    title: "数据科研"
+                },
                 {
                     index: "/cityPartner/list",
                     title: "城市合伙人"
@@ -69,15 +73,25 @@ export default {
     },
     methods: {
         jump(item) {
-            const token = util.local.get(Setting.tokenKey)
-            // 如果未登录且跳转的是登录后才有的菜单
-            if (!token && this.loginedMenu.find(e => e.index === item.index)) {
-                location.reload()
+            const { index } = item
+            // 数据科研点击后打开新窗口去到数据平台
+            if (index === 'data') {
+                window.open(Setting.isDev
+                    ? `http://192.168.31.125:8092/#/`
+                    : Setting.isTest
+                        ? location.origin
+                        : `http://www.dataforward.cn`)
             } else {
-                this.active = item.index
-                this.$router.push(item.index).catch(err => {})
-                token !== this.token && location.reload() // 如果登录后再返回该页面，浏览器里会存有token，但是这个页面里的token是刚进到页面时获取的，应该是空，如果是这个情况，则刷新，否则右上角还会显示为登录按钮
-            } 
+                const token = util.local.get(Setting.tokenKey)
+                // 如果未登录且跳转的是登录后才有的菜单
+                if (!token && this.loginedMenu.find(e => e.index === index)) {
+                    location.reload()
+                } else {
+                    this.active = index
+                    this.$router.push(index).catch(err => {})
+                    token !== this.token && location.reload() // 如果登录后再返回该页面，浏览器里会存有token，但是这个页面里的token是刚进到页面时获取的，应该是空，如果是这个情况，则刷新，否则右上角还会显示为登录按钮
+                } 
+            }
         }
     }
 };
diff --git a/src/pages/match/details/index.vue b/src/pages/match/details/index.vue
index c9f9fdd..474fc98 100644
--- a/src/pages/match/details/index.vue
+++ b/src/pages/match/details/index.vue
@@ -274,9 +274,6 @@ export default {
             width: 2px;
             height: 100%;
             background-color: #E1E6F2;
-            @media(max-width: 1300px){
-                left: 289px;
-            }
         }
         &:after {
             content: '';
diff --git a/src/setting.js b/src/setting.js
index a8921bc..75f067a 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -65,6 +65,9 @@ const Setting = {
     tokenKey: "oc_client_token", // localStorage里保存的token的key
     storeKey: "oc_client_store", // localStorage里保存的vuex的key
     initialPassword: "111aaa", // 默认密码
+    isDev,
+    isTest,
+    isPro,
     /**
      * 路由白名单
      * */