更新代码

src/common/portrait.styl

@@ -319,6 +319,9 @@
   width:100%;
 }
 
+img{
+  max-width: 100%
+}
 // font
 .font-big{
   font-size: 60px;
@@ -426,6 +429,15 @@ h2{
   color: #13ACC4;
 }
 
+.ant-btn-link{
+  border-color: transparent!important;
+}
+
+.ant-btn-primary-disabled, .ant-btn-primary.disabled, .ant-btn-primary[disabled], .ant-btn-primary-disabled:hover, .ant-btn-primary.disabled:hover, .ant-btn-primary[disabled]:hover, .ant-btn-primary-disabled:focus, .ant-btn-primary.disabled:focus, .ant-btn-primary[disabled]:focus, .ant-btn-primary-disabled:active, .ant-btn-primary.disabled:active, .ant-btn-primary[disabled]:active, .ant-btn-primary-disabled.active, .ant-btn-primary.disabled.active, .ant-btn-primary[disabled].active{
+  border-color: #d9d9d9!important;
+  color: rgba(0, 0, 0, 0.25)!important;
+}
+
 .base-bg{
   background: #13ACC4
 }
@@ -455,3 +467,7 @@ h2{
 .line-height-30{
   line-height: 30px
 }
+
+.line-height-36{
+  line-height: 36px
+}

src/components/CoreOrgan/CoreOrgan.vue

@@ -0,0 +1,65 @@
+<!--
+  Copyright (c) 2020.
+  author: song
+  email: 15235360226@163.com
+  -->
+
+<template>
+  <div>
+    <div class="words-content">
+      <span class="font-16 white line-height-36" v-dompurify-html="content"></span>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapState, mapMutations, mapActions } from 'vuex';
+import { getPageDetail } from 'config/api';
+
+export default {
+  name: 'RichText',
+  props: {
+    title: {
+      type: String,
+      default: '',
+    },
+  },
+
+  data() {
+    return { content: '' };
+  },
+
+  // computed: mapState('home', ['titleCode']),
+
+  async created() {
+    // this.setContent('');
+    await this.getPageDetail(this.title);
+  },
+
+  methods: {
+    // ...mapMutations('home', ['setContent']),
+    // ...mapActions('home', ['getPageDetail']),
+
+    async getPageDetail(titleCode) {
+      try {
+        const params = {
+          param: { titleCode },
+        };
+        const res = await getPageDetail(params);
+        const { code, msg, data } = res.data;
+        if (code === 200) {
+          if (data && data.length > 0 && data[0] && data[0].length > 0 && data[0][0].detail) {
+            this.content = data[0][0].detail.content;
+          }
+        } else {
+          message.error(msg || '查询失败');
+          throw msg;
+        }
+      } catch (error) {
+        // throw new Error(`SignIn.vue method getCode: ${error}`);
+        console.log(error);
+      }
+    },
+  },
+};
+</script>

src/components/FooterPage/FooterPage.vue

@@ -28,7 +28,10 @@
           <div>400-789-789</div>
         </div>
         <div class="box">
-          <img class="pic" src="~assets/code.png" />
+          <img
+            class="pic"
+            src="https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/logo/lvgu.jpg"
+          />
         </div>
       </div>
     </div>

src/components/HeadNav/HeadNav.vue

@@ -2,13 +2,23 @@
   <div class="head">
     <img @click="jumUrl('/')" alt class="logo-img" src="@/assets/logo.png" style="cursor: pointer" />
     <div class="li-box">
-      <a-dropdown :disabled="item.children.length > 0 ? false : true" :key="a" class="list-down" v-for="(item, a) in list">
+      <a-dropdown
+        :disabled="item.children.length > 0 ? false : true"
+        :key="a"
+        class="list-down"
+        v-for="(item, a) in list"
+      >
         <a @click="jumUrl(item.url)" class="ant-dropdown-link">
           {{ item.name }}&nbsp;&nbsp;
           <a-icon type="down" v-show="item.children.length > 0" />
         </a>
         <a-menu slot="overlay">
-          <a-menu-item :key="b" class="px-6 py-3" style="text-align: center" v-for="(con, b) in item.children">
+          <a-menu-item
+            :key="b"
+            class="px-6 py-3"
+            style="text-align: center"
+            v-for="(con, b) in item.children"
+          >
             <a @click="jumUrl(con.url)">{{ con.title }}</a>
           </a-menu-item>
         </a-menu>
@@ -19,7 +29,12 @@
       <template slot="title">
         <span>点击查看购物车！</span>
       </template>
-      <a-icon @click="$router.push('/Cart')" class="icon-head baseColor" style="right: 100px" type="shopping-cart" />
+      <a-icon
+        @click="$router.push('/Cart')"
+        class="icon-head baseColor"
+        style="right: 100px"
+        type="shopping-cart"
+      />
     </a-tooltip>
     <router-link tag="span" to="/login">
       <a-icon class="icon-head" style="right: 50px" type="user" />
@@ -73,7 +88,7 @@ export default {
               url: '/NewPlatform/News',
             },
             {
-              title: '科技创新服务',
+              title: '知识培训服务平台',
               url: '/NewPlatform/NewService',
             },
           ],

