From 16deb289c920ce44832b7e29aeff1dadd48ea154 Mon Sep 17 00:00:00 2001
From: binbin0314 <binbin0314@126.com>
Date: Fri, 15 Jan 2021 21:45:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AE=E6=92=AD=E5=9B=BE=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Banner/Banner.vue              | 14 ++++++
 src/components/HeadNav/HeadNav.vue            |  2 +-
 src/views/About/About.vue                     | 46 +++++++++++++++++--
 src/views/Business/Business.vue               | 19 ++++----
 src/views/Challenge/Challenge.vue             | 31 ++++++++++---
 src/views/Develop/Develop.vue                 | 27 +++++------
 src/views/Hatch/Hatch.vue                     | 20 +++++++-
 src/views/Hatch/components/LeftNav.vue        |  8 ++--
 .../ServiceMarket/Children/ServiceDet.vue     | 22 +++++----
 src/views/ServiceMarket/ServiceMarket.vue     | 36 +++++++++++++--
 10 files changed, 173 insertions(+), 52 deletions(-)

diff --git a/src/components/Banner/Banner.vue b/src/components/Banner/Banner.vue
index fb7ba38..0fb5d74 100644
--- a/src/components/Banner/Banner.vue
+++ b/src/components/Banner/Banner.vue
@@ -1,3 +1,10 @@
+<!--
+ * @Author: wally
+ * @email: 18603454788@163.com
+ * @Date: 2021-01-13 16:33:32
+ * @LastEditors: wally
+ * @LastEditTime: 2021-01-15 21:10:05
+-->
 <!--
   Copyright (c) 2020.
   author: song
