From 38c5a4a546fdb839a1ce47b3eed8ac966ac4340b Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Wed, 9 Feb 2022 16:09:04 +0800
Subject: [PATCH] fix

---
 src/apis/request.js       |  2 +-
 src/components/Topbar.vue | 25 +++++++++++++++++--------
 src/views/Home.vue        | 27 +++++++++++++++++++++++----
 3 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/src/apis/request.js b/src/apis/request.js
index 6ee8d6c..d042367 100644
--- a/src/apis/request.js
+++ b/src/apis/request.js
@@ -3,7 +3,7 @@ import axios from 'axios';
 // axios.defaults.baseURL='http://139.9.247.137/msdw';
 // axios.defaults.baseURL='https://www.feifanhitech.com/msdw';
 // axios.defaults.baseURL='http://www.zxyicloud.com/msdw';
-axios.defaults.baseURL='http://47.107.237.129/msdw';
+axios.defaults.baseURL='http://zxyicloud.com/msdw';
 //轮播图信息
 export function carousel(parms){
     return axios.get('/carouse/carouse/'+parms
diff --git a/src/components/Topbar.vue b/src/components/Topbar.vue
index 8694cf3..10e9fb0 100644
--- a/src/components/Topbar.vue
+++ b/src/components/Topbar.vue
@@ -44,15 +44,24 @@ export default {
       this.$router.push(a);
     },
     mange() {
-      location.href = "http://121.37.12.51/mange/#/login";
+      location.href = "http://zxyicloud.com/mange/#/login";
     },
-    route(id, name) {
-      console.log(name);
-      const { href } = this.$router.resolve({
-        path: `/ChuanDa/` + id + "/leftmenu/0",
-      });
-      window.open(href, "_self");
-      this.$store.state.columnmessage.id = id;
+    route(id,name) {
+      console.log(name)
+      if (name == '首页') {
+        const { href } = this.$router.resolve({
+          path: `/ChuanDa/` + id + "/leftmenu/0",
+        });
+        window.open(href, "_self");
+        this.$store.state.columnmessage.id = id;
+        location.reload();
+      } else {
+        const { href } = this.$router.resolve({
+          path: `/ChuanDa/` + id + "/leftmenu/0",
+        });
+        window.open(href, "_self");
+        this.$store.state.columnmessage.id = id;
+      }
     },
   },
   computed: {},
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 973dcb4..0905786 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -101,8 +101,8 @@
         <div
           class="columphoto"
           @click="
-            routelink(
-              homeFormfirst.linkcolumnarticletop.id,
+            routelinks(
+              homeFormfirst.linkcolumnarticletop,
               homeFormfirst.linkcolumnarticletop.linkUrl
             )
           "
@@ -120,15 +120,24 @@
         <div class="columphotoes">
           <!-- 新闻公告底部跳转 -->
           <div
-           @click="routelink(item.id,homeFormfirst.linkcolumnarticletop.linkUrl)"
+           @click="routelinks(item,homeFormfirst.linkcolumnarticletop.linkUrl)"
             v-for="item in homeFormfirst.linkcolumnarticlebottom"
             :key="item.id"
           >
-            <a :href="item.linkUrl">
+            <span v-if="item.columnId == 60">
+              <a  :href="'#/ChuanDa/59/leftmenu/60/description/'+item.id">
               <img :src="item.bgImgUrl" alt="" />
               <p>{{ item.title }}</p>
               <p class="time">{{ item.createTime }}</p>
             </a>
+            </span>
+            <span v-else>
+              <a  :href="item.linkUrl">
+              <img :src="item.bgImgUrl" alt="" />
+              <p>{{ item.title }}</p>
+              <p class="time">{{ item.createTime }}</p>
+            </a>
+            </span>
           </div>
         </div>
       </div>
@@ -295,6 +304,14 @@ export default {
     link(a) {
       this.$router.push(a);//编程式链接跳转
     },
+    routelinks(item) {
+      console.log(item)
+      if (item.columnId == 60) {
+        window.location = '#/ChuanDa/59/leftmenu/60/description/'+item.id;
+      } else {
+        window.location = item.linkUrl
+      }
+    },
     routelink(id, url) {
       console.log(url)
       window.location = url
@@ -568,6 +585,8 @@ export default {
           }
         });
       }
+      window.location.hash = '#/ChuanDa/59/leftmenu/60'
+      location.reload();
     },
     //改变栏目颜色
     changecolor(column) {