src/components/Index/IndexNewList.vue

@@ -11,6 +11,7 @@
       <img class="bullhorn ml-4" src="@/assets/bullhorn.png" />
       <div class="flex-1"></div>
       <a-button
+        @click="$router.push('/ItInformation')"
         class="d-flex align-center font-16 baseColor"
         style="display: inline-block;"
         type="link"
@@ -24,6 +25,7 @@
       <img class="bullhorn ml-4" src="@/assets/bullhorn.png" />
       <div class="flex-1"></div>
       <a-button
+        @click="$router.push('/Activity')"
         class="d-flex align-center font-16 baseColor"
         style="display: inline-block;"
         type="link"

src/components/Introduce/ContactUs.vue

@@ -35,7 +35,7 @@
           <a-icon class="baseColor icon-size" type="wechat" />
           <img
             alt
-            src="https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2059927486,2456161292&fm=26&gp=0.jpg"
+            src="https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/logo/lvgu.jpg"
           />
         </div>
       </div>

src/components/Introduce/PartnerShip.vue

@@ -11,7 +11,7 @@
         class="font-bold-24 title-color"
       >{{ item.typeOfTech===0 ? '高校' : item.typeOfTech===1 ? '院所' : '企业' }}</p>
       <div
-        class="d-flex flex-wrap"
+        class="d-flex flex-wrap pointer"
         v-if="item.backendSearchList && item.backendSearchList.length > 0"
       >
         <div

src/components/Introduce/RichText.vue

@@ -7,7 +7,11 @@
 <template>
   <div>
     <div class="words-content">
-      <span class="font-16 textColor line-height-30" v-dompurify-html="content"></span>
+      <span
+        class="font-16 textColor line-height-36"
+        v-dompurify-html="content"
+        v-if="titleCode === title"
+      ></span>
     </div>
   </div>
 </template>
@@ -27,7 +31,7 @@ export default {
     return {};
   },
 
-  computed: mapState('home', ['content']),
+  computed: mapState('home', ['content', 'titleCode']),
 
   async created() {
     this.setContent('');
@@ -40,5 +44,3 @@ export default {
   },
 };
 </script>
-
-<style lang="stylus" scoped></style>

src/store/modules/home/actions.js

