From 7b87278d463307be78ece47b2884ef63060d63c3 Mon Sep 17 00:00:00 2001
From: rose <1942951600@qq.com>
Date: Thu, 22 Apr 2021 18:51:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/HeadNav/HeadNav.vue       |  2 +-
 src/config/api.js                        |  7 ++++++
 src/views/Activity/ActDetails.vue        | 29 +++++++++++++++++++++---
 src/views/Challenge/Children/Release.vue |  1 +
 src/views/Hatch/Children/Space.vue       | 26 ++++++++++++++++++++-
 5 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/src/components/HeadNav/HeadNav.vue b/src/components/HeadNav/HeadNav.vue
index 57952fa..03da5bd 100644
--- a/src/components/HeadNav/HeadNav.vue
+++ b/src/components/HeadNav/HeadNav.vue
@@ -149,7 +149,7 @@ export default {
               url: '/Activity',
             },
             {
-              title: '活动报到',
+              title: '活动报道',
               url: '/Activity?type=1',
             },
           ],
diff --git a/src/config/api.js b/src/config/api.js
index da7f032..90acb53 100644
--- a/src/config/api.js
+++ b/src/config/api.js
@@ -19,6 +19,7 @@ const user = `${wiki}/user`; // 用户相关接口
 const product = `${wiki}/product`; // 产品相关接口
 const tutorRelated = `${wiki}/tutorRelated`; // 导师相关接口
 const releaseTheList = `${wiki}/releaseTheList`; // 创新挑战相关接口
+const place = `${wiki}/place`; // 入驻场地接口
 // websocket基础地址
 export const WS_BASE_URL = msgUrl;
 
@@ -46,6 +47,9 @@ export const industryInfo = params => axios.post(`${wiki}/industryInfo/beforeSea
 // 查询活动公告列表
 export const front = params => axios.post(`${activity}/query/front`, params);
 
+// 查询活动公告详情
+export const detail = params => axios.post(`${activity}/query/detail`, params);
+
 // 申请加入活动
 export const apply = params => axios.post(`${activity}/apply`, params);
 
@@ -116,6 +120,9 @@ export const selTeacher = () => axios.post(`${tutorRelated}/selTeacher`);
 // 入驻企业申请
 export const Settled = params => axios.post(`${wiki}/place/apply`, params);
 
+// 入驻企业查询(前台)
+export const searchPlaceFront = params => axios.post(`${place}/searchFront`, params);
+
 // 创新挑战发榜功能
 export const addTelease = params => axios.post(`${releaseTheList}/addTelease`, params);
 
diff --git a/src/views/Activity/ActDetails.vue b/src/views/Activity/ActDetails.vue
index 818abc8..27ecc9f 100644
--- a/src/views/Activity/ActDetails.vue
+++ b/src/views/Activity/ActDetails.vue
@@ -14,7 +14,7 @@
           <span>{{ actDetail.address }}</span>
         </span>
       </div>
-      <div class="policy-content" v-dompurify-html="actDetail.content"></div>
+      <div class="policy-content" v-dompurify-html="content"></div>
       <a-button disabled style="margin: 50px 25px" v-if="actDetail.releaseTime && Date.parse(actDetail.releaseTime) < Date.parse(nowData)">
         报名已结束
       </a-button>
@@ -30,12 +30,16 @@
 
 <script>
 import { mapState } from 'vuex';
+import { detail } from 'config/api';
 import Enroll from './components/Enroll.vue';
 export default {
   name: 'ActDetails',
   components: { Enroll },
   data() {
-    return { nowData: '' };
+    return { 
+      nowData: '',
+      content: '',
+    };
   },
   computed: mapState('home', ['actDetail']),
   created() {
@@ -55,8 +59,27 @@ export default {
       ':' +
       aData.getSeconds();
     console.log(this.nowData); //2019-8-20
+    this.getDetail()
+    console.log(this.actDetail)
+  },
+  methods: {
+    // 获取活动公告列表
+    async getDetail() {
+      try {
+        console.log(this.actDetail.activityId)
+        const params = {param: {activityId: this.actDetail.activityId,},};
+        const res = await detail(params);
+        const { data, msg, code } = res.data;
+        if (code === 200) {         
+          // const { actDetail } = this.actDetail
+          this.content = data.content
+          // this.actDetail= {...actDetail}
+        }
+      } catch (error) {
+        console.log(error);
+      }
+    },
   },
-  methods: {},
 };
 </script>
 
diff --git a/src/views/Challenge/Children/Release.vue b/src/views/Challenge/Children/Release.vue
index c15e76a..ed1b372 100644
--- a/src/views/Challenge/Children/Release.vue
+++ b/src/views/Challenge/Children/Release.vue
@@ -94,6 +94,7 @@ export default {
             endTime: this.endTime,
             pageNum: this.current,
             pageSize: 8,
+            billboardStatus: 1,
           },
         };
         const res = await selTelease(params);
diff --git a/src/views/Hatch/Children/Space.vue b/src/views/Hatch/Children/Space.vue
index 8e0bfed..5e9cff2 100644
--- a/src/views/Hatch/Children/Space.vue
+++ b/src/views/Hatch/Children/Space.vue
@@ -75,7 +75,7 @@
 </template>
 <script>
 import AddModel from './components/AddModel.vue';
-
+import { searchPlaceFront } from 'config/api';
 export default {
   name: 'Space',
   components: { AddModel },
@@ -114,6 +114,9 @@ export default {
       colorList: ['rgba(19, 172, 196, 0.3)', 'rgba(19,96,196,0.3)', 'rgba(162,19,196,0.3)', 'rgba(19,196,72,0.3)'],
     };
   },
+  created() {
+    this.getData();
+  },
   methods: {
     jumpUrl(index) {
       if (index === 0) {
@@ -122,6 +125,27 @@ export default {
         this.$router.push('/Hatch/Fictitious');
       }
     },
+    async getData() {
+      try {
+        const params = {
+          param: {
+            placeType: 2,
+            pageNum: 1,
+            pageSize: 10,
+          },
+        };
+        const res = await searchPlaceFront(params);
+        const { data, msg, code } = res.data;
+        if (code === 200) {
+          console.log(data)
+          // this.lists = data.list;
+          // this.total = parseInt(data.total);
+        }
+      } catch (error) {
+        console.log(error);
+      }
+    },
+    
   },
 };
 </script>