From 91bcd46196ba57657662a4db661e2df96cecf8e4 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 23 Mar 2021 09:18:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B7=AF=E5=BE=84=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/api.js | 11 +- src/views/Business/Business.vue | 2 +- src/views/Business/components/SearchBox.vue | 82 +++--------- src/views/Challenge/Children/Notice.vue | 124 ++++++++++-------- src/views/Challenge/Children/Release.vue | 22 +++- .../Challenge/Children/components/Publish.vue | 49 +++++-- .../Children/components/Unveiling.vue | 21 ++- src/views/Develop/components/AddModel.vue | 22 +++- 8 files changed, 193 insertions(+), 140 deletions(-) diff --git a/src/config/api.js b/src/config/api.js index 453eed5..82158af 100644 --- a/src/config/api.js +++ b/src/config/api.js @@ -10,7 +10,7 @@ const wiki = `${proxyUrl}/wiki`; // const page = `${wiki}/page`; // 创新平台相关操作 const policy = `${proxyUrl}/policy/policy`; // 创新政策相关接口 const activity = `${wiki}/activity`; // 创新政策相关接口 -const Business = `${wiki}/Business`; // 生态企业和合作伙伴查询 +const Business = `${wiki}/business`; // 生态企业和合作伙伴查询 const carousel = `${wiki}/carousel`; // 轮播图相关接口 const page = `${wiki}/page`; // 页面详情相关接口 const achInstr = `${wiki}/achInstr`; // 轮播图相关接口 @@ -50,10 +50,10 @@ export const front = params => axios.post(`${activity}/query/front`, params); export const apply = params => axios.post(`${activity}/apply`, params); // 查询生态企业 -export const frontSearchFriend = params => axios.post(`${Business}/FrontSearchFriend`, params); +export const frontSearchFriend = params => axios.post(`${Business}/frontSearchFriend`, params); // 查询合作伙伴 -export const frontSearchCompany = params => axios.post(`${Business}/FrontSearchCompany`, params); +export const frontSearchCompany = params => axios.post(`${Business}/frontSearchCompany`, params); // 介绍页面详情查询 export const getPageDetail = params => axios.post(`${page}/detail`, params); @@ -126,7 +126,10 @@ export const selTelease = params => axios.post(`${releaseTheList}/selTelease`, p export const addUnveiling = params => axios.post(`${releaseTheList}/addUnveiling`, params); // 创新挑战揭榜成功列表查询 -export const selfulUnveilingList = params => axios.post(`${releaseTheList}/selfulUnveilingList`, params); +export const selResultPublicity = params => axios.post(`${releaseTheList}/selResultPublicity`, params); + +// 创新挑战发榜类型查询 +export const findTypeList = params => axios.post(`${releaseTheList}/findTypeList`, params); // 创业学院内容查询 export const back = params => axios.post(`${wiki}/academy/query/back`, params); diff --git a/src/views/Business/Business.vue b/src/views/Business/Business.vue index 624f474..be8694b 100644 --- a/src/views/Business/Business.vue +++ b/src/views/Business/Business.vue @@ -66,7 +66,7 @@ export default { pageSize: 9, total: 10, typeNum: '', - bannerNum: '', + bannerNum: [], titleText: '', }; }, diff --git a/src/views/Business/components/SearchBox.vue b/src/views/Business/components/SearchBox.vue index b63ec8f..3db323d 100644 --- a/src/views/Business/components/SearchBox.vue +++ b/src/views/Business/components/SearchBox.vue @@ -1,40 +1,21 @@ diff --git a/src/views/Challenge/Children/components/Unveiling.vue b/src/views/Challenge/Children/components/Unveiling.vue index bc5ce66..aa37060 100644 --- a/src/views/Challenge/Children/components/Unveiling.vue +++ b/src/views/Challenge/Children/components/Unveiling.vue @@ -37,6 +37,9 @@ + + 还没有登录，请您先去登录 （点击确定前往登录） + @@ -58,7 +61,9 @@ export default { formLayout: 'horizontal', form: this.$form.createForm(this, { name: '揭榜' }), visible: false, + visible1: false, confirmLoading: false, + confirmLoading1: false, codeNum: '', // 验证码 setData: { accepterName: '', // 揭榜人姓名 @@ -69,16 +74,26 @@ export default { }, }; }, - computed: mapState('user', ['picCode']), - + computed: mapState('user', ['picCode', 'anyringToken']), methods: { ...mapActions('user', ['sendCode', 'sendPicCode']), showModal() { - this.visible = true; + if (this.anyringToken) { + this.visible = true; + } else { + this.visible1 = true; + } }, handleCancel(e) { this.visible = false; }, + handleCancel1() { + this.visible1 = false; + }, + // 点击确定 + handleOk1() { + this.$router.push('/login'); + }, changePhone(e) { this.setData.phone = e.target.value; }, diff --git a/src/views/Develop/components/AddModel.vue b/src/views/Develop/components/AddModel.vue index f471e00..1ca5911 100644 --- a/src/views/Develop/components/AddModel.vue +++ b/src/views/Develop/components/AddModel.vue @@ -46,6 +46,9 @@ + + 还没有登录，请您先去登录 （点击确定前往登录） + @@ -72,11 +75,13 @@ export default { return { form: this.$form.createForm(this, { name: 'submit' }), visible: false, + visible1: false, title: '项目合作', str: '项目合作', formItemLayout, formTailLayout, confirmLoading: false, + confirmLoading1: false, platform: { companyName: '', // 公司名称 manName: '', // 联系人 @@ -100,7 +105,7 @@ export default { ], }; }, - computed: mapState('user', ['picCode', 'user']), + computed: mapState('user', ['picCode', 'user', 'anyringToken']), async created() { this.sendPicCode(); await this.getUserSer(); @@ -121,13 +126,24 @@ export default { ...mapActions('home', ['getUserSer']), // 显示表单输入框 showModal() { - this.visible = true; - console.log(this.value); + console.log(this.anyringToken); + if (this.anyringToken) { + this.visible = true; + } else { + this.visible1 = true; + } }, // 取消显示 handleCancel(e) { this.visible = false; }, + handleCancel1() { + this.visible1 = false; + }, + // 点击确定 + handleOk1() { + this.$router.push('/login'); + }, // 验证电话 changePhone(e) { this.platform.tel = e.target.value;