@@ -56,6 +56,7 @@ const actions = {
       if (code === 200) {
         if (data && data.length > 0 && data[0] && data[0].length > 0 && data[0][0].detail) {
           commit('setContent', data[0][0].detail.content);
+          commit('setTitleCode', data[0][0].detail.titleCode);
         }
       } else {
         message.error(msg || '查询失败');
@@ -74,7 +75,7 @@ const actions = {
    * 11  关于我们-公司介绍
    * 12  关于我们-组织机构
    * 32  创新平台-创新资源平台
-   * 33  创新平台-科技创新服务
+   * 33  创新平台-知识培训服务平台
    * 41  孵化平台-众创空间
    * 42  孵化平台-公共实验室
    * 43  孵化平台-中试基地

src/store/modules/home/mutations.js

@@ -117,6 +117,15 @@ const mutations = {
     state.content = data;
   },
 
+  /**
+   * 存储介绍页TitleCode
+   * @param {object} state
+   * @param {object} code
+   */
+  setTitleCode(state, code) {
+    state.titleCode = code;
+  },
+
   /**
    * 改变子页面banner图
    * @param {object} state

src/store/modules/home/state.js

@@ -20,6 +20,7 @@ const state = {
   actCurrent: 1, // 活动公告当前处于第几页
   actDetail: {}, // 当前活动公告详情
   content: '', // 介绍页图文
+  titleCode: '', // 介绍页titleCode
   bannerLists: [], // 子页面banner图
   partners: [], // 合作伙伴 衍生企业
   // 公司介绍

src/views/About/Children/Introduce.vue

@@ -22,7 +22,7 @@ export default {
   components: { Banner, HNav, BreadCrumb, RichText },
   data() {
     return {
-      title: '公司介绍',
+      title: '关于我们-公司介绍',
       showPage: 11,
       arr: [
         { name: '关于我们', url: '/About/Introduce' },

src/views/About/Children/Organ.vue

@@ -5,13 +5,7 @@
     <div class="inner">
       <bread-crumb :arr="arr" />
       <div class="white pa-5 my-5">
-        <!-- <rich-text :title="title" /> -->
+        <rich-text :title="title" />
-        <div class="d-flex flex-column align-center">
-          <div class="d-flex flex-row align-start fill-width mb-6">
-            公司下设行政事业部、创新事业部、孵化事业部和产业事业部。联系人：小武 电话：0351-5223175
-          </div>
-          <img src="~assets/jiagou.png" />
-        </div>
       </div>
     </div>
   </div>
@@ -21,14 +15,14 @@
 import Banner from 'components/Banner/Banner.vue';
 import HNav from './../components/HNav.vue';
 import BreadCrumb from 'components/BreadCrumb/BreadCrumb.vue';
-// import RichText from 'components/Introduce/RichText.vue';
+import RichText from 'components/Introduce/RichText.vue';
 
 export default {
   name: 'Introduce',
-  components: { Banner, HNav, BreadCrumb },
+  components: { Banner, HNav, BreadCrumb, RichText },
   data() {
     return {
-      title: '组织机构',
+      title: '关于我们-组织机构',
       showPage: 12,
       arr: [
         { name: '关于我们', url: '/About/Introduce' },

src/views/Activity/Activity.vue

@@ -22,15 +22,20 @@
       />
     </div>
     <div class="policy-box">
-      <div :key="index" class="div-box" v-for="(item, index) in lists">
+      <div :key="index" class="policy-list" v-for="(item, index) in lists">
-        <div @click="jumpDetails(item)" style="cursor: pointer">
+        <div @click="jumpDetails(item)" class="date-box pointer" v-if="item.releaseTime">
-          <p class="item-title">{{ item.title }}</p>
+          <p class="date-mon">{{ monthEnglish[item.releaseTime.split('-')[1] - 1] }}.</p>
-          <p class="item-content">{{ item.content }}</p>
+          <p class="date-day">{{ item.releaseTime.split(' ')[0].split('-')[2] }}</p>
-          <p class="source-time">
-            <span class="source">时间：{{ item.releaseTime }}-{{ item.closeTime }}</span>
-            <span class="time">地点：{{ item.address }}</span>
-          </p>
         </div>
+        <p @click="jumpDetails(item)" class="item-title pointer">{{ item.title }}</p>
+        <p @click="jumpDetails(item)" class="item-content pointer">{{ item.content }}</p>
+        <p class="source-time">
+          <span class="source">
+            时间：{{ item.releaseTime }}
+            <span v-if="item.closeTime">-{{ item.closeTime }}</span>
+          </span>
+          <span class="source">地点：{{ item.address }}</span>
+        </p>
         <p class="original">
           <enroll :fnval="item.activityId" />
           <!-- <a-button type="primary">立即报名</a-button> -->
@@ -70,6 +75,7 @@ export default {
       },
       aList: [],
       lists: [],
+      monthEnglish: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Spt', 'Oct', 'Nov', 'Dec'],
     };
   },
   computed: mapState('home', ['actList', 'actIpCon', 'actCurrent']),
@@ -135,11 +141,13 @@ export default {
       this.setActList(this.aList);
       this.getData();
     },
+
     // 改变当前显示页数
     onShowSizeChange(current, size) {
       this.setActCurrent(current);
       this.getData();
     },
+
     // 跳转到详情界面
     jumpDetails(item) {
       this.setActDetail(item);
@@ -162,10 +170,18 @@ export default {
   background: #fff;
 }
 
+.search {
+  position: absolute;
+  right: 24px;
+  top: 20px;
+}
+
 .policy-box {
-  .div-box {
+  .policy-list {
     position: relative;
+    width: 100%;
     height: 238px;
+    overflow: hidden;
     background: #fff;
     box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
     margin-top: 24px;
@@ -174,9 +190,10 @@ export default {
 }
 
 .item-title {
+  margin-left: 200px;
   overflow: hidden;
   display: -webkit-box;
-  font-size: 20px;
+  font-size: 24px;
   color: rgba(0, 0, 0, 0.65);
   font-family: Microsoft YaHei;
   font-weight: bold;
@@ -185,18 +202,19 @@ export default {
 }
 
 .item-content {
+  margin-left: 200px;
   text-indent: 2em;
+  font-size: 16px;
+  color: rgba(0, 0, 0, 0.35);
+  font-family: Microsoft YaHei;
   overflow: hidden;
   display: -webkit-box;
-  font-size: 14px;
+  -webkit-line-clamp: 4;
-  color: rgba(0, 0, 0, 0.65);
-  font-family: Microsoft YaHei;
-  font-weight: bold;
-  -webkit-line-clamp: 3;
   -webkit-box-orient: vertical;
 }
 
 .source {
+  cursor: pointer;
   font-family: Microsoft YaHei;
   font-weight: 400;
   opacity: 1;
@@ -207,6 +225,7 @@ export default {
   font-size: 14px;
   font-family: Microsoft YaHei;
   font-weight: 400;
+  color: rgba(0, 0, 0, 0.25);
   opacity: 1;
 }
 
@@ -218,7 +237,6 @@ export default {
   font-family: Microsoft YaHei;
   font-weight: 400;
   line-height: 22px;
-  color: rgba(0, 0, 0, 0.65);
   opacity: 1;
   margin-bottom: 0;
 
@@ -227,10 +245,42 @@ export default {
   }
 }
 
+.date-box {
+  height: 188px !important;
+  width: 188px !important;
+  position: absolute !important;
+  top: 0 !important;
+  // box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
+  text-align: center;
+  box-shadow: none !important;
+  padding: 25px;
+  margin-top: 24px;
+
+  p {
+    margin-bottom: 0 !important;
+  }
+}
+
+.date-mon {
+  font-size: 40px;
+  height: 40px;
+  line-height: 40px;
+  font-weight: 500;
+  color: #13ACC4;
+}
+
+.date-day {
+  font-size: 70px;
+  height: 80px;
+  line-height: 80px;
+  font-weight: bold;
+  color: #13ACC4;
+}
+
 .source-time {
+  margin-left: 200px;
   position: absolute;
-  bottom: 60px;
+  bottom: 26px;
-  color: rgba(0, 0, 0, 0.45);
   margin-bottom: 0;
 }
 
@@ -238,10 +288,4 @@ export default {
   margin-top: 68px;
   text-align: right;
 }
-
-.search {
-  position: absolute;
-  right: 24px;
-  top: 20px;
-}
 </style>

src/views/ContactUs/ContactUs.vue

@@ -27,10 +27,7 @@ export default {
   data() {
     return {
       title: '联系我们',
-      arr: [
+      arr: [{ name: '联系我们', url: '' }],
-        { name: '关于我们', url: '/About/Introduce' },
-        { name: '联系我们', url: '' },
-      ],
     };
   },
 };

src/views/FirstPage/FirstPage.vue

@@ -11,7 +11,7 @@
         <a-col :span="18">
           <a-row>
             <a-col :key="server.id" :span="8" v-for="server in services">
-              <div class="base-bg mr-8 d-flex">
+              <div @click="$router.push(server.url)" class="base-bg mr-8 d-flex pointer">
                 <div class="server-box pa-5 mb-3 d-flex flex-column white--text fill-width">
                   <span class="font-big">{{ server.chinese }}</span>
                   <span class="font-small">{{ server.english }}</span>
@@ -40,7 +40,8 @@
         <a-col :span="6">
           <div
             :key="platform.id"
-            class="second-base-bg white--text platform-box mb-8 d-flex flex-column justify-center align-center"
+            @click="$router.push(platform.url)"
+            class="second-base-bg white--text platform-box mb-8 d-flex flex-column justify-center align-center pointer"
             v-for="platform in platforms"
           >
             <div class="font-small font-bold">{{ platform.firstName }}</div>
@@ -63,35 +64,40 @@ export default {
   data() {
     return {
       services: [
-        { id: '01', chinese: '创新服务', english: 'INNOVATIVE' },
+        { id: '01', chinese: '创新服务', english: 'INNOVATIVE', url: '/NewPlatform/NewCore' },
-        { id: '02', chinese: '孵化服务', english: 'INCUBATION' },
+        { id: '02', chinese: '孵化服务', english: 'INCUBATION', url: '/IncubationPlatform/MakerSpace' },
-        { id: '03', chinese: '产业服务', english: 'INDUSTRIAL' },
+        { id: '03', chinese: '产业服务', english: 'INDUSTRIAL', url: '/Industry/Union' },
       ],
       platforms: [
         {
           id: '04',
           firstName: '创新挑战',
           secondName: '',
+          url: '/Challenge/Solicitation',
         },
         {
           id: '05',
           firstName: '科技资源开放共享',
           secondName: '服务平台',
+          url: '/NewPlatform/Share',
         },
         {
           id: '06',
           firstName: '知识产权与技术',
           secondName: '转移转化服务平台',
+          url: '/NewPlatform/Transfer',
         },
         {
           id: '07',
           firstName: '知识培训服务平台',
           secondName: '',
+          url: '/Knowledge',
         },
         {
           id: '08',
           firstName: '知识培训服务平台',
           secondName: '',
+          url: '/NewPlatform/NewService',
         },
       ],
       lists: [

src/views/IncubationPlatform/Children/PilotBase.vue

@@ -22,7 +22,7 @@ export default {
   components: { Banner, HNav, BreadCrumb, RichText },
   data() {
     return {
-      title: '中试基地',
+      title: '孵化平台-中试基地',
       showPage: 43,
       arr: [
         { name: '孵化平台', url: '/IncubationPlatform/MakerSpace' },

src/views/IncubationPlatform/Children/PublicLaboratory.vue

@@ -22,7 +22,7 @@ export default {
   components: { Banner, HNav, BreadCrumb, RichText },
   data() {
     return {
-      title: '公共实验室',
+      title: '孵化平台-公共实验室',
       showPage: 42,
       arr: [
         { name: '孵化平台', url: '/IncubationPlatform/MakerSpace' },

src/views/IncubationPlatform/Children/Tutor.vue

@@ -33,7 +33,7 @@ export default {
   components: { Banner, HNav, BreadCrumb, RichText },
   data() {
     return {
-      title: '创业导师',
+      title: '孵化平台-创业导师',
       showPage: 44,
       arr: [
         { name: '孵化平台', url: '/IncubationPlatform/MakerSpace' },

src/views/ItInformation/ItInformation.vue

@@ -5,24 +5,20 @@
   -->
 
 <template>
-  <div class="box">
+  <div class="inner">
-    <div :key="item.title" class="info-box" v-for="item in lists">
+    <div class="policy-box">
-      <div class="date-box">
+      <div :key="index" class="policy-list" v-for="(item, index) in lists">
-        <p class="date-mon">{{ monthEnglish[item.time.split('-')[1] - 1] }}.</p>
+        <div @click="jumpDetails(item)" class="date-box pointer" v-if="item.time">
-        <p class="date-day">{{ item.time.split('-')[2] }}</p>
+          <p class="date-mon">{{ monthEnglish[item.time.split('-')[1] - 1] }}.</p>
+          <p class="date-day">{{ item.time.split(' ')[0].split('-')[2] }}</p>
+        </div>
+        <p @click="jumpDetails(item)" class="item-title pointer">{{ item.title }}</p>
+        <p @click="jumpDetails(item)" class="item-content pointer">{{ item.content }}</p>
+        <p class="source-time">
+          <span class="source">时间：{{ item.time }}</span>
+          <span class="source">地点：{{ item.site }}</span>
+        </p>
       </div>
-      <!-- 标题 -->
-      {{ item.title }}
-      <!-- 描述 -->
-      {{ item.description }}
-      <!-- 内容 -->
-      {{ item.content }}
-      <!-- 地点 -->
-      {{ item.site }}
-      <!--  -->
-      {{ item.spreadDepartment }}
-      <!-- 时间 -->
-      {{ item.time }}
     </div>
     <a-pagination
       :current="current"
@@ -38,6 +34,7 @@
 </template>
 
 <script>
+import { mapState, mapMutations } from 'vuex';
 import { industryInfo } from 'config/api';
 export default {
   name: 'ItInformation',
@@ -55,12 +52,13 @@ export default {
     this.getData();
   },
   methods: {
+    ...mapMutations('home', ['setActDetail']),
     async getData() {
       try {
         const params = {
           param: {
-            pageNum: 1,
+            pageNum: this.current,
-            pageSize: 5,
+            pageSize: this.pageSize,
           },
         };
         const res = await industryInfo(params);
@@ -79,36 +77,93 @@ export default {
         this.$message.error(error);
       }
     },
+
     onShowSizeChange(current) {
-      console.log(current);
+      this.current = current;
+      this.getData();
+    },
+
+    // 跳转到详情界面
+    jumpDetails(item) {
+      this.setActDetail(item);
+      this.$router.push('/ActDetails');
     },
   },
 };
 </script>
 
 <style scoped lang="stylus">
-.box {
+.inner {
-  width: 1260px;
+  margin: 40px auto;
-  min-height: 1037px;
+}
-  margin: 80px auto;
+
+.policy-box {
+  .policy-list {
+    position: relative;
+    width: 100%;
+    height: 238px;
+    overflow: hidden;
+    background: #fff;
+    box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
+    margin-top: 24px;
+    padding: 25px;
+  }
+}
+
+.item-title {
+  margin-left: 200px;
   overflow: hidden;
-  opacity: 1;
+  display: -webkit-box;
+  font-size: 24px;
+  color: rgba(0, 0, 0, 0.65);
+  font-family: Microsoft YaHei;
+  font-weight: bold;
+  -webkit-line-clamp: 1;
+  -webkit-box-orient: vertical;
 }
 
-.info-box {
+.item-content {
-  position: relative;
+  margin-left: 200px;
-  width: 100%;
+  text-indent: 2em;
-  height: 238px;
+  font-size: 16px;
+  color: rgba(0, 0, 0, 0.35);
+  font-family: Microsoft YaHei;
   overflow: hidden;
-  background: #fff;
+  display: -webkit-box;
-  box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
+  -webkit-line-clamp: 4;
-  margin-top: 24px;
+  -webkit-box-orient: vertical;
-  padding: 25px;
 }
 
-.pagination {
+.source {
-  margin-top: 68px;
+  cursor: pointer;
-  text-align: right;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  opacity: 1;
+  margin-right: 24px;
+}
+
+.time {
+  font-size: 14px;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  color: rgba(0, 0, 0, 0.25);
+  opacity: 1;
+}
+
+.original {
+  position: absolute;
+  right: 25px;
+  bottom: 25px;
+  font-size: 14px;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  line-height: 22px;
+  opacity: 1;
+  margin-bottom: 0;
+
+  span {
+    cursor: pointer;
+  }
 }
 
 .date-box {
@@ -119,6 +174,8 @@ export default {
   // box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
   text-align: center;
   box-shadow: none !important;
+  padding: 25px;
+  margin-top: 24px;
 
   p {
     margin-bottom: 0 !important;
@@ -140,4 +197,16 @@ export default {
   font-weight: bold;
   color: #13ACC4;
 }
+
+.source-time {
+  margin-left: 200px;
+  position: absolute;
+  bottom: 26px;
+  margin-bottom: 0;
+}
+
+.pagination {
+  margin-top: 68px;
+  text-align: right;
+}
 </style>

src/views/Knowledge/Knowledge.vue

@@ -3,7 +3,9 @@
     <div class="inner">
       <bread-crumb :arr="arr" />
     </div>
-    <div class="inner dev-box">平台建设中...</div>
+    <div class="dev-box">
+      <img src="~assets/build.png" />
+    </div>
   </div>
 </template>
 
@@ -26,13 +28,14 @@ export default {
 
 <style lang="stylus" scoped>
 .inner {
-  margin: 10px auto 15px;
+  margin: 20px auto;
 }
 
 .dev-box {
-  height: 600px;
+  width: 100%;
-  line-height: 600px;
+
-  text-align: center;
+  img {
-  font-size: 50px;
+    width: 100%;
+  }
 }
 </style>

src/views/NewPlatform/Children/Core.vue

@@ -7,12 +7,9 @@
     <div class="top-box">
       <div class="top-title">协同创新中心</div>
       <div class="top-content">
-        山西绿谷生物科技股份有限公司立足功能食品、生物医药和大健康产业，聚焦“创新”、聚力“孵化”、聚合“产业”，
+        <!-- <div class="white pa-5 my-5"> -->
-        致力建设集创新链、孵化链和产业链为一体，产学研协同、多学科交叉、大中小企业融通、
+        <core-organ :title="title" />
-        线上线下相结合的融合发展机制和开放式创新创业平台，培育打造全链条一体化新型社会研发机构和创新创业生态系统，
+        <!-- </div> -->
-        构筑专业化、集群化、园区化、产业发展新模式和新业态。公司秉持“创新、开放、协同、融合”发展理
-        念，以“赋能健康中国，筑梦绿色未来”为愿景，以“构建创新创业生态，发展特色产业集群，打造全链条一体化开放
-        式创新创业高地”为使命，大力推动建设“共融共生，共建 共创”价值共同体。
       </div>
     </div>
     <div class="center-box">
@@ -21,8 +18,8 @@
         <div style="margin-left: 40px">组织机构</div>
       </div>
       <div class="center-content">
-        公司采取理事会、经理层、事业部组织架构，公司理事会组成按理事会章程执行，经理层设总经理 1 名、副总经理 2-3 名，各事业部设部长 1
+        <!-- <core-organ :title="title1" /> -->
-        名、副部长 1 名。
+        <rich-text :title="title1" />
       </div>
     </div>
     <div class="bottom-box">
@@ -31,7 +28,10 @@
         <div style="margin-left: 40px">中心架构</div>
       </div>
       <div class="bottom-content">
-        <div id="treeChart" :style="{ height: '500px' }"></div>
+        <div
+          class="font-16 textColor line-height-36"
+        >协同创新中心围绕研发领域设立功能食品、现代医药、生物医学工程及数字健康开发四大协同创新平台，根据研发方向设若干研发单元。</div>
+        <div :style="{ height: '500px' }" id="treeChart"></div>
       </div>
     </div>
     <div class="partner-box">
@@ -49,9 +49,7 @@
         <div style="margin-left: 40px">申请加入</div>
       </div>
       <div class="join-content">
-        申请加入文字介绍申请加入文字介绍申请加入文字介绍申请加入文字介绍申请加入文字介绍申请加入文字介绍
+        申请加入文字介绍
-        申请加入文字介绍申请加入文字介绍申请加入文字介绍申请加入文字介绍申请加入文字介绍申请加入文字介绍
-        申请加入文字介绍申请加入文字介绍申请加入文字介绍申请加入文字介绍申请加入文字介绍申请加入文字介绍申请加入文字介绍申请加入文字介绍
         <div>
           <new-model />
         </div>
@@ -66,13 +64,17 @@ import HNav from './../components/HNav.vue';
 import BreadCrumb from 'components/BreadCrumb/BreadCrumb.vue';
 import DeEnt from './components/DeEnt.vue';
 import NewModel from './../components/NewModel.vue';
+import RichText from 'components/Introduce/RichText.vue';
+import CoreOrgan from 'components/CoreOrgan/CoreOrgan.vue';
+
 export default {
   name: 'Core',
-  components: { HNav, BreadCrumb, DeEnt, NewModel },
+  components: { HNav, BreadCrumb, DeEnt, NewModel, RichText, CoreOrgan },
   data() {
     return {
       str: '这是中心界面',
-      title: '协同创新中心',
+      title: '创新平台-协同创新中心',
+      title1: '创新平台-组织机构',
       typeOfPlatform: '创新平台',
       arr: [
         { name: '创新平台', url: '/NewPlatform/NewCore' },
@@ -82,19 +84,37 @@ export default {
       treedata: [
         {
           //一定一定要注意这里有[]
-          name: '本科发展方向',
+          name: '协同创新中心',
           children: [
-            { name: '考研' },
             {
-              name: '就业',
+              name: '功能食品协同创新平台',
-              children: [{ name: '相关就业详见菜单栏‘培养方向’' }],
+              children: [
+                { name: '功能食品资源开发' },
+                { name: '营养健康功能因子分再鉴定及作用机制探究' },
+                { name: '功能食品关键加工技术研发' },
+                { name: '功能食品安全评价与风险监测' },
+              ],
+            },
+            {
+              name: '现代医药协同创新平台',
+              children: [
+                { name: '中医药与天然药物资源开发利用' },
+                { name: '医药生物技术' },
+                { name: '新药研发' },
+                { name: '药理药效研究与安全评价' },
+              ],
+            },
+            {
+              name: '生物医学工程协同创新平台',
+              children: [{ name: '生物信息技术' }, { name: '生物医学工程研发' }, { name: '生物力学和生物材料' }],
             },
-            { name: '考公' },
             {
-              name: '留学',
+              name: '数字健康开发协同创新平台',
-              children: [{ name: '相关文件（申请流程、交换要求）' }],
+              children: [{ name: '健康医疗大数据挖掘与分析' }, { name: '基于纳米传感器的医疗健康' }, { name: '传染病预测预鉴数字技术' }],
             },
-            { name: '创业' },
+            { name: '科技资源共享服务平台' },
+            { name: '知识产权与技术转移转化服务平台' },
+            { name: '知识培训服务平台' },
           ],
         },
       ],

src/views/NewPlatform/Children/Develop.vue

@@ -4,7 +4,9 @@
     <div class="inner">
       <bread-crumb :arr="arr" />
     </div>
-    <div class="inner dev-box">平台建设中...</div>
+    <div class="dev-box">
+      <img src="~assets/build.png" />
+    </div>
   </div>
 </template>
 
@@ -32,13 +34,14 @@ export default {
 
 <style lang="stylus" scoped>
 .inner {
-  margin: 10px auto 15px;
+  margin: 20px auto;
 }
 
 .dev-box {
-  height: 600px;
+  width: 100%;
-  line-height: 600px;
+
-  text-align: center;
+  img {
-  font-size: 50px;
+    width: 100%;
+  }
 }
 </style>

src/views/NewPlatform/Children/Platform.vue

@@ -6,16 +6,21 @@
       <bread-crumb :arr="arr" />
     </div>
     <div class="content-box">
-      <div v-for="(item, index) in list" :key="index" style="margin-top: 50px; cursor: pointer" @click="jump(item.url)">
+      <div
-        <div v-if="index % 2 === 0" class="d-flex justify-space-between">
+        :key="index"
+        @click="jump(item.url)"
+        style="margin-top: 50px; cursor: pointer"
+        v-for="(item, index) in list"
+      >
+        <div class="d-flex justify-space-between" v-if="index % 2 === 0">
           <div class="introduce-box">
             <p class="introduce-title">{{ item.title }}</p>
             <p class="introduce-content">{{ item.content }}</p>
           </div>
-          <img style="width: 452px" :src="item.imgUrl" />
+          <img :src="item.imgUrl" style="width: 452px" />
         </div>
-        <div v-else class="d-flex justify-space-between">
+        <div class="d-flex justify-space-between" v-else>
-          <img style="width: 452px" :src="item.imgUrl" />
+          <img :src="item.imgUrl" style="width: 452px" />
           <div class="introduce-box">
             <p class="introduce-title">{{ item.title }}</p>
             <p class="introduce-content">{{ item.content }}</p>
@@ -45,25 +50,19 @@ export default {
       list: [
         {
           title: '科技资源开放共享服务平台',
-          content:
+          content: '研发试验、检验检测、资源共享',
-            '山西绿谷生物科技股份有限公司立足功能食品、生物医药和大健康产业，聚焦“创新”、聚力“孵化”、聚合“产业”，' +
-            '致力建设集创新链、孵化链和产业链为一体，产学研协同、多学科交叉、大中小企业...',
           imgUrl: 'https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/20210104/86d502b304944e0c849bff8dcf55ac08.jpg',
           url: '/NewPlatform/Share',
         },
         {
           title: '知识产权与技术转移转化服务平台',
-          content:
+          content: '知识产权、成果转化、技术转移',
-            '山西绿谷生物科技股份有限公司立足功能食品、生物医药和大健康产业，聚焦“创新”、聚力“孵化”、聚合“产业”，' +
-            '致力建设集创新链、孵化链和产业链为一体，产学研协同、多学科交叉、大中小企业...',
           imgUrl: 'https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/20210104/4f9b898da25e48d3b73b47345ed14a9a.jpg',
           url: '/NewPlatform/Transfer',
         },
         {
           title: '知识培训服务平台',
-          content:
+          content: '技术培训、管理培训、知识讲座',
-            '山西绿谷生物科技股份有限公司立足功能食品、生物医药和大健康产业，聚焦“创新”、聚力“孵化”、聚合“产业”，' +
-            '致力建设集创新链、孵化链和产业链为一体，产学研协同、多学科交叉、大中小企业...',
           imgUrl: 'https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/20210104/f5fb570cfd7547279138a591818325e0.jpg',
           url: '/NewPlatform/Develop',
         },

src/views/NewPlatform/Children/Service.vue

@@ -17,6 +17,17 @@
         >购物车</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>
+    </div>
     <div class="inner d-flex flex-wrap" style="margin: 60px auto">
       <div
         :class="(index + 1) % 4 === 0 ? 'margin-0' : ''"
@@ -48,11 +59,11 @@ export default {
   data() {
     return {
       str: '这是服务界面',
-      title: '科技创新服务',
+      title: '知识培训服务平台',
       typeOfPlatform: '创新平台',
       arr: [
         { name: '创新平台', url: '/NewPlatform/NewCore' },
-        { name: '科技创新服务', url: '' },
+        { name: '知识培训服务平台', url: '' },
       ],
       list: [],
       current: 1,

src/views/NewPlatform/Children/components/DeEnt.vue

@@ -5,7 +5,7 @@
   -->
 
 <template>
-  <div v-if="newPartners && newPartners.length > 0">
+  <!-- <div v-if="newPartners && newPartners.length > 0">
     <div class="d-flex flex-wrap">
       <div
         :class="(index + 1) % 3 === 0 ? 'enterprise-box1' : ''"
@@ -39,6 +39,24 @@
         v-show="newPartners.length > 6"
       />
     </div>
+  </div>-->
+  <div v-if="newPartners && newPartners.length > 0">
+    <div :key="index" class="mb-4" v-for="(item,index) in newPartners">
+      <p
+        class="font-bold-24 title-color"
+      >{{ item.typeOfTech===0 ? '高校' : item.typeOfTech===1 ? '院所' : '企业' }}</p>
+      <div class="d-flex flex-wrap pointer">
+        <div
+          :class="(index+1)%4===0? 'logo-box1' : ''"
+          @click="openProfile(item.name,item.description)"
+          class="logo-box d-flex flex-column align-center white mb-8"
+        >
+          <img :src="item.logoUrl" class="logo-pic my-2" />
+          <div class="font-16 title-color">{{ item.name }}</div>
+        </div>
+      </div>
+    </div>
+    <company-profile :show-profile="showProfile" @closeProfile="closeProfile" v-if="showProfile" />
   </div>
 </template>
 
@@ -82,6 +100,7 @@ export default {
             arr.push(item);
           }
         }
+        console.log('arr: ', arr);
         return arr;
       }
       return arr;

src/views/NewPlatform/components/HNav.vue

@@ -1,8 +1,11 @@
 <template>
   <div class="nav-box d-flex">
-    <div v-for="(item, index) in list" :key="index" :class="activeNum === index ? 'nav-box-active' : ''" @click="jump(item.url)">
+    <div
-      {{ item.title }}
+      :class="activeNum === index ? 'nav-box-active' : ''"
-    </div>
+      :key="index"
+      @click="jump(item.url)"
+      v-for="(item, index) in list"
+    >{{ item.title }}</div>
   </div>
 </template>
 
@@ -23,7 +26,7 @@ export default {
           url: '/NewPlatform/News',
         },
         {
-          title: '科技创新服务',
+          title: '知识培训服务平台',
           url: '/NewPlatform/NewService',
         },
       ],