From 30e359594fd68c44a957fb9843398eacba72dea6 Mon Sep 17 00:00:00 2001
From: binbin0314 <binbin0314@126.com>
Date: Thu, 21 Jan 2021 10:01:08 +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/Activity/ActDetails.vue             | 45 ++++++++++++++-----
 .../Children/ShareChild/Institute.vue         |  2 +-
 2 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/src/views/Activity/ActDetails.vue b/src/views/Activity/ActDetails.vue
index cd0e304..5c5d97d 100644
--- a/src/views/Activity/ActDetails.vue
+++ b/src/views/Activity/ActDetails.vue
@@ -5,16 +5,36 @@
         <span>{{ actDetail.title }}</span>
       </div>
       <div class="policy-info">
-        <span>
-          <a-icon class="baseColor" style="font-size: 14px; margin-right: 10px" type="clock-circle" />
-          <span>{{ actDetail.time }}</span>
-        </span>
-        <span style="margin-left: 60px">
-          <a-icon class="baseColor" style="margin-right: 10px" type="environment" />
-          <span>{{ actDetail.site }}</span>
-        </span>
+        <div>
+          <span>
+            <a-icon class="baseColor" style="font-size: 14px; margin-right: 10px" type="clock-circle" />
+            <span>{{ actDetail.releaseTime }} - {{ actDetail.closeTime }}</span>
+          </span>
+          <span style="margin-left: 60px">
+            <a-icon class="baseColor" style="margin-right: 10px" type="environment" />
+            <span>{{ actDetail.address }}</span>
+          </span>
+        </div>
+        <!-- </div> -->
+        <!-- <div class="policy-info"> -->
+        <div>
+          <span>
+            <span style="font-size: 14px; margin-right: 10px"> 会议主题：</span>
+            <!-- <a-icon class="baseColor" style="font-size: 14px; margin-right: 10px" type="clock-circle" /> -->
+            <span>{{ actDetail.theme }}</span>
+          </span>
+          <span style="margin-left: 60px">
+            <!-- <a-icon class="baseColor" style="margin-right: 10px" type="environment" /> -->
+            <span>{{ actDetail.organization }}</span>
+          </span>
+        </div>
+        <div>
+          <span style="font-size: 14px; margin-right: 10px"> 主讲嘉宾：</span>
+          <span>{{ actDetail.name }}</span>
+        </div>
       </div>
       <div class="policy-content" v-dompurify-html="actDetail.content"></div>
+      <div class="policy-other" v-if="actDetail.other">其他事宜:{{ actDetail.other }}</div>
       <a-button disabled style="margin: 50px 25px" v-if="actDetail.releaseTime && Date.parse(actDetail.releaseTime) < Date.parse(nowData)">
         报名已结束
       </a-button>
@@ -89,9 +109,10 @@ export default {
 }
 
 .policy-info {
-  height: 76px;
-  line-height: 76px;
+  height: 150px;
+  line-height: 50px;
   text-align: center;
+  margin-bottom: 50px;
 }
 
 .policy-content {
@@ -132,4 +153,8 @@ export default {
   right: 20px;
   bottom: 20px;
 }
+
+.policy-other {
+  margin: 50px 25px;
+}
 </style>
diff --git a/src/views/NewPlatform/Children/ShareChild/Institute.vue b/src/views/NewPlatform/Children/ShareChild/Institute.vue
index 4a82f69..de04691 100644
--- a/src/views/NewPlatform/Children/ShareChild/Institute.vue
+++ b/src/views/NewPlatform/Children/ShareChild/Institute.vue
@@ -152,7 +152,7 @@ export default {
         const res = await teamSearch(params);
         const { code, msg, data } = res.data;
         if (code === 200) {
-          if (data && data.length > 0) {
+          if (data && data[0].teamMemberList.length > 0) {
             this.obj = data[0];
           }
         }