diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 26e7651..7b5a4d4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -31,7 +31,9 @@ jobs:
with:
files: |
dist_electron/*.exe
+ dist_electron/win-unpacked/*.exe
dist_electron/*.dmg
dist_electron/*.snap
+ dist_electron/*.yml
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/package.json b/package.json
index 1f1c9b6..7efff6b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "zyplayer",
- "version": "0.9.15",
+ "version": "0.9.16",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
diff --git a/src/components/Film.vue b/src/components/Film.vue
index f100f16..5a5db84 100644
--- a/src/components/Film.vue
+++ b/src/components/Film.vue
@@ -11,7 +11,7 @@
-
+
-
+
{{typeName}}
@@ -172,18 +172,22 @@ export default {
},
siteClick (e) {
this.site = e
- this.tb.update = 0
- this.tb.total = 0
this.tag = 0
this.id = e.tags[0].id
- this.tb.loading = true
this.show.site = false
- tools.film_get(e.key, this.id).then(res => {
- this.tb.list = res.list
- this.tb.total = res.total
- this.tb.update = res.update
- this.tb.loading = false
- })
+ if (this.keywords.length > 0) {
+ this.searchEvent()
+ } else {
+ this.tb.update = 0
+ this.tb.total = 0
+ this.tb.loading = true
+ tools.film_get(e.key, this.id).then(res => {
+ this.tb.list = res.list
+ this.tb.total = res.total
+ this.tb.update = res.update
+ this.tb.loading = false
+ })
+ }
},
tagClick (e, n) {
this.tb.update = 0
diff --git a/src/components/Play.vue b/src/components/Play.vue
index 2b6ec1d..f56e05c 100644
--- a/src/components/Play.vue
+++ b/src/components/Play.vue
@@ -230,6 +230,7 @@ export default {
if (res.m3u8_urls.length > 1 && (res.m3u8_urls.length - 1 > this.video.index)) {
this.video.index++
}
+ this.xg.off('ended')
})
}).catch(err => {
this.$m.error(err)
diff --git a/src/lib/site/sites.js b/src/lib/site/sites.js
index b62c5e1..f7b805a 100644
--- a/src/lib/site/sites.js
+++ b/src/lib/site/sites.js
@@ -1082,6 +1082,139 @@ const sites = [
children: []
}
]
+ },
+ {
+ key: 'okzy',
+ name: 'OK资源网',
+ url: 'https://www.okzy.co',
+ new: 'https://www.okzy.co/?m=vod-index-pg-{page}.html',
+ view: 'https://www.okzy.co/?m=vod-type-id-{id}-page-{page}.html',
+ search: 'https://www.okzy.co/index.php?m=vod-search-pg-{page}-wd-{keywords}.html',
+ type: 0,
+ tags: [
+ {
+ title: '最新',
+ id: 0,
+ children: []
+ },
+ {
+ title: '电影',
+ id: 1,
+ children: [
+ {
+ title: '动作片',
+ id: 5
+ },
+ {
+ title: '喜剧片',
+ id: 6
+ },
+ {
+ title: '爱情片',
+ id: 7
+ },
+ {
+ title: '科幻片',
+ id: 8
+ },
+ {
+ title: '恐怖片',
+ id: 9
+ },
+ {
+ title: '剧情片',
+ id: 10
+ },
+ {
+ title: '战争片',
+ id: 11
+ },
+ {
+ title: '纪录片',
+ id: 19
+ },
+ {
+ title: '微电影',
+ id: 20
+ },
+ {
+ title: '伦理片',
+ id: 21
+ }
+ ]
+ },
+ {
+ title: '连续剧',
+ id: 2,
+ children: [
+ {
+ title: '国产剧',
+ id: 12
+ },
+ {
+ title: '香港剧',
+ id: 13
+ },
+ {
+ title: '韩国剧',
+ id: 14
+ },
+ {
+ title: '欧美剧',
+ id: 15
+ },
+ {
+ title: '台湾剧',
+ id: 16
+ },
+ {
+ title: '日本剧',
+ id: 17
+ },
+ {
+ title: '海外剧',
+ id: 18
+ }
+ ]
+ },
+ {
+ title: '综艺片',
+ id: 3,
+ children: [
+ {
+ title: '内地综艺',
+ id: 26
+ },
+ {
+ title: '港台综艺',
+ id: 27
+ },
+ {
+ title: '日韩综艺',
+ id: 28
+ },
+ {
+ title: '欧美综艺',
+ id: 29
+ }
+ ]
+ },
+ {
+ title: '动漫片',
+ id: 4,
+ children: []
+ },
+ {
+ title: '福利片',
+ id: 22,
+ children: []
+ },
+ {
+ title: '解说',
+ id: 33,
+ children: []
+ }
+ ]
}
]