From e90380f111593371a036be71dfedea461036cd55 Mon Sep 17 00:00:00 2001
From: lucky <srf428110@163.com>
Date: Fri, 8 Jan 2021 17:19:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  6 +--
 src/components/PlatformList/PlatformList.vue  |  2 +-
 src/config/api.js                             |  1 +
 src/store/modules/home/mutations.js           |  9 ++++
 src/store/modules/home/state.js               |  1 +
 .../IncubationPlatform/Children/Services.vue  | 30 ++++++++++--
 src/views/Industry/Children/Serve.vue         | 17 ++++---
 src/views/NewPlatform/Children/Platform.vue   |  7 +--
 src/views/NewPlatform/Children/Service.vue    | 46 +++++++++++++------
 src/views/NewPlatform/Children/ServiceDet.vue | 30 +++++++++---
 .../Children/ShareChild/Institute.vue         | 23 +++++++---
 11 files changed, 127 insertions(+), 45 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 8609bf8..d754181 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -88,9 +88,9 @@ body::-webkit-scrollbar {
   right: 70px;
 }
 #components-back-top-demo-custom .ant-back-top-inner {
-  height: 40px;
-  width: 40px;
-  line-height: 40px;
+  height: 60px;
+  width: 60px;
+  line-height: 60px;
   background: url('assets/t-top.png') center no-repeat;
   background-size: contain;
 }
diff --git a/src/components/PlatformList/PlatformList.vue b/src/components/PlatformList/PlatformList.vue
index ee08fd7..2a8d351 100644
--- a/src/components/PlatformList/PlatformList.vue
+++ b/src/components/PlatformList/PlatformList.vue
@@ -4,7 +4,7 @@
       <div
         :class="(index + 1) % 4 === 0 ? 'margin-0' : ''"
         :key="index"
-        class="item-box mb-6"
+        class="item-box mb-8"
         v-for="(item, index) in list"
       >
         <img :src="item.picUrl" style="height: 220px; width: 100%" v-if="item.picUrl" />
diff --git a/src/config/api.js b/src/config/api.js
index 410d599..517ae8e 100644
--- a/src/config/api.js
+++ b/src/config/api.js
@@ -84,6 +84,7 @@ export const selResMes = params => axios.post(`${achInstr}/selResMes`, params);
 
 // 服务列表查询
 export const selService = params => axios.post(`${greenvalley}/serviceProject/selService`, params);
+
 // 服务详情查询
 export const selContent = params => axios.post(`${greenvalley}/serviceProject/selContent`, params);
 
diff --git a/src/store/modules/home/mutations.js b/src/store/modules/home/mutations.js
index 0473552..514288c 100644
--- a/src/store/modules/home/mutations.js
+++ b/src/store/modules/home/mutations.js
@@ -278,6 +278,15 @@ const mutations = {
   setProductId(state, num) {
     state.productId = num;
   },
+
+  /**
+   * 存储服务详情导航
+   * @param {object} state
+   * @param {object} data
+   */
+  setServiceArr(state, data) {
+    state.serviceArr = data;
+  },
 };
 
 export default mutations;
diff --git a/src/store/modules/home/state.js b/src/store/modules/home/state.js
index fd3dee5..91245d7 100644
--- a/src/store/modules/home/state.js
+++ b/src/store/modules/home/state.js
@@ -55,6 +55,7 @@ const state = {
     isBtn: 0,
   },
   productId: 0, // 当前产品详情Id
+  serviceArr: [], // 服务详情导航
 };
 
 export default state;
diff --git a/src/views/IncubationPlatform/Children/Services.vue b/src/views/IncubationPlatform/Children/Services.vue
index 4e3e07f..9c9d685 100644
--- a/src/views/IncubationPlatform/Children/Services.vue
+++ b/src/views/IncubationPlatform/Children/Services.vue
@@ -21,10 +21,10 @@
       <div
         :class="(index + 1) % 4 === 0 ? 'margin-0' : ''"
         :key="index"
-        class="item-box"
+        class="item-box mb-8"
         v-for="(item, index) in list"
       >
