From d43c123ea077e3d65aa83950e2f5a27ce4f31baf Mon Sep 17 00:00:00 2001
From: lucky <srf428110@163.com>
Date: Fri, 15 Jan 2021 22:34:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/About/About.vue                     |  2 +-
 src/views/Challenge/Challenge.vue             |  2 +-
 src/views/Develop/Develop.vue                 |  2 +-
 src/views/Hatch/Hatch.vue                     |  2 +-
 .../ServiceMarket/Children/Institute.vue      | 59 +++++++------------
 5 files changed, 25 insertions(+), 42 deletions(-)

diff --git a/src/views/About/About.vue b/src/views/About/About.vue
index 910da9d..e8aa62c 100644
--- a/src/views/About/About.vue
+++ b/src/views/About/About.vue
@@ -8,7 +8,7 @@
 <template>
   <div>
     <banner :show-page="showPage" />
-    <div class="inner" style="margin-top: 50px; margin-bottom: 100px">
+    <div class="inner" style="margin-top: 15px; margin-bottom: 100px">
       <left-nav style="float: left" />
       <div style="width: 83%; float: right">
         <router-view></router-view>
diff --git a/src/views/Challenge/Challenge.vue b/src/views/Challenge/Challenge.vue
index 11109f7..a261d7f 100644
--- a/src/views/Challenge/Challenge.vue
+++ b/src/views/Challenge/Challenge.vue
@@ -8,7 +8,7 @@
 <template>
   <div>
     <banner :show-page="61" v-show="showBanner === 1" />
-    <div class="inner" style="margin-top: 50px; margin-bottom: 100px">
+    <div class="inner" style="margin-top: 15px; margin-bottom: 100px">
       <left-nav style="float: left" />
       <div style="width: 83%; float: right">
         <router-view></router-view>
diff --git a/src/views/Develop/Develop.vue b/src/views/Develop/Develop.vue
index 8d52bcc..09a6a89 100644
--- a/src/views/Develop/Develop.vue
+++ b/src/views/Develop/Develop.vue
@@ -12,7 +12,7 @@
     <banner :show-page="41" />
     <div class="inner" style="padding: 0 25px; padding-bottom: 50px">
       <!-- <p class="dev-title">维基数智</p> -->
-      <div class="dev-content line-height-30">
+      <div class="dev-content line-height-30 mt-8">
         <div>
           传控科技成立于2015年8月，由资深电子产品工程师携自动化和计算机专业相关同仁创立，
           围绕时物链条构建软硬件开放平台，致力于成为智能传感器控制系统解决方案和关键设备供应商。
diff --git a/src/views/Hatch/Hatch.vue b/src/views/Hatch/Hatch.vue
index 99fe2c7..504be84 100644
--- a/src/views/Hatch/Hatch.vue
+++ b/src/views/Hatch/Hatch.vue
@@ -8,7 +8,7 @@
 <template>
   <div>
     <banner :show-page="showPage" />
-    <div class="inner" style="margin-top: 50px; margin-bottom: 100px">
+    <div class="inner" style="margin-top: 15px; margin-bottom: 100px">
       <left-nav style="float: left" />
       <div style="width: 83%; float: right">
         <router-view></router-view>
diff --git a/src/views/ServiceMarket/Children/Institute.vue b/src/views/ServiceMarket/Children/Institute.vue
index 631933d..638d298 100644
--- a/src/views/ServiceMarket/Children/Institute.vue
+++ b/src/views/ServiceMarket/Children/Institute.vue
@@ -51,18 +51,27 @@
       </div>
     </div>
     <div class="inner pb-10">
-      <div class="d-flex flex-row flex-wrap">
-        <div
-          :class="(index + 1) % 3 === 0 ? 'mr0' : ''"
-          :key="index"
-          class="pic-box pb-10"
-          v-for="(item,index) in partners"
-        >
-          <div class="pic d-flex align-center justify-center">
-            <img :src="item.url" class="fill-width fill-height" />
-            <span class="font-bold-18 white--text">{{ item.title }}</span>
+      <div v-if="partners && partners.length > 0">
+        <div :key="i" v-for="(list,i) in partners">
+          <div
+            class="d-flex flex-row flex-wrap"
+            v-if="list.backendSearchList && list.backendSearchList.length > 0"
+          >
+            <div
+              :class="(index + 1) % 3 === 0 ? 'mr0' : ''"
+              :key="index"
+              class="pic-box pb-10"
+              v-for="(item,index) in list.backendSearchList"
+            >
+              <div class="pic d-flex align-center justify-center">
+                <img :src="item.logoUrl" class="fill-width fill-height" />
+                <span class="font-bold-18 white--text">{{ item.name }}</span>
+              </div>
+              <div
+                class="pic-introduce d-flex justify-start flex-column pa-3 px-5"
+              >{{ item.description }}</div>
+            </div>
           </div>
-          <div class="pic-introduce d-flex justify-center flex-column px-5">{{ item.introduce }}</div>
         </div>
       </div>
     </div>
@@ -81,32 +90,6 @@ export default {
     return {
       title: '中心介绍',
       typeOfPlatform: '研究院',
-      list: [
-        {
-          id: 1,
-          title: '服务1',
-          introduce: '研究院的介绍包含研究院，公司架构，和各中心的介绍。各中心介绍包含科创体系',
-          url: 'https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/20210104/86d502b304944e0c849bff8dcf55ac08.jpg',
-        },
-        {
-          id: 2,
-          title: '服务1',
-          introduce: '研究院的介绍包含研究院，公司架构，和各中心的介绍。各中心介绍包含科创体系',
-          url: 'https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/20210104/86d502b304944e0c849bff8dcf55ac08.jpg',
-        },
-        {
-          id: 3,
-          title: '服务1',
-          introduce: '研究院的介绍包含研究院，公司架构，和各中心的介绍。各中心介绍包含科创体系',
-          url: 'https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/20210104/86d502b304944e0c849bff8dcf55ac08.jpg',
-        },
-        {
-          id: 4,
-          title: '服务1',
-          introduce: '研究院的介绍包含研究院，公司架构，和各中心的介绍。各中心介绍包含科创体系',
-          url: 'https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/20210104/86d502b304944e0c849bff8dcf55ac08.jpg',
-        },
-      ],
       treedata: [
         {
           //一定一定要注意这里有[]
@@ -214,7 +197,7 @@ export default {
 
   .pic-introduce {
     width: 100%;
-    height: 94px;
+    height: 110px;
     background: #EBEBEB;
   }
 }