From ce3a5d0971add24f12bfdbc19f29339a40c72d4c Mon Sep 17 00:00:00 2001 From: chutingting Date: Mon, 21 Sep 2020 16:40:53 +0800 Subject: [PATCH] =?UTF-8?q?edit=20=E6=96=B0=E9=97=BB=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/request.js | 2 +- src/components/sidebar/sidebar.vue | 9 ++------- .../{coursCeentre.vue => coursCeentre}/attestation.vue | 0 .../attestationFingerpost.vue | 0 .../{coursCeentre.vue => coursCeentre}/certificate.vue | 0 src/page/{coursCeentre.vue => coursCeentre}/course.vue | 0 src/page/cultivate/excellent.vue | 9 ++------- src/page/cultivate/particulars.vue | 6 +++--- src/page/home/home.vue | 9 ++------- src/page/journalism/journalism.vue | 9 ++------- src/router/index.js | 9 +++++---- vue.config.js | 4 ++-- 12 files changed, 19 insertions(+), 38 deletions(-) rename src/page/{coursCeentre.vue => coursCeentre}/attestation.vue (100%) rename src/page/{coursCeentre.vue => coursCeentre}/attestationFingerpost.vue (100%) rename src/page/{coursCeentre.vue => coursCeentre}/certificate.vue (100%) rename src/page/{coursCeentre.vue => coursCeentre}/course.vue (100%) diff --git a/src/api/request.js b/src/api/request.js index 0424fc8..ed4d215 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -3,7 +3,7 @@ import { Message } from "element-ui" const service = axios.create({ - baseURL: 'api', // api的base_url + baseURL: 'http://plat.yjyculture.com/C/', timeout: 60000 // 请求超时时间 }) diff --git a/src/components/sidebar/sidebar.vue b/src/components/sidebar/sidebar.vue index 7496b2a..198ba72 100644 --- a/src/components/sidebar/sidebar.vue +++ b/src/components/sidebar/sidebar.vue @@ -56,13 +56,8 @@ export default { }, methods: { goparticulars(item) { - this.$router.push({ - path: "/particulars", - query: { - ifjournalism: 2, - id: item.id - }, - }); + let detailId= item.id + ".html" + this.$router.push({name: "particulars",params:{ id: detailId, ifjournalism: 2}}) }, go(path,index) { this.$router.push(path); diff --git a/src/page/coursCeentre.vue/attestation.vue b/src/page/coursCeentre/attestation.vue similarity index 100% rename from src/page/coursCeentre.vue/attestation.vue rename to src/page/coursCeentre/attestation.vue diff --git a/src/page/coursCeentre.vue/attestationFingerpost.vue b/src/page/coursCeentre/attestationFingerpost.vue similarity index 100% rename from src/page/coursCeentre.vue/attestationFingerpost.vue rename to src/page/coursCeentre/attestationFingerpost.vue diff --git a/src/page/coursCeentre.vue/certificate.vue b/src/page/coursCeentre/certificate.vue similarity index 100% rename from src/page/coursCeentre.vue/certificate.vue rename to src/page/coursCeentre/certificate.vue diff --git a/src/page/coursCeentre.vue/course.vue b/src/page/coursCeentre/course.vue similarity index 100% rename from src/page/coursCeentre.vue/course.vue rename to src/page/coursCeentre/course.vue diff --git a/src/page/cultivate/excellent.vue b/src/page/cultivate/excellent.vue index 76ded7e..db991eb 100644 --- a/src/page/cultivate/excellent.vue +++ b/src/page/cultivate/excellent.vue @@ -34,13 +34,8 @@ export default { }, methods:{ goparticulars(item){ - this.$router.push({ - path:'/particulars', - query:{ - ifjournalism:1, - id: item.id - } - }) + let detailId= item.id + ".html" + this.$router.push({name: "particulars",params:{ id: detailId, ifjournalism: 1}}) }, /* 新闻列表 */ getList() { diff --git a/src/page/cultivate/particulars.vue b/src/page/cultivate/particulars.vue index 136ad18..73fdb31 100644 --- a/src/page/cultivate/particulars.vue +++ b/src/page/cultivate/particulars.vue @@ -30,7 +30,7 @@ export default { return { textTop :"优秀案例", ifjournalism:1 ,//1 => 优秀案例 2 =>新闻详情, - id: this.$route.query.id, + id: this.$route.params.id.split('.')[0], // 截取 .html之前数据 data: {} } }, @@ -51,8 +51,8 @@ export default { }, created() { this.getDetail() - if(this.$route.query.ifjournalism){ - this.ifjournalism = this.$route.query.ifjournalism + if(this.$route.params.ifjournalism){ + this.ifjournalism = this.$route.params.ifjournalism console.log(this.ifjournalism); } if(this.ifjournalism==1){ diff --git a/src/page/home/home.vue b/src/page/home/home.vue index 53fcef5..8cf801b 100644 --- a/src/page/home/home.vue +++ b/src/page/home/home.vue @@ -123,13 +123,8 @@ export default { this.$router.push('/journalism'); }, goparticulars(item) { - this.$router.push({ - path: "/particulars", - query: { - ifjournalism: 2, - id: item.id - } - }); + let detailId= item.id + ".html" + this.$router.push({name: "particulars",params:{ id: detailId, ifjournalism: 2}}) }, go(path) { this.$router.push(`/${path}`); diff --git a/src/page/journalism/journalism.vue b/src/page/journalism/journalism.vue index 90dc010..efc3eed 100644 --- a/src/page/journalism/journalism.vue +++ b/src/page/journalism/journalism.vue @@ -47,13 +47,8 @@ export default { }, methods: { goparticulars(item) { - this.$router.push({ - path: "/particulars", - query: { - ifjournalism: 2, - id: item.id - }, - }); + let detailId= item.id + ".html" + this.$router.push({name: "particulars",params:{ id: detailId, ifjournalism: 2}}) }, /* 新闻列表 */ getNewsList() { diff --git a/src/router/index.js b/src/router/index.js index eefe6cd..4ffa9fc 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -26,7 +26,7 @@ const routes = [ meta:{ title:"认证课程" }, - component: r => require.ensure([], () => r(require('@/page/coursCeentre.vue/attestation.vue')), 'attestation') + component: r => require.ensure([], () => r(require('@/page/coursCeentre/attestation.vue')), 'attestation') }, //课程中心-认证指南 { @@ -34,7 +34,7 @@ const routes = [ meta:{ title:"认证指南" }, - component: r => require.ensure([], () => r(require('@/page/coursCeentre.vue/attestationFingerpost.vue')), 'attestationFingerpost') + component: r => require.ensure([], () => r(require('@/page/coursCeentre/attestationFingerpost.vue')), 'attestationFingerpost') }, //课程中心-证书介绍 { @@ -42,7 +42,7 @@ const routes = [ meta:{ title:"证书介绍" }, - component: r => require.ensure([], () => r(require('@/page/coursCeentre.vue/certificate.vue')), 'certificate') + component: r => require.ensure([], () => r(require('@/page/coursCeentre/certificate.vue')), 'certificate') }, //师资中心-国外名师 { @@ -70,7 +70,8 @@ const routes = [ }, //企业培训-优秀案例 { - path: '/particulars', + path: '/particulars/:ifjournalism/:id', + name: 'particulars', meta:{ title:"案例详情" }, diff --git a/vue.config.js b/vue.config.js index 2e9c59c..ed66acf 100644 --- a/vue.config.js +++ b/vue.config.js @@ -9,7 +9,7 @@ module.exports = { warnings: false, errors: false }, - proxy: { + /* proxy: { '/api': { target: 'http://plat.yjyculture.com/C/', changeOrigin: true, @@ -18,7 +18,7 @@ module.exports = { } }, - } + } */ }, lintOnSave: false, chainWebpack: (config) => {