Browse Source

修改部分bug

master
rose 4 years ago
parent
commit
7b87278d46
  1. 2
      src/components/HeadNav/HeadNav.vue
  2. 7
      src/config/api.js
  3. 29
      src/views/Activity/ActDetails.vue
  4. 1
      src/views/Challenge/Children/Release.vue
  5. 26
      src/views/Hatch/Children/Space.vue

2
src/components/HeadNav/HeadNav.vue

@ -149,7 +149,7 @@ export default {
url: '/Activity', url: '/Activity',
}, },
{ {
title: '活动报', title: '活动报',
url: '/Activity?type=1', url: '/Activity?type=1',
}, },
], ],

7
src/config/api.js

@ -19,6 +19,7 @@ const user = `${wiki}/user`; // 用户相关接口
const product = `${wiki}/product`; // 产品相关接口 const product = `${wiki}/product`; // 产品相关接口
const tutorRelated = `${wiki}/tutorRelated`; // 导师相关接口 const tutorRelated = `${wiki}/tutorRelated`; // 导师相关接口
const releaseTheList = `${wiki}/releaseTheList`; // 创新挑战相关接口 const releaseTheList = `${wiki}/releaseTheList`; // 创新挑战相关接口
const place = `${wiki}/place`; // 入驻场地接口
// websocket基础地址 // websocket基础地址
export const WS_BASE_URL = msgUrl; 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 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); 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 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); export const addTelease = params => axios.post(`${releaseTheList}/addTelease`, params);

29
src/views/Activity/ActDetails.vue

@ -14,7 +14,7 @@
<span>{{ actDetail.address }}</span> <span>{{ actDetail.address }}</span>
</span> </span>
</div> </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 disabled style="margin: 50px 25px" v-if="actDetail.releaseTime && Date.parse(actDetail.releaseTime) < Date.parse(nowData)">
报名已结束 报名已结束
</a-button> </a-button>
@ -30,12 +30,16 @@
<script> <script>
import { mapState } from 'vuex'; import { mapState } from 'vuex';
import { detail } from 'config/api';
import Enroll from './components/Enroll.vue'; import Enroll from './components/Enroll.vue';
export default { export default {
name: 'ActDetails', name: 'ActDetails',
components: { Enroll }, components: { Enroll },
data() { data() {
return { nowData: '' }; return {
nowData: '',
content: '',
};
}, },
computed: mapState('home', ['actDetail']), computed: mapState('home', ['actDetail']),
created() { created() {
@ -55,8 +59,27 @@ export default {
':' + ':' +
aData.getSeconds(); aData.getSeconds();
console.log(this.nowData); //2019-8-20 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> </script>

1
src/views/Challenge/Children/Release.vue

@ -94,6 +94,7 @@ export default {
endTime: this.endTime, endTime: this.endTime,
pageNum: this.current, pageNum: this.current,
pageSize: 8, pageSize: 8,
billboardStatus: 1,
}, },
}; };
const res = await selTelease(params); const res = await selTelease(params);

26
src/views/Hatch/Children/Space.vue

@ -75,7 +75,7 @@
</template> </template>
<script> <script>
import AddModel from './components/AddModel.vue'; import AddModel from './components/AddModel.vue';
import { searchPlaceFront } from 'config/api';
export default { export default {
name: 'Space', name: 'Space',
components: { AddModel }, 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)'], 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: { methods: {
jumpUrl(index) { jumpUrl(index) {
if (index === 0) { if (index === 0) {
@ -122,6 +125,27 @@ export default {
this.$router.push('/Hatch/Fictitious'); 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> </script>

Loading…
Cancel
Save