diff --git a/public/index.html b/public/index.html index 4123528..45f657b 100644 --- a/public/index.html +++ b/public/index.html @@ -4,6 +4,8 @@ + + <%= htmlWebpackPlugin.options.title %> diff --git a/src/App.vue b/src/App.vue index ed72b3f..fbc2922 100644 --- a/src/App.vue +++ b/src/App.vue @@ -80,7 +80,6 @@ export default { } a { text-decoration: none; - display: block; } ul { list-style: none; diff --git a/src/assets/img/teacher/归档.zip b/src/assets/img/teacher/归档.zip deleted file mode 100644 index 0b37d94..0000000 Binary files a/src/assets/img/teacher/归档.zip and /dev/null differ diff --git a/src/components/headTail/head.vue b/src/components/headTail/head.vue index e8bc967..73a3920 100644 --- a/src/components/headTail/head.vue +++ b/src/components/headTail/head.vue @@ -4,7 +4,7 @@
- +

瑜璟缘国际文化礼仪培训

@@ -84,6 +84,9 @@ export default { handleSelect(key, keyPath) { // console.log(key, keyPath); }, + goHome() { + this.$router.push({path: "/homg"}) + } }, }; @@ -115,6 +118,7 @@ export default { // background-color: antiquewhite; margin: 5px; float: left; + cursor: pointer; img { width: 100%; height: 100%; diff --git a/src/components/sidebar/sidebar.vue b/src/components/sidebar/sidebar.vue index 198ba72..10d0efd 100644 --- a/src/components/sidebar/sidebar.vue +++ b/src/components/sidebar/sidebar.vue @@ -160,7 +160,7 @@ export default { margin-left: 10px; h3 { width: 90%; - margin: 5px; + margin: 5px 0; font-size: 14px; overflow: hidden; text-overflow: ellipsis; @@ -168,7 +168,7 @@ export default { } span { overflow: hidden; - color: rgb(214, 214, 206); + color: #999; text-overflow: ellipsis; display: -webkit-box; -webkit-line-clamp: 3; diff --git a/src/page/cultivate/particulars.vue b/src/page/cultivate/particulars.vue index 73fdb31..a576bbc 100644 --- a/src/page/cultivate/particulars.vue +++ b/src/page/cultivate/particulars.vue @@ -2,11 +2,6 @@
-

{{data.title}}

{{data.publishDate}}

@@ -36,7 +31,7 @@ export default { }, methods: { getDetail() { - homeService.getNewsDetail(this.id).then(res => { + return homeService.getNewsDetail(this.id).then(res => { res.publishDate = moment(res.publishDate).format("YYYY-MM-DD") this.data = res }) @@ -49,17 +44,27 @@ export default { homeService.getView(data).then(res => {}) } */ }, - created() { - this.getDetail() - if(this.$route.params.ifjournalism){ + async created() { + if (this.$route.params.ifjournalism) { this.ifjournalism = this.$route.params.ifjournalism console.log(this.ifjournalism); } - if(this.ifjournalism==1){ + if (this.ifjournalism == 1) { this.textTop= "优秀案例" }else{ this.textTop= "新闻资讯" } + + await this.getDetail() + + if (this.data) { + let head = document.getElementsByTagName('head'); + let meta = document.createElement('meta'); + document.querySelector('meta[name="keywords"]').setAttribute('content', this.data.seoKeywords) + document.querySelector('meta[name="description"]').setAttribute('content', this.data.seoDescription) + head[0].appendChild(meta) + document.title = this.data.seoTitle + } }, }; @@ -71,6 +76,7 @@ export default { text-align: center; } .leftBox { + width: 75%; p { text-align: center; padding: 10px; diff --git a/src/page/home/home.vue b/src/page/home/home.vue index 8cf801b..7f918c0 100644 --- a/src/page/home/home.vue +++ b/src/page/home/home.vue @@ -324,14 +324,14 @@ export default { width: 660px; h3 { width: 90%; - margin: 5px; + margin: 5px 0; font-size: 16px; } span { height: 55px; overflow: hidden; line-height: 19px; - color: rgb(214, 214, 206); + color: #999; text-overflow: ellipsis; display: -webkit-box; -webkit-line-clamp: 3; diff --git a/src/page/journalism/journalism.vue b/src/page/journalism/journalism.vue index efc3eed..f1b27dc 100644 --- a/src/page/journalism/journalism.vue +++ b/src/page/journalism/journalism.vue @@ -6,10 +6,10 @@
-->
-

{{item.title}}

+

{{item.title}}

{{item.assistantTitle}}

{{item.publishDate}} {{item.view}}
@@ -81,7 +81,7 @@ export default { margin-left: 20px; h3 { font-size: 14px; - padding-bottom: 20px; + padding-bottom: 4px; } .imgBox { overflow: hidden; @@ -102,6 +102,7 @@ export default { -webkit-box-orient: vertical; line-height: 20px; overflow: hidden; + color: #999; } .time { display: block; diff --git a/src/page/teaching/detail.vue b/src/page/teaching/detail.vue index 4918a07..b085122 100644 --- a/src/page/teaching/detail.vue +++ b/src/page/teaching/detail.vue @@ -32,6 +32,7 @@ 足迹培训

+
部分授课照片

@@ -41,7 +42,6 @@

-
diff --git a/src/page/teaching/foreign.vue b/src/page/teaching/foreign.vue deleted file mode 100644 index dec6370..0000000 --- a/src/page/teaching/foreign.vue +++ /dev/null @@ -1,58 +0,0 @@ - - \ No newline at end of file diff --git a/src/page/teaching/teacher.vue b/src/page/teaching/teacher.vue deleted file mode 100644 index 966ca21..0000000 --- a/src/page/teaching/teacher.vue +++ /dev/null @@ -1,52 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/page/teaching/teaching.js b/src/page/teaching/teaching.js index 7308285..fa61d8e 100644 --- a/src/page/teaching/teaching.js +++ b/src/page/teaching/teaching.js @@ -1147,7 +1147,7 @@ export default { }, s15: { topImg: 's15.png', - name: '', + name: '商务服务英语讲师--李赛赛Saisai', bgInfo: ``, course: `《商务英语演讲技巧》
如何克服怯场? diff --git a/src/page/teaching/teaching.vue b/src/page/teaching/teaching.vue index 9be5456..741e800 100644 --- a/src/page/teaching/teaching.vue +++ b/src/page/teaching/teaching.vue @@ -6,7 +6,7 @@

{{item.name}}

- {{item.bgInfo}} +
@@ -85,8 +85,8 @@ export default { cursor: pointer; .logo { border-radius: 50%; - width: 150px; - height: 150px; + width: 100px; + height: 100px; margin: 20px; float: left; } @@ -103,8 +103,11 @@ export default { margin-top: 10px; font-size: 12px; height: 85px; + color: #999; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 5; overflow: hidden; - color: rgb(203, 190, 190); } } } diff --git a/src/router/index.js b/src/router/index.js index 2a0edeb..7a606f7 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -104,7 +104,7 @@ const routes = [ { path: '/invite', meta:{ - title:"新闻咨询" + title:"我要应聘" }, component: r => require.ensure([], () => r(require('@/page/serve/invite.vue')), 'invite') },