From d4d6473602a314db7945c3cab01d64a46d0a19f4 Mon Sep 17 00:00:00 2001 From: TS-QD1 Date: Sat, 11 Mar 2023 22:56:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0PDF=E8=AF=A6=E6=83=85?= =?UTF-8?q?=EF=BC=8C=E9=A1=B5=E9=9D=A2=E5=A4=B4=E5=B0=BE=E5=93=8D=E5=BA=94?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/components/Footer.vue | 110 +++++++------ src/common/components/Header.vue | 24 ++- src/component/Loading.vue | 1 + src/component/Nav.vue | 3 +- src/pages/Index/components/NewsView1.vue | 11 +- src/pages/Index/components/NewsView2.vue | 11 +- src/pages/Index/components/NewsView3.vue | 11 +- src/pages/Index/components/Swiper.vue | 8 +- src/pages/NewsView/NewsViewUtil.js | 16 +- .../NewsViewDetail/NewsViewDetailAudio.vue | 17 +- .../NewsViewDetail/NewsViewDetailImage.vue | 31 ++-- .../NewsViewDetail/NewsViewDetailPdf.vue | 146 ++++++++++++++++++ .../NewsViewDetail/NewsViewDetailText.vue | 17 +- .../NewsViewDetail/NewsViewDetailVideo.vue | 17 +- src/router/index.js | 11 ++ 15 files changed, 313 insertions(+), 121 deletions(-) create mode 100644 src/pages/NewsViewDetail/NewsViewDetailPdf.vue diff --git a/src/common/components/Footer.vue b/src/common/components/Footer.vue index 13a5798..b5c6b65 100644 --- a/src/common/components/Footer.vue +++ b/src/common/components/Footer.vue @@ -3,30 +3,32 @@
-
-

{{ area.areaName }}公共文化数字云平台

- -

地址：{{ area.areaName }}群众艺术馆

-
-
-

友情链接

- 国家公共文化云 - 西藏群众艺术馆 +
+
+

{{ area.areaName }}公共文化数字云平台

+ +

地址：{{ area.areaName }}群众艺术馆

+
+
+

友情链接

+ 国家公共文化云 + 西藏群众艺术馆 +
  • -

    {{ area.areaName }}公共文化小程序

    +

    {{ area.areaName }}公共文化小程序

  • -

    {{ area.areaName }}公共文化公众号

    +

    {{ area.areaName }}公共文化公众号

  • -

    {{ area.areaName }}公共文化APP

    +

    {{ area.areaName }}公共文化APP