@@ -31,6 +38,13 @@ export default {
 
   computed: mapState('home', ['bannerLists']),
 
+  watch: {
+    async showPage() {
+      this.setBannerLists([]);
+      await this.getQueryRotation(this.showPage);
+    },
+  },
+
   mounted() {
     // window.addEventListener('scroll', this.handleScroll);
     // setTimeout(() => {
diff --git a/src/components/HeadNav/HeadNav.vue b/src/components/HeadNav/HeadNav.vue
index c982d60..857a6d3 100644
--- a/src/components/HeadNav/HeadNav.vue
+++ b/src/components/HeadNav/HeadNav.vue
@@ -67,7 +67,7 @@ export default {
               url: '/Hatch/Space',
             },
             {
-              title: '数字创时代企业孵化器',
+              title: '数智创时代企业孵化器',
               url: '/Hatch/Incubator',
             },
             {
diff --git a/src/views/About/About.vue b/src/views/About/About.vue
index 61335fd..910da9d 100644
--- a/src/views/About/About.vue
+++ b/src/views/About/About.vue
@@ -1,23 +1,59 @@
+<!--
+ * @Author: wally
+ * @email: 18603454788@163.com
+ * @Date: 2021-01-13 17:18:13
+ * @LastEditors: wally
+ * @LastEditTime: 2021-01-15 21:41:26
+-->
 <template>
-  <div class="inner" style="margin-top: 50px; margin-bottom: 100px">
-    <left-nav style="float: left" />
-    <div style="width: 83%; float: right">
-      <router-view></router-view>
+  <div>
+    <banner :show-page="showPage" />
+    <div class="inner" style="margin-top: 50px; margin-bottom: 100px">
+      <left-nav style="float: left" />
+      <div style="width: 83%; float: right">
+        <router-view></router-view>
+      </div>
     </div>
   </div>
 </template>
 
 <script>
+import Banner from 'components/Banner/Banner.vue';
 import LeftNav from './components/LeftNav.vue';
 export default {
   name: 'About',
-  components: { LeftNav },
+  components: { LeftNav, Banner },
   data() {
     return {
       title: '关于我们',
       arr: [{ name: '联系我们', url: '' }],
+      showPage: 92,
     };
   },
+  watch: {
+    $route(to, from) {
+      if (to.fullPath === '/About/Introduce') {
+        this.showPage = 91;
+      } else if (to.fullPath === '/About/Organ') {
+        this.showPage = 92;
+      } else if (to.fullPath === '/About/SpinOffs') {
+        this.showPage = 93;
+      } else {
+        this.showPage = 35;
+      }
+    },
+  },
+  created() {
+    if (this.$route.fullPath === '/About/Introduce') {
+      this.showPage = 91;
+    } else if (this.$route.fullPath === '/About/Organ') {
+      this.showPage = 92;
+    } else if (this.$route.fullPath === '/About/SpinOffs') {
+      this.showPage = 93;
+    } else {
+      this.showPage = 35;
+    }
+  },
 };
 </script>
 
diff --git a/src/views/Business/Business.vue b/src/views/Business/Business.vue
index 1a37b1e..56214e4 100644
--- a/src/views/Business/Business.vue
+++ b/src/views/Business/Business.vue
@@ -1,6 +1,13 @@
+<!--
+ * @Author: wally
+ * @email: 18603454788@163.com
+ * @Date: 2021-01-14 11:30:53
+ * @LastEditors: wally
+ * @LastEditTime: 2021-01-15 21:38:47
+-->
 <template>
   <div>
-    <rotation />
+    <banner :show-page="71" />
     <div class="inner content-box" style="margin-top: 50px; margin-bottom: 50px">
       <div :key="index" v-for="(item, index) in list">
         <div class="d-flex justify-space-between" v-if="index % 2 === 0">
@@ -40,17 +47,13 @@
 </template>
 
 <script>
-import Rotation from 'components/Rotation/Rotation.vue';
+import Banner from 'components/Banner/Banner.vue';
 export default {
   name: 'Introduce',
-  components: { Rotation },
+  components: { Banner },
   data() {
     return {
-      title: '关于我们-公司介绍',
-      arr: [
-        { name: '关于我们', url: '/About/Introduce' },
-        { name: '公司介绍', url: '' },
-      ],
+      title: '创业学院',
       list: [
         {
           title: '山西维基智汇科技有限公司',
diff --git a/src/views/Challenge/Challenge.vue b/src/views/Challenge/Challenge.vue
index 407e181..11109f7 100644
--- a/src/views/Challenge/Challenge.vue
+++ b/src/views/Challenge/Challenge.vue
@@ -3,28 +3,47 @@
  * @email: 18603454788@163.com
  * @Date: 2021-01-14 12:20:06
  * @LastEditors: wally
- * @LastEditTime: 2021-01-14 12:29:14
+ * @LastEditTime: 2021-01-15 21:35:09
 -->
 <template>
-  <div class="inner" style="margin-top: 50px; margin-bottom: 100px">
-    <left-nav style="float: left" />
-    <div style="width: 83%; float: right">
-      <router-view></router-view>
+  <div>
+    <banner :show-page="61" v-show="showBanner === 1" />
+    <div class="inner" style="margin-top: 50px; margin-bottom: 100px">
+      <left-nav style="float: left" />
+      <div style="width: 83%; float: right">
+        <router-view></router-view>
+      </div>
     </div>
   </div>
 </template>
 
 <script>
+import Banner from 'components/Banner/Banner.vue';
 import LeftNav from './components/LeftNav.vue';
 export default {
   name: 'Challenge',
-  components: { LeftNav },
+  components: { LeftNav, Banner },
   data() {
     return {
       title: '创新挑战',
       arr: [{ name: '创新挑战', url: '' }],
+      showBanner: 0,
     };
   },
+  watch: {
+    $route(to, from) {
+      if (to.fullPath === '/Challenge/Solicitation') {
+        this.showBanner = 1;
+      } else {
+        this.showBanner = 0;
+      }
+    },
+  },
+  created() {
+    if (this.$route.fullPath === '/Challenge/Solicitation') {
+      this.showBanner = 1;
+    }
+  },
 };
 </script>
 
diff --git a/src/views/Develop/Develop.vue b/src/views/Develop/Develop.vue
index 0039892..4c9bcff 100644
--- a/src/views/Develop/Develop.vue
+++ b/src/views/Develop/Develop.vue
@@ -1,8 +1,15 @@
+<!--
+ * @Author: wally
+ * @email: 18603454788@163.com
+ * @Date: 2021-01-14 13:10:21
+ * @LastEditors: wally
+ * @LastEditTime: 2021-01-15 21:30:26
+-->
 
 
 <template>
   <div>
-    <rotation />
+    <banner :show-page="41" />
     <div class="inner" style="padding: 0 25px; position: relative; padding-bottom: 50px">
       <p class="dev-title">数智开发界面</p>
       <p class="dev-content">
@@ -14,22 +21,12 @@
       </p>
       <a-button class="dev-btn" type="primary">项目合作</a-button>
     </div>
-    <div
-      class="inner dev-img-box d-flex flex-wrap"
-      style="margin-top: 40px !important; margin-bottom: 40px !important"
-    >
+    <div class="inner dev-img-box d-flex flex-wrap" style="margin-top: 40px !important; margin-bottom: 40px !important">
       <div :key="index" class="d-flex" style="width: 50%" v-for="(item, index) in lists">
         <img :src="item" @click="showProfile = true" style="width: 100%; cursor: pointer" />
       </div>
     </div>
-    <a-modal
-      :footer="null"
-      :visible="showProfile"
-      @cancel="handleCancel"
-      @ok="handleCancel"
-      title="XX项目介绍"
-      width="50%"
-    >
+    <a-modal :footer="null" :visible="showProfile" @cancel="handleCancel" @ok="handleCancel" title="XX项目介绍" width="50%">
       <p class="line-height-30">
         公司采取理事会、经理层、事业部组织架构，公司理事会组成按理事会章程执行，经理层设总经理 1 名、副总经理 2-3 名，各事业部设部长 1
         名、副部长 1 名。
@@ -52,10 +49,10 @@
 </template>
 
 <script>
-import Rotation from 'components/Rotation/Rotation.vue';
+import Banner from 'components/Banner/Banner.vue';
 export default {
   name: 'Activity',
-  components: { Rotation },
+  components: { Banner },
   data() {
     return {
       lists: [
diff --git a/src/views/Hatch/Hatch.vue b/src/views/Hatch/Hatch.vue
index 0124ccf..99fe2c7 100644
--- a/src/views/Hatch/Hatch.vue
+++ b/src/views/Hatch/Hatch.vue
@@ -3,7 +3,7 @@
  * @email: 18603454788@163.com
  * @Date: 2021-01-14 17:28:38
  * @LastEditors: wally
- * @LastEditTime: 2021-01-15 09:40:02
+ * @LastEditTime: 2021-01-15 21:28:46
 -->
 <template>
   <div>
@@ -31,7 +31,23 @@ export default {
       showPage: 0,
     };
   },
-
+  watch: {
+    $route(to, from) {
+      if (to.fullPath === '/Hatch/Incubator') {
+        this.showPage = 32;
+      } else if (to.fullPath === '/Hatch/Fictitious') {
+        this.showPage = 33;
+      } else if (to.fullPath === '/Hatch/Tutor') {
+        this.showPage = 34;
+      } else if (to.fullPath === '/Hatch/Partner') {
+        this.showPage = 35;
+      } else if (to.fullPath === '/Hatch/Service') {
+        this.showPage = 36;
+      } else {
+        this.showPage = 31;
+      }
+    },
+  },
   created() {
     if (this.$route.fullPath === '/Hatch/Incubator') {
       this.showPage = 32;
diff --git a/src/views/Hatch/components/LeftNav.vue b/src/views/Hatch/components/LeftNav.vue
index a39ca09..aba6e8e 100644
--- a/src/views/Hatch/components/LeftNav.vue
+++ b/src/views/Hatch/components/LeftNav.vue
@@ -3,7 +3,7 @@
  * @email: 18603454788@163.com
  * @Date: 2021-01-13 17:25:56
  * @LastEditors: wally
- * @LastEditTime: 2021-01-14 18:08:51
+ * @LastEditTime: 2021-01-15 17:38:59
 -->
 <template>
   <div class="nav-box">
@@ -12,7 +12,9 @@
       :key="index"
       @click="jump(item.url, index)"
       v-for="(item, index) in list"
-    >{{ item.title }}</div>
+    >
+      {{ item.title }}
+    </div>
   </div>
 </template>
 
@@ -29,7 +31,7 @@ export default {
           url: '/Hatch/Space',
         },
         {
-          title: '数字创时代企业孵化器',
+          title: '数智创时代企业孵化器',
           url: '/Hatch/Incubator',
         },
         {
diff --git a/src/views/ServiceMarket/Children/ServiceDet.vue b/src/views/ServiceMarket/Children/ServiceDet.vue
index 67d5b32..1a6dda1 100644
--- a/src/views/ServiceMarket/Children/ServiceDet.vue
+++ b/src/views/ServiceMarket/Children/ServiceDet.vue
@@ -1,15 +1,21 @@
+<!--
+ * @Author: wally
+ * @email: 18603454788@163.com
+ * @Date: 2021-01-14 16:25:40
+ * @LastEditors: wally
+ * @LastEditTime: 2021-01-15 21:42:54
+-->
 <template>
   <div>
-    <banner :show-page="showPage" />
     <div class="posi-name">
       <p class="service-name">{{ obj.name }}</p>
       <p class="service-eng">SERVICE</p>
     </div>
     <div class="inner service-box">
       <!-- <div style="margin-bottom: 40px" v-dompurify-html="obj.content"></div> -->
-      <div
-        style="margin-bottom: 40px"
-      >研究院的介绍包含研究院，公司架构，和各中心的介绍。各中心介绍包含科创体系与科创能力咨询服务中心、知识产权与技术转移咨询服务中心、数字化转型咨询服务中心、科技信息咨询服务中心、科创战略协同研究中心、山西奥依工业设计咨询服务中心</div>
+      <div style="margin-bottom: 40px">
+        研究院的介绍包含研究院，公司架构，和各中心的介绍。各中心介绍包含科创体系与科创能力咨询服务中心、知识产权与技术转移咨询服务中心、数字化转型咨询服务中心、科技信息咨询服务中心、科创战略协同研究中心、山西奥依工业设计咨询服务中心
+      </div>
       <div>
         <!-- <a-button>直接申请</a-button> -->
         <intention-model :type-data="typeData" style="float: left; margin-right: 20px" />
@@ -18,7 +24,9 @@
       </div>
       <div class="mt-10" style="margin-top: 40px">
         <p class="font-30">服务案例</p>
-        <div>研究院的介绍包含研究院，公司架构，和各中心的介绍。各中心介绍包含科创体系与科创能力咨询服务中心、知识产权与技术转移咨询服务中心、数字化转型咨询服务中心、科技信息咨询服务中心、科创战略协同研究中心、山西奥依工业设计咨询服务中心</div>
+        <div>
+          研究院的介绍包含研究院，公司架构，和各中心的介绍。各中心介绍包含科创体系与科创能力咨询服务中心、知识产权与技术转移咨询服务中心、数字化转型咨询服务中心、科技信息咨询服务中心、科创战略协同研究中心、山西奥依工业设计咨询服务中心
+        </div>
       </div>
     </div>
   </div>
@@ -28,14 +36,12 @@
 import { mapState } from 'vuex';
 import { selContent } from 'config/api';
 import IntentionModel from 'components/Introduce/IntentionModel.vue';
-import Banner from 'components/Banner/Banner.vue';
 import AddShopping from 'components/Introduce/AddShopping.vue';
 export default {
   name: 'ServiceDet',
-  components: { IntentionModel, Banner, AddShopping },
+  components: { IntentionModel, AddShopping },
   data() {
     return {
-      showPage: 100,
       obj: {
         name: '',
         id: '',
diff --git a/src/views/ServiceMarket/ServiceMarket.vue b/src/views/ServiceMarket/ServiceMarket.vue
index d487357..94120fb 100644
--- a/src/views/ServiceMarket/ServiceMarket.vue
+++ b/src/views/ServiceMarket/ServiceMarket.vue
@@ -3,12 +3,13 @@
  * @email: 18603454788@163.com
  * @Date: 2021-01-13 17:18:13
  * @LastEditors: wally
- * @LastEditTime: 2021-01-13 18:03:42
+ * @LastEditTime: 2021-01-15 21:43:33
 -->
 
 <template>
   <div>
     <!-- <left-nav style="float: left" /> -->
+    <banner :show-page="showPage" />
     <div>
       <router-view></router-view>
     </div>
@@ -16,12 +17,39 @@
 </template>
 
 <script>
-// import LeftNav from './components/LeftNav.vue';
+import Banner from 'components/Banner/Banner.vue';
 export default {
   name: 'ServiceMarket',
-  // components: { LeftNav },
+  components: { Banner },
   data() {
-    return {};
+    return {
+      str: '',
+      showPage: 11,
+    };
+  },
+  watch: {
+    $route(to, from) {
+      if (to.fullPath === '/ServiceMarket/Institute') {
+        this.showPage = 21;
+      } else if (to.fullPath === '/ServiceMarket/InnovativeService') {
+        this.showPage = 22;
+      } else if (to.fullPath === '/ServiceMarket/ServiceDet') {
+        this.showPage = 37;
+      } else {
+        this.showPage = 35;
+      }
+    },
+  },
+  created() {
+    if (this.$route.fullPath === '/ServiceMarket/Institute') {
+      this.showPage = 21;
+    } else if (this.$route.fullPath === '/ServiceMarket/InnovativeService') {
+      this.showPage = 22;
+    } else if (this.$route.fullPath === '/ServiceMarket/ServiceDet') {
+      this.showPage = 37;
+    } else {
+      this.showPage = 35;
+    }
   },
 };
 </script>