-        <img :src="item.imgUrl" style="height: 220px; width: 100%; border: 1px solid #ccc" />
+        <img :src="item.picUrl" style="height: 220px; width: 100%; border: 1px solid #ccc" />
         <p class="font-24 my-4">{{ item.name }}</p>
         <p
           @click="jump(item.id)"
@@ -49,6 +49,8 @@
 </template>
 
 <script>
+import { mapMutations } from 'vuex';
+import { selService } from 'config/api';
 import Banner from 'components/Banner/Banner.vue';
 import HNav from './../components/HNav.vue';
 import BreadCrumb from 'components/BreadCrumb/BreadCrumb.vue';
@@ -62,7 +64,7 @@ export default {
       showPage: 46,
       arr: [
         { name: '孵化平台', url: '/IncubationPlatform/MakerSpace' },
-        { name: '创业服务', url: '' },
+        { name: '创业服务', url: '/IncubationPlatform/Services' },
       ],
       list: [],
       current: 1,
@@ -71,14 +73,36 @@ export default {
     };
   },
 
+  created() {
+    this.getService();
+  },
+
   methods: {
+    ...mapMutations('home', ['setServiceArr']),
     // 改变单当前页数
     onShowSizeChange(current, size) {
       this.current = current;
     },
+
+    // 获取服务列表
+    async getService() {
+      try {
+        const params = { param: { serviceType: 2 } };
+        const res = await selService(params);
+        const { code, data, msg } = res.data;
+        if (code === 200) {
+          this.list = data;
+        }
+      } catch (error) {
+        console.log(data);
+      }
+    },
+
     // 查看 服务 详情
     jump(id) {
       console.log(id);
+      this.setServiceArr([]);
+      this.setServiceArr(this.arr);
       this.$router.push({
         path: '/NewPlatform/ServiceDet',
         name: 'ServiceDet',
diff --git a/src/views/Industry/Children/Serve.vue b/src/views/Industry/Children/Serve.vue
index 14db995..e0b11f0 100644
--- a/src/views/Industry/Children/Serve.vue
+++ b/src/views/Industry/Children/Serve.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <rotation />
+    <banner :show-page="showPage" />
     <h-nav />
     <div class="inner">
       <bread-crumb :arr="arr" />
@@ -21,7 +21,7 @@
       <div
         :class="(index + 1) % 3 === 0 ? 'margin-0' : ''"
         :key="index"
-        class="item-box"
+        class="item-box mb-8"
         v-for="(item, index) in list"
       >
         <img :src="item.picUrl" style="height: 220px; width: 100%; border: 1px solid #ccc" />
@@ -38,21 +38,23 @@
 </template>
 
 <script>
+import { mapMutations } from 'vuex';
 import { selService } from 'config/api';
 import BreadCrumb from 'components/BreadCrumb/BreadCrumb.vue';
-import Rotation from 'components/Rotation/Rotation.vue';
+import Banner from 'components/Banner/Banner.vue';
 import HNav from './components/HNav.vue';
 export default {
   name: 'Serve',
-  components: { HNav, Rotation, BreadCrumb },
+  components: { HNav, Banner, BreadCrumb },
   data() {
     return {
       title: '产业服务',
       typeOfPlatform: '产业平台',
       arr: [
         { name: '产业平台', url: '/Challenge/Union' },
-        { name: '产业服务', url: '' },
+        { name: '产业服务', url: '/Industry/Serve' },
       ],
+      showPage: 52,
       list: [],
       current: 1,
       pageSize: 8,
@@ -63,10 +65,11 @@ export default {
     this.getService();
   },
   methods: {
+    ...mapMutations('home', ['setServiceArr']),
     // 获取服务列表
     async getService() {
       try {
-        const params = { param: {} };
+        const params = { param: { serviceType: 3 } };
         const res = await selService(params);
         const { code, data, msg } = res.data;
         if (code === 200) {
@@ -78,6 +81,8 @@ export default {
     },
     // 查看 服务 详情
     jump(id) {
+      this.setServiceArr([]);
+      this.setServiceArr(this.arr);
       this.$router.push({
         path: '/NewPlatform/ServiceDet',
         name: 'ServiceDet',
diff --git a/src/views/NewPlatform/Children/Platform.vue b/src/views/NewPlatform/Children/Platform.vue
index 4dcaf6f..7adee6d 100644
--- a/src/views/NewPlatform/Children/Platform.vue
+++ b/src/views/NewPlatform/Children/Platform.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="padding-bottom: 50px">
-    <rotation />
+    <banner :show-page="showPage" />
     <h-nav />
     <div class="inner">
       <bread-crumb :arr="arr" />
@@ -32,12 +32,12 @@
 </template>
 
 <script>
-import Rotation from 'components/Rotation/Rotation.vue';
+import Banner from 'components/Banner/Banner.vue';
 import HNav from './../components/HNav.vue';
 import BreadCrumb from 'components/BreadCrumb/BreadCrumb.vue';
 export default {
   name: 'News',
-  components: { HNav, Rotation, BreadCrumb },
+  components: { HNav, Banner, BreadCrumb },
   data() {
     return {
       str: '这是政策界面',
@@ -47,6 +47,7 @@ export default {
         { name: '创新平台', url: '/NewPlatform/NewCore' },
         { name: '创新资源平台', url: '' },
       ],
+      showPage: 32,
       list: [
         {
           title: '科技资源开放共享服务平台',
diff --git a/src/views/NewPlatform/Children/Service.vue b/src/views/NewPlatform/Children/Service.vue
index cd72b4f..33fffd0 100644
--- a/src/views/NewPlatform/Children/Service.vue
+++ b/src/views/NewPlatform/Children/Service.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <rotation />
+    <banner :show-page="showPage" />
     <h-nav />
     <div class="inner">
       <bread-crumb :arr="arr" />
@@ -17,22 +17,24 @@
         >购物车</span> 后可通过顶部菜单栏的购物车查看。
       </div>
     </div>
-    <div class="fill-width white d-flex flex-column align-center py-10">
-      <img src="~assets/image.jpeg" />
-      <div class="font-16 line-height-36">
-        ① 申请服务：选择服务项目
-        <br />② 提交委托单/协议：电话或其他方式联系买家，填写并提交委托单/协议 线下沟通
-        <br />③ 确认委托单/协议：卖家提供服务时间及价格，买家确认委托单/协议。 签订协议
-        <br />④ 付款：接受线上或线下支付，可分批次付款。
-        <br />⑤ 接受服务：买家提供材料（试验样品或试验方案等），卖家提供服务
-        <br />⑥ 获得结果：卖家提交结果及发票，买家获取结果。
+    <div class="flow-path1 white">
+      <div class="flow-content white d-flex flex-column pb-5">
+        <img src="~assets/image.jpeg" style="width:80%" />
+        <div class="font-16 line-height-36 textColor mt-4">
+          ① 申请服务：选择服务项目
+          <br />② 提交委托单/协议：电话或其他方式联系买家，填写并提交委托单/协议 线下沟通
+          <br />③ 确认委托单/协议：卖家提供服务时间及价格，买家确认委托单/协议。 签订协议
+          <br />④ 付款：接受线上或线下支付，可分批次付款。
+          <br />⑤ 接受服务：买家提供材料（试验样品或试验方案等），卖家提供服务
+          <br />⑥ 获得结果：卖家提交结果及发票，买家获取结果。
+        </div>
       </div>
     </div>
     <div class="inner d-flex flex-wrap" style="margin: 60px auto">
       <div
         :class="(index + 1) % 4 === 0 ? 'margin-0' : ''"
         :key="index"
-        class="item-box"
+        class="item-box mb-8"
         v-for="(item, index) in list"
       >
         <img :src="item.picUrl" style="height: 220px; width: 100%; border: 1px solid #ccc" />
@@ -49,13 +51,14 @@
 </template>
 
 <script>
+import { mapMutations } from 'vuex';
 import { selService } from 'config/api';
-import Rotation from 'components/Rotation/Rotation.vue';
+import Banner from 'components/Banner/Banner.vue';
 import HNav from './../components/HNav.vue';
 import BreadCrumb from 'components/BreadCrumb/BreadCrumb.vue';
 export default {
   name: 'Service',
-  components: { HNav, Rotation, BreadCrumb },
+  components: { HNav, Banner, BreadCrumb },
   data() {
     return {
       str: '这是服务界面',
@@ -63,8 +66,9 @@ export default {
       typeOfPlatform: '创新平台',
       arr: [
         { name: '创新平台', url: '/NewPlatform/NewCore' },
-        { name: '知识培训服务平台', url: '' },
+        { name: '知识培训服务平台', url: '/NewPlatform/NewService' },
       ],
+      showPage: 33,
       list: [],
       current: 1,
       pageSize: 8,
@@ -75,10 +79,11 @@ export default {
     this.getService();
   },
   methods: {
+    ...mapMutations('home', ['setServiceArr']),
     // 获取服务列表
     async getService() {
       try {
-        const params = { param: {} };
+        const params = { param: { serviceType: 1 } };
         const res = await selService(params);
         const { code, data, msg } = res.data;
         if (code === 200) {
@@ -90,6 +95,8 @@ export default {
     },
     // 查看 服务 详情
     jump(id) {
+      this.setServiceArr([]);
+      this.setServiceArr(this.arr);
       this.$router.push({
         path: '/NewPlatform/ServiceDet',
         name: 'ServiceDet',
@@ -132,4 +139,13 @@ export default {
   font-size: 16px;
   color: rgba(0, 0, 0, 0.65);
 }
+
+.flow-path1 {
+  padding: 80px 9%;
+  position: relative;
+
+  .flow-content {
+    width: 80%;
+  }
+}
 </style>
diff --git a/src/views/NewPlatform/Children/ServiceDet.vue b/src/views/NewPlatform/Children/ServiceDet.vue
index 7813757..814ac51 100644
--- a/src/views/NewPlatform/Children/ServiceDet.vue
+++ b/src/views/NewPlatform/Children/ServiceDet.vue
@@ -1,15 +1,26 @@
 <template>
   <div>
-    <rotation />
+    <banner :show-page="showPage" />
+    <div class="inner" style="margin-top:40px">
+      <a-breadcrumb>
+        <a-breadcrumb-item>绿谷生物</a-breadcrumb-item>
+        <a-breadcrumb-item :key="index" v-for="(item,index) in serviceArr">
+          <router-link :to="item.url">{{ item.name }}</router-link>
+        </a-breadcrumb-item>
+      </a-breadcrumb>
+    </div>
     <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" v-dompurify-html="obj.content"></div> -->
+      <div
+        style="margin-bottom: 40px"
+      >山西绿谷生物科技股份有限公司立足功能食品、生物医药和大健康产业，聚焦“创新”、聚力“孵化”、聚合“产业”，致力建设集创新链、孵化链和产业链为一体，产学研协同、多学科交叉、大中小企业融通、线上线下相结合的融合发展机制和开放式创新创业平台，培育打造全链条一体化新型社会研发机构和创新创业生态系统，构筑专业化、集群化、园区化、产业发展新模式和新业态。公司秉持“创新、开放、协同、融合”发展理 念，以“赋能健康中国，筑梦绿色未来”为愿景，以“构建创新创业生态，发展特色产业集群，打造全链条一体化开放 式创新创业高地”为使命，大力推动建设“共融共生，共建 共创”价值共同体。</div>
       <div>
         <!-- <a-button>直接申请</a-button> -->
-        <intention-model style="float: left; margin-right: 20px" :type-data="typeData" />
+        <intention-model :type-data="typeData" style="float: left; margin-right: 20px" />
         <!-- <a-button type="primary">加入购物车</a-button> -->
         <add-shopping :type-data="typeData" />
       </div>
@@ -18,15 +29,17 @@
 </template>
 
 <script>
+import { mapState } from 'vuex';
 import { selContent } from 'config/api';
 import IntentionModel from 'components/Introduce/IntentionModel.vue';
-import Rotation from 'components/Rotation/Rotation.vue';
+import Banner from 'components/Banner/Banner.vue';
 import AddShopping from 'components/Introduce/AddShopping.vue';
 export default {
   name: 'ServiceDet',
-  components: { IntentionModel, Rotation, AddShopping },
+  components: { IntentionModel, Banner, AddShopping },
   data() {
     return {
+      showPage: 100,
       obj: {
         name: '',
         id: '',
@@ -38,10 +51,13 @@ export default {
       },
     };
   },
-  created() {
+  computed: mapState('home', ['serviceArr']),
+
+  async created() {
     this.typeData.Id = this.$route.params.id;
-    this.getData(this.$route.params.id);
+    await this.getData(this.$route.params.id);
   },
+
   methods: {
     async getData(id) {
       try {
diff --git a/src/views/NewPlatform/Children/ShareChild/Institute.vue b/src/views/NewPlatform/Children/ShareChild/Institute.vue
index f83f15e..53c1cdb 100644
--- a/src/views/NewPlatform/Children/ShareChild/Institute.vue
+++ b/src/views/NewPlatform/Children/ShareChild/Institute.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <rotation />
+    <banner :show-page="showPage" />
     <h-nav />
     <div class="inner">
       <bread-crumb :arr="arr" />
@@ -8,10 +8,15 @@
     <div class="inner ins-box">
       <p class="font-bold-24 item-title">设备列表</p>
       <div class="d-flex flex-wrap">
-        <div v-for="(item, index) in list" :key="index" class="item-box" :class="(index + 1) % 4 === 0 ? 'margin-0' : ''">
+        <div
+          :class="(index + 1) % 4 === 0 ? 'margin-0' : ''"
+          :key="index"
+          class="item-box mb-8"
+          v-for="(item, index) in list"
+        >
           <img :src="item.visitLocation" style="height: 220px; width: 100%" />
           <p class="font-24 my-4">{{ item.name }}</p>
-          <p class="font-16 baseColor item-more" @click="jump(item.id)">了解更多→</p>
+          <p @click="jump(item.id)" class="font-16 baseColor item-more">了解更多→</p>
         </div>
       </div>
       <p class="font-bold-24 item-title">人才团队带头人情况</p>
@@ -31,7 +36,10 @@
         </div>
         <div class="header-box" style="flex: 5; background: #fff">
           <p style="border-bottom: 1px solid #eee">{{ obj.name }}</p>
-          <p><span v-if="obj.gender - 0 === 1">男</span> <span v-else-if="obj.gender - 0 === 2">女</span></p>
+          <p>
+            <span v-if="obj.gender - 0 === 1">男</span>
+            <span v-else-if="obj.gender - 0 === 2">女</span>
+          </p>
           <p>{{ obj.famousFamily }}</p>
           <p>{{ obj.birthday }}</p>
           <p>{{ obj.education }}</p>
@@ -54,7 +62,7 @@
           <div class="h-box" style="flex: 1">职称职务</div>
           <div class="h-box" style="flex: 1">研究方向</div>
         </div>
-        <div class="d-flex" v-for="(item, index) in obj.teamMemberList" :key="index">
+        <div :key="index" class="d-flex" v-for="(item, index) in obj.teamMemberList">
           <div class="con-box" style="flex: 1">{{ item.name }}</div>
           <div class="con-box" style="flex: 1">
             <span v-if="item.gender - 0 === 1">男</span>
@@ -74,17 +82,18 @@
 <script>
 import { mapMutations, mapState } from 'vuex';
 import { selInstrumentByRes, teamSearch } from 'config/api';
-import Rotation from 'components/Rotation/Rotation.vue';
+import Banner from 'components/Banner/Banner.vue';
 import HNav from './../../components/HNav.vue';
 import BreadCrumb from 'components/BreadCrumb/BreadCrumb.vue';
 export default {
   name: 'Institute',
-  components: { Rotation, HNav, BreadCrumb },
+  components: { Banner, HNav, BreadCrumb },
   data() {
     return {
       id: 0,
       title: '研究院详情',
       typeOfPlatform: '创新平台',
+      showPage: 32,
       arr: [
         { name: '创新平台', url: '/NewPlatform/NewCore' },
         { name: '创新资源平台', url: '/NewPlatform/News' },