@@ -54,47 +56,45 @@ export default { background #3e3a39 margin-top 20px .footer-top - width 1200px margin 0 auto padding 30px 0 - overflow hidden + display flex + justify-content space-between .footer-left - float left - width 850px - overflow hidden + display flex + flex-direction column .footer-logo display block margin-bottom 15px width 485px height 77px - .footer-us - float left - color #fff - font-size 14px - h4 - line-height 30px - p - line-height 28px - .footer-link - width 570px - margin-left 20px - float left - color #fff - font-size 14px - h4 - line-height 30px - .link-item - display inline-block - width 120px - overflow hidden - white-space nowrap - text-overflow ellipsis - margin-right 10px - line-height 25px + .info-link + display flex + .footer-us + float left color #fff + font-size 14px + h4 + line-height 30px + p + line-height 28px + .footer-link + margin-left 20px + float left + color #fff + font-size 14px + h4 + line-height 30px + .link-item + display inline-block + width 120px + overflow hidden + white-space nowrap + text-overflow ellipsis + margin-right 10px + line-height 28px + color #fff .footer-right - float right - margin-top 80px ul overflow hidden li @@ -103,18 +103,36 @@ export default { text-align center margin-right 10px h4 - font-size 12px + font-size 15px color #fff - margin-bottom 5px + margin-top 10px img width 100px height 100px .footer-bottom border-top solid 1px #f7f7f7 padding 10px 0 - min-width 1200px text-align center + display flex + justify-content center p font-size 14px color #fff + +@media (min-width: 1200px) + .footer-top + width 1200px + +@media (max-width: 1200px) + .footer-top + width 800px + flex-direction column + align-items center + .footer-left + align-items center + .info-link + align-items center + .footer-right + margin-top 20px + diff --git a/src/common/components/Header.vue b/src/common/components/Header.vue index 0c30a85..5c2a9c3 100644 --- a/src/common/components/Header.vue +++ b/src/common/components/Header.vue @@ -128,6 +128,11 @@ export default { }) }, doSearch: function () { + axios.get(`${common.publishUrl}module/app/contentcensusrelease/log`, { + params: { + requestUrl: `网页QUERY${this.keywords}新闻` + } + }); const {href} = this.$router.resolve({ path: '/searchResult', query: { @@ -187,7 +192,6 @@ export default { line-height 40px .top-line-content - width 1200px margin 0 auto span @@ -220,7 +224,6 @@ export default { cursor pointer .header - width 1200px margin 0 auto .logo-search @@ -272,7 +275,6 @@ export default { background #FAFAFA .nav-container - width 1200px margin 0 auto overflow hidden display flex @@ -293,4 +295,20 @@ export default { a display block +@media (min-width: 1200px) + .top-line-content + width 1200px + .header + width 1200px + .nav-container + width 1200px + +@media (max-width: 1200px) + .top-line-content + width 800px + .header + width 800px + .nav-container + width 800px + flex-wrap wrap diff --git a/src/component/Loading.vue b/src/component/Loading.vue index b27c5fb..48369e8 100644 --- a/src/component/Loading.vue +++ b/src/component/Loading.vue @@ -20,4 +20,5 @@ export default { padding 30px border-radius 10px box-shadow 0 0 17px #DEDEDE + z-index 100000 \ No newline at end of file diff --git a/src/component/Nav.vue b/src/component/Nav.vue index 1b9aadd..5d363be 100644 --- a/src/component/Nav.vue +++ b/src/component/Nav.vue @@ -39,7 +39,6 @@ export default { line-height 30px .location-content - width 1200px margin 0 auto font-size 14px color #565656 @@ -54,5 +53,5 @@ export default { width 1200px @media (max-width: 1200px) .location-content - width 768px + width 800px \ No newline at end of file diff --git a/src/pages/Index/components/NewsView1.vue b/src/pages/Index/components/NewsView1.vue index 5e40bf1..a212246 100644 --- a/src/pages/Index/components/NewsView1.vue +++ b/src/pages/Index/components/NewsView1.vue @@ -13,7 +13,7 @@
    -
  • +
  • {{ news.newsContentPublishTime }} @@ -34,6 +34,7 @@ + + diff --git a/src/pages/NewsViewDetail/NewsViewDetailText.vue b/src/pages/NewsViewDetail/NewsViewDetailText.vue index c8ed9a0..7b7d1db 100644 --- a/src/pages/NewsViewDetail/NewsViewDetailText.vue +++ b/src/pages/NewsViewDetail/NewsViewDetailText.vue @@ -38,17 +38,16 @@ export default { Nav }, data() { + let navs = [{name: '详情'}]; + if(this.$route.query.navTitle && this.$route.query.navTitle) { + navs.splice(0, 0, { + to: this.$route.query.navPath, + name: this.$route.query.navTitle + }) + } return { isLoading: false, - navs: [ - { - to: this.$route.query.navPath, - name: this.$route.query.navTitle - }, - { - name: '详情' - } - ], + navs, title: '', author: '', publishDate: '', diff --git a/src/pages/NewsViewDetail/NewsViewDetailVideo.vue b/src/pages/NewsViewDetail/NewsViewDetailVideo.vue index b133b7f..7acf368 100644 --- a/src/pages/NewsViewDetail/NewsViewDetailVideo.vue +++ b/src/pages/NewsViewDetail/NewsViewDetailVideo.vue @@ -38,17 +38,16 @@ export default { Nav }, data () { + let navs = [{name: '详情'}]; + if(this.$route.query.navTitle && this.$route.query.navTitle) { + navs.splice(0, 0, { + to: this.$route.query.navPath, + name: this.$route.query.navTitle + }) + } return { isLoading: false, - navs: [ - { - to: this.$route.query.navPath, - name: this.$route.query.navTitle - }, - { - name: '详情' - } - ], + navs, title: '', playFileId: '', coverFileId: '', diff --git a/src/router/index.js b/src/router/index.js index ff0acdc..9f65a7e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -32,6 +32,7 @@ import NewsViewDetailText from '../pages/NewsViewDetail/NewsViewDetailText' import NewsViewDetailVideo from '../pages/NewsViewDetail/NewsViewDetailVideo' import NewsViewDetailAudio from '../pages/NewsViewDetail/NewsViewDetailAudio' import NewsViewDetailImage from '../pages/NewsViewDetail/NewsViewDetailImage' +import NewsViewDetailPdf from '../pages/NewsViewDetail/NewsViewDetailPdf' Vue.use(Router) @@ -319,6 +320,16 @@ export default new Router({ title: `${common.area.areaName}公共文化数字云平台`, keepAlive: false } + }, + { + path: '/newsViewDetailPdf/:newsContentId', + name: 'newsViewDetailPdf', + component: NewsViewDetailPdf, + props: true, + meta: { + title: `${common.area.areaName}公共文化数字云平台`, + keepAlive: false + } } ] })