diff --git a/docs/player/index.html b/docs/player/index.html index b604283..53734df 100644 --- a/docs/player/index.html +++ b/docs/player/index.html @@ -29,12 +29,17 @@ function get (name) { var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)"); var r = window.location.search.substr(1).match(reg);//search,查询？后面的参数，并匹配正则 - if(r!=null)return unescape(r[2]); return null; + if (r!=null)return unescape(r[2]); return null; } let link = window.location.href let info = get('info') let time = get('time') - let url = info.split('$')[1] + let flag = info.indexOf('$') + if (flag > 0) { + let url = info.split('$')[1] + } else { + let url = info + } let player = new window.HlsJsPlayer({ id: 'mse', url: url, diff --git a/package.json b/package.json index 93c2645..84fdb37 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "zy", - "version": "0.8.17", + "version": "0.8.18", "author": "Hunlongyu", "description": "ZY Player 资源播放器", "private": true, @@ -13,7 +13,7 @@ "postinstall": "electron-builder install-app-deps", "postuninstall": "electron-builder install-app-deps", "electron:generate-icons": "electron-icon-builder --input=./public/icon.png --output=build --flatten", - "bp": "vue-cli-service electron:build --win --x64 -p always" + "bp": "vue-cli-service electron:build --win --x64 portable -p always" }, "main": "background.js", "dependencies": { diff --git a/src/assets/image/dark.png b/src/assets/image/dark.png index 7a7919c..7832f5f 100644 Binary files a/src/assets/image/dark.png and b/src/assets/image/dark.png differ diff --git a/src/assets/image/green.png b/src/assets/image/green.png index 79bf31b..e493664 100644 Binary files a/src/assets/image/green.png and b/src/assets/image/green.png differ diff --git a/src/assets/image/light.png b/src/assets/image/light.png index 96ed14b..dbdf22e 100644 Binary files a/src/assets/image/light.png and b/src/assets/image/light.png differ diff --git a/src/assets/image/pink.png b/src/assets/image/pink.png index 1118f08..a15907a 100644 Binary files a/src/assets/image/pink.png and b/src/assets/image/pink.png differ diff --git a/src/assets/theme/dark.scss b/src/assets/theme/dark.scss index 90884f3..060bf89 100644 --- a/src/assets/theme/dark.scss +++ b/src/assets/theme/dark.scss @@ -12,6 +12,9 @@ .el-button--text{ border: none; } + .el-button--text:focus, .el-button--text:hover{ + color: var(--d-c-h); + } .el-tabs__active-bar{ background-color: var(--d-bdc); } diff --git a/src/assets/theme/green.scss b/src/assets/theme/green.scss index ecaba96..51e89bf 100644 --- a/src/assets/theme/green.scss +++ b/src/assets/theme/green.scss @@ -12,6 +12,9 @@ .el-button--text{ border: none; } + .el-button--text:focus, .el-button--text:hover{ + color: var(--g-c-h); + } .el-tabs__active-bar{ background-color: var(--g-bdc); } diff --git a/src/assets/theme/pink.scss b/src/assets/theme/pink.scss index 50aec40..d45deff 100644 --- a/src/assets/theme/pink.scss +++ b/src/assets/theme/pink.scss @@ -12,6 +12,9 @@ .el-button--text{ border: none; } + .el-button--text:focus, .el-button--text:hover{ + color: var(--p-c-h); + } .el-tabs__active-bar{ background-color: var(--p-bdc); } diff --git a/src/page/player.vue b/src/page/player.vue index 5f7ba4d..a2033ef 100644 --- a/src/page/player.vue +++ b/src/page/player.vue @@ -12,6 +12,7 @@ + @@ -48,7 +49,7 @@ import 'xgplayer' import Hls from 'xgplayer-hls.js' import video from '@/plugins/dexie/video' import { qrcanvas } from 'qrcanvas' -const { ipcRenderer: ipc } = require('electron') +const { ipcRenderer: ipc, clipboard } = require('electron') export default Vue.extend({ data () { return { @@ -145,6 +146,11 @@ export default Vue.extend({ this.num = v.split('$')[0] // @ts-ignore this.xg.src = url + video.find({ detail: this.video.detail }).then(res => { + if (res) { + video.update(res.id, this.video) + } + }) } }) }) @@ -193,6 +199,15 @@ export default Vue.extend({ dom.appendChild(canvas) } }, + shareEvent () { + let info: string = this.urls[this.video.index] + let title = this.video.name.replace(/^\s*|\s*$/g, '') + let url = info.split('$')[1] + let data = `http://zy.hly120506.top/player/index.html?info=${url}` + let txt = `资源名称: ${title}\n播放地址:${data}` + clipboard.writeText(txt) + this.$message.success('资源已复制到剪贴板中，快去分享吧~') + }, playBtnClick (i: string, j: number) { if (this.video.index !== j) { let url = i.split('$')[1] diff --git a/src/page/star.vue b/src/page/star.vue index 7801042..971c8b9 100644 --- a/src/page/star.vue +++ b/src/page/star.vue @@ -5,6 +5,11 @@ + + +