diff --git a/.gitignore b/.gitignore index 6c875e4..ac8cf8a 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ pnpm-debug.log* *.sln *.sw? .history +dist # OS generated files .DS_Store diff --git a/public/static/bf.gif b/public/static/bf.gif new file mode 100644 index 0000000..e73372c Binary files /dev/null and b/public/static/bf.gif differ diff --git a/public/static/css/style.css b/public/static/css/style.css index 472fa64..5669ce0 100644 --- a/public/static/css/style.css +++ b/public/static/css/style.css @@ -33,7 +33,7 @@ a { -o-box-shadow: 2px 2px 10px #999; -webkit-box-shadow: 2px 2px 10px #999; */ position: relative; - height: 84vh; + height: 82vh; } .container-left { @@ -624,6 +624,9 @@ a { .main-content-wrapper { margin-bottom: 20px; + padding: 0px 20px; + height: 78vh; + overflow: auto; } .main-content-header, diff --git a/public/static/x.png b/public/static/x.png new file mode 100644 index 0000000..2bf3c93 Binary files /dev/null and b/public/static/x.png differ diff --git a/src/view/home/index.vue b/src/view/home/index.vue index dd9f43b..04a63ff 100644 --- a/src/view/home/index.vue +++ b/src/view/home/index.vue @@ -5,6 +5,7 @@
目录
本版
往期
+
视频读报
@@ -25,7 +26,7 @@
{{ data[dataIndex].bm_name }}
-
{{ news.new_name }}
+
{{ news.new_name }}
@@ -33,6 +34,8 @@
+ +
@@ -121,8 +124,8 @@
- + +
@@ -135,7 +138,7 @@ - @@ -191,7 +194,7 @@
  • - {{ news.new_name }} @@ -199,13 +202,18 @@
    • -
    - +
    +
    -
    - -
    {{ data[dataIndex].bm_name }}
    -
    -
    -

    - {{ targetInfo.new_name }} -

    -

    - {{ targetInfo.subtitle }} -

    -

    -

    {{ targetInfo.reporter }}

    -
    -
    -
    +
    {{ data[dataIndex].bm_name }}
    +
    +
    +

    + {{ targetInfo.new_name }} +

    +

    + {{ targetInfo.subtitle }} +

    +

    +

    {{ targetInfo.reporter }}

    +
    +
    +
    +
    -
    +
    + +
    @@ -331,9 +342,12 @@ export default { imageScale: 1, mouseIndex: 0, hideMenuTimer: null, + qkData: {}, + showGif:true, }; }, mounted() { + //sessionStorage.setItem("mp3", 0); var index = sessionStorage.getItem("index"); this.dataIndex = index ? index : 0; this.getCurrentDateMaxDay(); @@ -351,6 +365,12 @@ export default { sessionStorage.setItem("month", initMonth); sessionStorage.setItem("day", initDay); } + console.log(sessionStorage.getItem("mp3")) + if (sessionStorage.getItem("mp3") == 1) { + setTimeout(() => { + this.readMp3(); + }, 1000) + } //document.title =this.data.list[this.dataIndex].editionName; // var newInfo = sessionStorage.getItem("newInfo"); // if (newInfo) { @@ -362,18 +382,30 @@ export default { }, methods: { + openVideo() { + console.log(this.showInfo) + if(this.showInfo){ + this.readMp3(); + }else{ + sessionStorage.setItem("mp3", 1); + this.openNews(this.data[this.dataIndex].news[0],1); + } + //新窗口打开 + //window.open(this.qkData.date_video, '_blank'); + }, readMp3() { console.log(this.$refs.audioPlayer.error) - if (this.$refs.audioPlayer.error != null) { - alert('音频生成中，请稍候再试！'); - return; - } + // if (this.$refs.audioPlayer.error != null) { + // alert('音频生成中，请稍候再试！'); + // return; + // } if (this.isPlay) { this.$refs.audioPlayer.pause(); } else { this.$refs.audioPlayer.play(); } this.isPlay = !this.isPlay; + this.showGif=true; }, onAudioLoaded() { console.log('Audio has been loaded and is ready to play.'); @@ -431,6 +463,7 @@ export default { window.location.reload(); }, openNextNews(type) { + sessionStorage.setItem("mp3", 0); if (type == 'top') { var id = parseInt(this.targetInfo.id) - 1; } else { @@ -466,10 +499,18 @@ export default { } this.dataIndex = this.dataIndex >= (this.data.length - 1) ? (this.data.length - 1) : parseInt(this.dataIndex) + 1; } + sessionStorage.setItem("mp3", 0); sessionStorage.setItem("index", parseInt(this.dataIndex)); sessionStorage.removeItem("newInfo"); this.showInfo = false; - window.location.reload(); + //去掉域名上的&id + let url = window.location.href; + url = url.replace(/&id=\d+/, ''); + url = url.replace(/\?id=\d+/, ''); + window.location.href = url; + setTimeout(() => { + window.location.reload(); + }, 100) }, addFontSize(type) { @@ -522,6 +563,7 @@ export default { .catch(error => console.error('Error loading the JSON file:', error)) }, openBm(d) { + sessionStorage.setItem("mp3", 0); this.dataIndex = d; sessionStorage.setItem("index", d); sessionStorage.removeItem("newInfo"); @@ -582,6 +624,7 @@ export default { sessionStorage.setItem('DateIndex', resIndex); $('input[name="activeDate"]').val(response.data.data[resIndex].datetime); + this.qkData = response.data.data[resIndex]; //this.datetime = this.getCurrentDateFormatted(response.data.data[resIndex].datetime); //document.title = '《今日固始》电子版-' + this.datetime; // if(storageTimeMonth == '' || typeof (storageTimeMonth)=='undefined'){ @@ -698,7 +741,8 @@ export default { } } }, - openNews(area) { + openNews(area,type) { + sessionStorage.setItem("mp3", type); //var info = this.data[this.dataIndex].news; //var targetInfo = info.find(item => item.id === area.id); //this.targetInfo = targetInfo; @@ -730,10 +774,11 @@ export default { }, goHome() { + sessionStorage.setItem("mp3", 0); sessionStorage.removeItem("year"); sessionStorage.removeItem("month"); sessionStorage.removeItem("day"); - sessionStorage.removeItem("index"); + //sessionStorage.removeItem("index"); sessionStorage.removeItem("newInfo"); this.showInfo = false; let url = window.location.href;